Propagate telemetry.resource to the internal logs. open-telemetry#12582

Signed-off-by: Israel Blancas <[email protected]>

Author: iblancasa

.chloggen/iblancasa_fix-resource-attributes-internal-logs.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: "internal telemetry"
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add resource attributes from telemetry.resource to the logger"
+
+# One or more tracking issues or pull requests related to the change
+issues: [12582]
+
+# (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: |
+  Resource attributes from telemetry.resource were not added to the internal
+  logs but to metrics and traces. This fix ensures they are added to the logs.
+
+# 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/logger.go

@@ -37,6 +37,15 @@ func newLogger(set Settings, cfg Config) (*zap.Logger, log.LoggerProvider, error
 		return nil, nil, err
 	}
 
+	fields := []zap.Field{}
+	for k, v := range cfg.Resource {
+		if v != nil {
+			f := zap.Field{Key: k, Type: zapcore.StringType, String: *v}
+			fields = append(fields, f)
+		}
+	}
+	logger = logger.With(fields...)
+
 	var lp log.LoggerProvider
 
 	if len(cfg.Logs.Processors) > 0 && set.SDK != nil {
@@ -52,6 +61,10 @@ func newLogger(set Settings, cfg Config) (*zap.Logger, log.LoggerProvider, error
 			if err != nil {
 				panic(err)
 			}
+
+			// Adding the fields to the logger ensures they are shown in the collector
+			// logs but they are not propagated to the core. We need to add them
+			core.With(fields)
 			return core
 		}))
 	}