diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index 8f5425993a49..211573243c9c 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -76,9 +76,8 @@ func newSignalFxExporter( return nil, err } - sampledLogger := translation.CreateSampledLogger(createSettings.Logger) converter, err := translation.NewMetricsConverter( - sampledLogger, + createSettings.TelemetrySettings.Logger, metricTranslator, config.ExcludeMetrics, config.IncludeMetrics, diff --git a/exporter/signalfxexporter/internal/translation/converter.go b/exporter/signalfxexporter/internal/translation/converter.go index 1e7646b877d2..7f704d9f8893 100644 --- a/exporter/signalfxexporter/internal/translation/converter.go +++ b/exporter/signalfxexporter/internal/translation/converter.go @@ -6,14 +6,12 @@ package translation // import "github.com/open-telemetry/opentelemetry-collector import ( "fmt" "strings" - "time" "unicode" sfxpb "github.com/signalfx/com_signalfx_metrics_protobuf/model" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" - "go.uber.org/zap/zapcore" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter/internal/translation/dpfilters" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" @@ -184,7 +182,7 @@ type datapointValidator struct { } func newDatapointValidator(logger *zap.Logger, nonAlphanumericDimChars string) *datapointValidator { - return &datapointValidator{logger: CreateSampledLogger(logger), nonAlphanumericDimChars: nonAlphanumericDimChars} + return &datapointValidator{logger: logger, nonAlphanumericDimChars: nonAlphanumericDimChars} } // sanitizeDataPoints sanitizes datapoints prior to dispatching them to the backend. @@ -277,23 +275,3 @@ func (dpv *datapointValidator) isValidDimensionValue(value, name string) bool { } return true } - -// CreateSampledLogger was copied from https://github.com/open-telemetry/opentelemetry-collector/blob/v0.26.0/exporter/exporterhelper/queued_retry.go#L108 -func CreateSampledLogger(logger *zap.Logger) *zap.Logger { - if logger.Core().Enabled(zapcore.DebugLevel) { - // Debugging is enabled. Don't do any sampling. - return logger - } - - // Create a logger that samples all messages to 1 per 10 seconds initially, - // and 1/10000 of messages after that. - opts := zap.WrapCore(func(core zapcore.Core) zapcore.Core { - return zapcore.NewSamplerWithOptions( - core, - 10*time.Second, - 1, - 10000, - ) - }) - return logger.WithOptions(opts) -}