Skip to content

Commit 65c0fec

Browse files
atoulmecparkins
authored andcommitted
[pkg/stanza] remove sampling policy from logger (open-telemetry#29886)
**Description:** Remove sampling policy from logger **Link to tracking Issue:** Fixes open-telemetry#23801
1 parent 3ff62ce commit 65c0fec

File tree

2 files changed

+28
-9
lines changed

2 files changed

+28
-9
lines changed

.chloggen/remove_sampler.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/stanza
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove sampling policy from logger
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [23801]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

pkg/stanza/pipeline/config.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package pipeline // import "github.com/open-telemetry/opentelemetry-collector-co
55

66
import (
77
"fmt"
8-
"time"
98

109
"go.uber.org/zap"
11-
"go.uber.org/zap/zapcore"
1210

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

36-
sampledLogger := logger.Desugar().WithOptions(
37-
zap.WrapCore(func(core zapcore.Core) zapcore.Core {
38-
return zapcore.NewSamplerWithOptions(core, time.Second, 1, 10000)
39-
}),
40-
).Sugar()
41-
4234
dedeplucateIDs(c.Operators)
4335

4436
ops := make([]operator.Operator, 0, len(c.Operators))
4537
for _, opCfg := range c.Operators {
46-
op, err := opCfg.Build(sampledLogger)
38+
op, err := opCfg.Build(logger)
4739
if err != nil {
4840
return nil, err
4941
}

0 commit comments

Comments
 (0)