Skip to content

Commit 629a98d

Browse files
dmitryaxjmsnll
authored andcommitted
[chore] [exporter/signalfx] Remove setting of sampled logger (open-telemetry#27448)
The original logger is now sampled by default after open-telemetry/opentelemetry-collector#8134
1 parent a68ba02 commit 629a98d

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

exporter/signalfxexporter/exporter.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ func newSignalFxExporter(
7676
return nil, err
7777
}
7878

79-
sampledLogger := translation.CreateSampledLogger(createSettings.Logger)
8079
converter, err := translation.NewMetricsConverter(
81-
sampledLogger,
80+
createSettings.TelemetrySettings.Logger,
8281
metricTranslator,
8382
config.ExcludeMetrics,
8483
config.IncludeMetrics,

exporter/signalfxexporter/internal/translation/converter.go

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ package translation // import "github.com/open-telemetry/opentelemetry-collector
66
import (
77
"fmt"
88
"strings"
9-
"time"
109
"unicode"
1110

1211
sfxpb "github.com/signalfx/com_signalfx_metrics_protobuf/model"
1312
"go.opentelemetry.io/collector/pdata/pcommon"
1413
"go.opentelemetry.io/collector/pdata/pmetric"
1514
"go.uber.org/zap"
16-
"go.uber.org/zap/zapcore"
1715

1816
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter/internal/translation/dpfilters"
1917
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
@@ -184,7 +182,7 @@ type datapointValidator struct {
184182
}
185183

186184
func newDatapointValidator(logger *zap.Logger, nonAlphanumericDimChars string) *datapointValidator {
187-
return &datapointValidator{logger: CreateSampledLogger(logger), nonAlphanumericDimChars: nonAlphanumericDimChars}
185+
return &datapointValidator{logger: logger, nonAlphanumericDimChars: nonAlphanumericDimChars}
188186
}
189187

190188
// sanitizeDataPoints sanitizes datapoints prior to dispatching them to the backend.
@@ -277,23 +275,3 @@ func (dpv *datapointValidator) isValidDimensionValue(value, name string) bool {
277275
}
278276
return true
279277
}
280-
281-
// CreateSampledLogger was copied from https://github.com/open-telemetry/opentelemetry-collector/blob/v0.26.0/exporter/exporterhelper/queued_retry.go#L108
282-
func CreateSampledLogger(logger *zap.Logger) *zap.Logger {
283-
if logger.Core().Enabled(zapcore.DebugLevel) {
284-
// Debugging is enabled. Don't do any sampling.
285-
return logger
286-
}
287-
288-
// Create a logger that samples all messages to 1 per 10 seconds initially,
289-
// and 1/10000 of messages after that.
290-
opts := zap.WrapCore(func(core zapcore.Core) zapcore.Core {
291-
return zapcore.NewSamplerWithOptions(
292-
core,
293-
10*time.Second,
294-
1,
295-
10000,
296-
)
297-
})
298-
return logger.WithOptions(opts)
299-
}

0 commit comments

Comments
 (0)