Skip to content

Commit

Permalink
[pkg/stanza] remove sampling policy from logger (open-telemetry#29886)
Browse files Browse the repository at this point in the history
**Description:**
Remove sampling policy from logger

**Link to tracking Issue:**
Fixes open-telemetry#23801
  • Loading branch information
atoulme authored Dec 14, 2023
1 parent 0af7fce commit 5ddd0ba
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 9 deletions.
27 changes: 27 additions & 0 deletions .chloggen/remove_sampler.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: pkg/stanza

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove sampling policy from logger

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [23801]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
10 changes: 1 addition & 9 deletions pkg/stanza/pipeline/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ package pipeline // import "github.com/open-telemetry/opentelemetry-collector-co

import (
"fmt"
"time"

"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/errors"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
Expand All @@ -33,17 +31,11 @@ func (c Config) Build(logger *zap.SugaredLogger) (*DirectedPipeline, error) {
return nil, errors.NewError("empty pipeline not allowed", "")
}

sampledLogger := logger.Desugar().WithOptions(
zap.WrapCore(func(core zapcore.Core) zapcore.Core {
return zapcore.NewSamplerWithOptions(core, time.Second, 1, 10000)
}),
).Sugar()

dedeplucateIDs(c.Operators)

ops := make([]operator.Operator, 0, len(c.Operators))
for _, opCfg := range c.Operators {
op, err := opCfg.Build(sampledLogger)
op, err := opCfg.Build(logger)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 5ddd0ba

Please sign in to comment.