[telemetrySettting] Create sampled Logger

exporter/exporterhelper/README.md

@@ -24,6 +24,8 @@ The following configuration options can be modified:
       [the batch processor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor)
       is used, the metric `batch_send_size` can be used for estimation)
 - `timeout` (default = 5s): Time to wait per individual attempt to send data to a backend
+- `sampled_logger`: Enables/disables sampling of logging messages.
+  - `enabled` (default = true). When setting `debug` log level the sampling will be disabled regardless of the value of this property.
 
 The `initial_interval`, `max_interval`, `max_elapsed_time`, and `timeout` options accept 
 [duration strings](https://pkg.go.dev/time#ParseDuration),

exporter/exporterhelper/common.go

@@ -27,6 +27,19 @@ func NewDefaultTimeoutSettings() TimeoutSettings {
 	}
 }
 
+// SampledLoggerSettings configures the logger sampler.
+type SampledLoggerSettings struct {
+	// Enable/disable the sampledLogger. When setting `debug` log level the sampling will be disabled regardless of the value of this property.
+	Enabled bool `mapstructure:"enabled"`
+}
+
+// NewDefaultSampledLoggerSettings returns the default settings for SampledLoggerSettings.
+func NewDefaultSampledLoggerSettings() SampledLoggerSettings {
+	return SampledLoggerSettings{
+		Enabled: true,
+	}
+}
+
 // requestSender is an abstraction of a sender for a request independent of the type of the data (traces, metrics, logs).
 type requestSender interface {
 	send(req internal.Request) error
@@ -64,6 +77,7 @@ type baseSettings struct {
 	TimeoutSettings
 	QueueSettings
 	RetrySettings
+	SampledLoggerSettings
 }
 
 // fromOptions returns the internal options starting from the default and applying all configured options.
@@ -74,7 +88,8 @@ func fromOptions(options ...Option) *baseSettings {
 		// TODO: Enable queuing by default (call DefaultQueueSettings)
 		QueueSettings: QueueSettings{Enabled: false},
 		// TODO: Enable retry by default (call DefaultRetrySettings)
-		RetrySettings: RetrySettings{Enabled: false},
+		RetrySettings:         RetrySettings{Enabled: false},
+		SampledLoggerSettings: NewDefaultSampledLoggerSettings(),
 	}
 
 	for _, op := range options {
@@ -154,7 +169,7 @@ func newBaseExporter(set exporter.CreateSettings, bs *baseSettings, signal compo
 		return nil, err
 	}
 
-	be.qrSender = newQueuedRetrySender(set.ID, signal, bs.QueueSettings, bs.RetrySettings, reqUnmarshaler, &timeoutSender{cfg: bs.TimeoutSettings}, set.Logger)
+	be.qrSender = newQueuedRetrySender(set.ID, signal, bs.QueueSettings, bs.RetrySettings, bs.SampledLoggerSettings, reqUnmarshaler, &timeoutSender{cfg: bs.TimeoutSettings}, set.Logger)
 	be.sender = be.qrSender
 	be.StartFunc = func(ctx context.Context, host component.Host) error {
 		// First start the wrapped exporter.

exporter/exporterhelper/queued_retry.go

@@ -83,9 +83,9 @@ type queuedRetrySender struct {
 	requestUnmarshaler internal.RequestUnmarshaler
 }
 
-func newQueuedRetrySender(id component.ID, signal component.DataType, qCfg QueueSettings, rCfg RetrySettings, reqUnmarshaler internal.RequestUnmarshaler, nextSender requestSender, logger *zap.Logger) *queuedRetrySender {
+func newQueuedRetrySender(id component.ID, signal component.DataType, qCfg QueueSettings, rCfg RetrySettings, lCfg SampledLoggerSettings, reqUnmarshaler internal.RequestUnmarshaler, nextSender requestSender, logger *zap.Logger) *queuedRetrySender {
 	retryStopCh := make(chan struct{})
-	sampledLogger := createSampledLogger(logger)
+	newLogger := createSampledLogger(logger, lCfg)
 	traceAttr := attribute.String(obsmetrics.ExporterKey, id.String())
 
 	qrs := &queuedRetrySender{
@@ -95,7 +95,7 @@ func newQueuedRetrySender(id component.ID, signal component.DataType, qCfg Queue
 		cfg:                qCfg,
 		retryStopCh:        retryStopCh,
 		traceAttribute:     traceAttr,
-		logger:             sampledLogger,
+		logger:             newLogger,
 		requestUnmarshaler: reqUnmarshaler,
 	}
 
@@ -104,7 +104,7 @@ func newQueuedRetrySender(id component.ID, signal component.DataType, qCfg Queue
 		cfg:            rCfg,
 		nextSender:     nextSender,
 		stopCh:         retryStopCh,
-		logger:         sampledLogger,
+		logger:         newLogger,
 		// Following three functions actually depend on queuedRetrySender
 		onTemporaryFailure: qrs.onTemporaryFailure,
 	}
@@ -266,8 +266,8 @@ func NewDefaultRetrySettings() RetrySettings {
 	}
 }
 
-func createSampledLogger(logger *zap.Logger) *zap.Logger {
-	if logger.Core().Enabled(zapcore.DebugLevel) {
+func createSampledLogger(logger *zap.Logger, lCfg SampledLoggerSettings) *zap.Logger {
+	if !lCfg.Enabled || logger.Core().Enabled(zapcore.DebugLevel) {
 		// Debugging is enabled. Don't do any sampling.
 		return logger
 	}

exporter/exporterhelper/queued_retry_test.go

@@ -7,6 +7,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest"
 	"strconv"
 	"sync"
 	"sync/atomic"
@@ -617,6 +619,56 @@ func TestQueuedRetryPersistentEnabled_shutdown_dataIsRequeued(t *testing.T) {
 	}, time.Second, 1*time.Millisecond)
 }
 
+func TestCreateSampledLogger(t *testing.T) {
+	testCases := []struct {
+		desc                 string
+		logger               *zap.Logger
+		lCfg                 SampledLoggerSettings
+		sampledLoggedCreated bool
+	}{
+		{
+			desc:                 "default configuration - sampledLogger enabled",
+			logger:               zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)),
+			lCfg:                 NewDefaultSampledLoggerSettings(),
+			sampledLoggedCreated: true,
+		},
+		{
+			desc:   "sampledLogger disable",
+			logger: zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)),
+			lCfg: SampledLoggerSettings{
+				Enabled: false,
+			},
+			sampledLoggedCreated: false,
+		},
+		{
+			desc:                 "debug logger level and sampledLogged enabled - sampledLogger not created",
+			logger:               zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel)),
+			lCfg:                 NewDefaultSampledLoggerSettings(),
+			sampledLoggedCreated: false,
+		},
+		{
+			desc:   "debug logger level and sampledLogged disabled - sampledLogger not created",
+			logger: zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel)),
+			lCfg: SampledLoggerSettings{
+				Enabled: false,
+			},
+			sampledLoggedCreated: false,
+		},
+	}
+
+	for _, tC := range testCases {
+		t.Run(tC.desc, func(t *testing.T) {
+			newLogger := createSampledLogger(tC.logger, tC.lCfg)
+			require.NotNil(t, newLogger)
+			if tC.sampledLoggedCreated {
+				require.NotEqual(t, tC.logger, newLogger)
+			} else {
+				require.Equal(t, tC.logger, newLogger)
+			}
+		})
+	}
+}
+
 type mockErrorRequest struct {
 	baseRequest
 }

