Add option to disable redundant 132B in log lines

.chloggen/main.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: "otelconftelemetry"
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add support to disabling adding resource attributes as zap fields in internal logging"
+
+# One or more tracking issues or pull requests related to the change
+issues: [13869]
+
+# (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:
+
+# 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: []

service/telemetry/internal/migration/v0.3.0.go

@@ -162,6 +162,9 @@ type LogsConfigV030 struct {
 	// Processors allow configuration of log record processors to emit logs to
 	// any number of supported backends.
 	Processors []config.LogRecordProcessor `mapstructure:"processors,omitempty"`
+
+	// DisableResourceAttributes disables adding resource attributes to logs.
+	DisableResourceAttributes bool `mapstructure:"disable_resource_attributes,omitempty"`
 }
 
 // LogsSamplingConfig sets a sampling strategy for the logger. Sampling caps the

service/telemetry/otelconftelemetry/factory.go

@@ -51,11 +51,12 @@ func createDefaultConfig() component.Config {
 				Initial:    10,
 				Thereafter: 100,
 			},
-			OutputPaths:       []string{"stderr"},
-			ErrorOutputPaths:  []string{"stderr"},
-			DisableCaller:     false,
-			DisableStacktrace: false,
-			InitialFields:     map[string]any(nil),
+			OutputPaths:               []string{"stderr"},
+			ErrorOutputPaths:          []string{"stderr"},
+			DisableCaller:             false,
+			DisableStacktrace:         false,
+			InitialFields:             map[string]any(nil),
+			DisableResourceAttributes: false,
 		},
 		Metrics: MetricsConfig{
 			Level: configtelemetry.LevelNormal,

service/telemetry/otelconftelemetry/logger.go

@@ -55,7 +55,7 @@ func createLogger(
 	// add them to the logger using With, because that would apply to all logs,
 	// even ones exported through the core that wraps the LoggerProvider,
 	// meaning that the attributes would be exported twice.
-	if res != nil && len(res.Attributes()) > 0 {
+	if cfg.Logs.DisableResourceAttributes && res != nil && len(res.Attributes()) > 0 {
 		logger = logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core {
 			var fields []zap.Field
 			for _, attr := range res.Attributes() {

service/telemetry/otelconftelemetry/logger_test.go

@@ -129,6 +129,22 @@ func TestCreateLogger(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "log config with resource_as_zap_field disabled",
+			cfg: Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Development:               false,
+					Encoding:                  "console",
+					OutputPaths:               []string{"stderr"},
+					ErrorOutputPaths:          []string{"stderr"},
+					DisableCaller:             false,
+					DisableStacktrace:         false,
+					InitialFields:             map[string]any(nil),
+					DisableResourceAttributes: false,
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -152,6 +168,7 @@ func TestCreateLoggerWithResource(t *testing.T) {
 		buildInfo      component.BuildInfo
 		resourceConfig map[string]*string
 		wantFields     map[string]string
+		cfg            *Config
 	}{
 		{
 			name: "auto-populated fields only",
@@ -165,6 +182,14 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				string(semconv.ServiceVersionKey):    "1.0.0",
 				string(semconv.ServiceInstanceIDKey): "",
 			},
+			cfg: &Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Encoding:                  "json",
+					DisableResourceAttributes: true,
+				},
+				Resource: map[string]*string{},
+			},
 		},
 		{
 			name: "override service.name",
@@ -180,6 +205,14 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				string(semconv.ServiceVersionKey):    "1.0.0",
 				string(semconv.ServiceInstanceIDKey): "",
 			},
+			cfg: &Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Encoding:                  "json",
+					DisableResourceAttributes: true,
+				},
+				Resource: map[string]*string{},
+			},
 		},
 		{
 			name: "override service.version",
@@ -195,6 +228,14 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				string(semconv.ServiceVersionKey):    "2.0.0",
 				string(semconv.ServiceInstanceIDKey): "",
 			},
+			cfg: &Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Encoding:                  "json",
+					DisableResourceAttributes: true,
+				},
+				Resource: map[string]*string{},
+			},
 		},
 		{
 			name: "custom field with auto-populated",
@@ -211,6 +252,14 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				string(semconv.ServiceInstanceIDKey): "", // Just check presence
 				"custom.field":                       "custom-value",
 			},
+			cfg: &Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Encoding:                  "json",
+					DisableResourceAttributes: true,
+				},
+				Resource: map[string]*string{},
+			},
 		},
 		{
 			name:           "resource with no attributes",
@@ -220,6 +269,31 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				// A random UUID is injected for service.instance.id by default
 				string(semconv.ServiceInstanceIDKey): "", // Just check presence
 			},
+			cfg: &Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Encoding:                  "json",
+					DisableResourceAttributes: true,
+				},
+				Resource: map[string]*string{},
+			},
+		},
+		{
+			name: "validate `ResourceAsZapFields=false` shouldn't add resource fields",
+			buildInfo: component.BuildInfo{
+				Command: "mycommand",
+				Version: "1.0.0",
+			},
+			resourceConfig: map[string]*string{},
+			wantFields:     map[string]string{},
+			cfg: &Config{
+				Logs: LogsConfig{
+					Level:                     zapcore.InfoLevel,
+					Encoding:                  "json",
+					DisableResourceAttributes: false,
+				},
+				Resource: map[string]*string{},
+			},
 		},
 	}
 
@@ -233,12 +307,13 @@ func TestCreateLoggerWithResource(t *testing.T) {
 					zap.WrapCore(func(zapcore.Core) zapcore.Core { return core }),
 				},
 			}
-			cfg := &Config{
-				Logs: LogsConfig{
-					Level:    zapcore.InfoLevel,
-					Encoding: "json",
-				},
-				Resource: tt.resourceConfig,
+
+			cfg := tt.cfg
+			if cfg == nil {
+				cfg = createDefaultConfig().(*Config)
+			}
+			if tt.resourceConfig != nil {
+				cfg.Resource = tt.resourceConfig
 			}
 
 			logger, loggerProvider, err := createLogger(t.Context(), set, cfg)
@@ -251,7 +326,8 @@ func TestCreateLoggerWithResource(t *testing.T) {
 			require.Len(t, observedLogs.All(), 1)
 
 			entry := observedLogs.All()[0]
-			if tt.wantFields == nil {
+			// treat empty map as "no expected fields"
+			if len(tt.wantFields) == 0 {
 				assert.Empty(t, entry.Context)
 				return
 			}