exporter/go.mod

@@ -19,6 +19,7 @@ require (
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
+	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

exporter/go.sum

@@ -57,6 +57,7 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+
 github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

exporter/otlpexporter/README.md

@@ -52,7 +52,7 @@ Several helper files are leveraged to provide additional capabilities automatica
 
 - [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md)
 - [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
-- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
+- [Queuing, retry, sampled logger and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
 
 [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta
 [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib

exporter/otlpexporter/config.go

@@ -13,11 +13,11 @@ import (
 
 // Config defines configuration for OTLP exporter.
 type Config struct {
-	exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
-	exporterhelper.QueueSettings   `mapstructure:"sending_queue"`
-	exporterhelper.RetrySettings   `mapstructure:"retry_on_failure"`
-
-	configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+	exporterhelper.TimeoutSettings       `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+	exporterhelper.QueueSettings         `mapstructure:"sending_queue"`
+	exporterhelper.RetrySettings         `mapstructure:"retry_on_failure"`
+	exporterhelper.SampledLoggerSettings `mapstructure:"sampled_logger"`
+	configgrpc.GRPCClientSettings        `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
 }
 
 var _ component.Config = (*Config)(nil)

exporter/otlpexporter/config_test.go

@@ -75,5 +75,8 @@ func TestUnmarshalConfig(t *testing.T) {
 				BalancerName:    "round_robin",
 				Auth:            &configauth.Authentication{AuthenticatorID: component.NewID("nop")},
 			},
+			SampledLoggerSettings: exporterhelper.SampledLoggerSettings{
+				Enabled: false,
+			},
 		}, cfg)
 }

exporter/otlpexporter/factory.go

@@ -43,6 +43,7 @@ func createDefaultConfig() component.Config {
 			// We almost read 0 bytes, so no need to tune ReadBufferSize.
 			WriteBufferSize: 512 * 1024,
 		},
+		SampledLoggerSettings: exporterhelper.NewDefaultSampledLoggerSettings(),
 	}
 }
 

exporter/otlpexporter/testdata/config.yaml

@@ -25,3 +25,5 @@ keepalive:
   timeout: 30s
   permit_without_stream: true
 balancer_name: "round_robin"
+sampled_logger:
+  enabled: false

exporter/otlphttpexporter/README.md

@@ -31,6 +31,8 @@ The following settings can be optionally configured:
 - `timeout` (default = 30s): HTTP request time limit. For details see https://golang.org/pkg/net/http/#Client
 - `read_buffer_size` (default = 0): ReadBufferSize for HTTP client.
 - `write_buffer_size` (default = 512 * 1024): WriteBufferSize for HTTP client.
+- `sampled_logger`: Enables/disables sampling of logging messages.
+    - `enabled` (default = true). When setting `debug` log level the sampling will be disabled regardless of the value of this property.
 
 Example:
 

exporter/otlphttpexporter/config.go

@@ -13,9 +13,10 @@ import (
 
 // Config defines configuration for OTLP/HTTP exporter.
 type Config struct {
-	confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
-	exporterhelper.QueueSettings  `mapstructure:"sending_queue"`
-	exporterhelper.RetrySettings  `mapstructure:"retry_on_failure"`
+	confighttp.HTTPClientSettings        `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+	exporterhelper.QueueSettings         `mapstructure:"sending_queue"`
+	exporterhelper.RetrySettings         `mapstructure:"retry_on_failure"`
+	exporterhelper.SampledLoggerSettings `mapstructure:"sampled_logger"`
 
 	// The URL to send traces to. If omitted the Endpoint + "/v1/traces" will be used.
 	TracesEndpoint string `mapstructure:"traces_endpoint"`

exporter/otlphttpexporter/config_test.go

@@ -70,5 +70,8 @@ func TestUnmarshalConfig(t *testing.T) {
 				Timeout:         time.Second * 10,
 				Compression:     "gzip",
 			},
+			SampledLoggerSettings: exporterhelper.SampledLoggerSettings{
+				Enabled: false,
+			},
 		}, cfg)
 }

exporter/otlphttpexporter/factory.go

@@ -48,6 +48,7 @@ func createDefaultConfig() component.Config {
 			// We almost read 0 bytes, so no need to tune ReadBufferSize.
 			WriteBufferSize: 512 * 1024,
 		},
+		SampledLoggerSettings: exporterhelper.NewDefaultSampledLoggerSettings(),
 	}
 }
 

exporter/otlphttpexporter/testdata/config.yaml

@@ -23,3 +23,5 @@ headers:
   header1: 234
   another: "somevalue"
 compression: gzip
+sampled_logger:
+  enabled: false