Add typed collector resource attributes based on declarative config

.chloggen/14411.yaml

@@ -0,0 +1,48 @@
+# 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. receiver/otlp)
+component: all
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add declarative schema support for service telemetry resource configuration.
+
+# One or more tracking issues or pull requests related to the change
+issues: [14411]
+
+# (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: |
+  The `service::telemetry::resource` configuration now accepts the declarative schema with explicit name/value pairs:
+  ```yaml
+  service:
+    telemetry:
+      resource:
+        schema_url: https://opentelemetry.io/schemas/1.38.0
+        attributes:
+          - name: service.name
+            value: my-collector
+          - name: host.name
+            value: collector-host
+  ```
+
+  The legacy inline attribute map format is still supported for backward compatibility:
+  ```yaml
+  service:
+    telemetry:
+      resource:
+        service.name: my-collector
+        host.name: collector-host
+  ```
+
+  Note: `resource.detectors` is accepted for forward compatibility but is not yet applied by the collector.
+
+# 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: [user]

service/telemetry/otelconftelemetry/config.go

@@ -19,8 +19,11 @@ type Config struct {
 	// Resource specifies user-defined attributes to include with all emitted telemetry.
 	// Note that some attributes are added automatically (e.g. service.version) even
 	// if they are not specified here. In order to suppress such attributes the
-	// attribute must be specified in this map with null YAML value (nil string pointer).
-	Resource map[string]*string `mapstructure:"resource,omitempty"`
+	// attribute must be specified with a null value in the configuration.
+	//
+	// Supports both the declarative config resource schema and the legacy inline
+	// attribute map format for backward compatibility.
+	Resource ResourceConfig `mapstructure:"resource,omitempty"`
 }
 
 // LogsConfig defines the configurable settings for service telemetry logs.
@@ -41,6 +44,10 @@ type MetricsConfig = migration.MetricsConfigV030
 // Experimental: *NOTE* this structure is subject to change or removal in the future.
 type TracesConfig = migration.TracesConfigV030
 
+// ResourceConfig exposes the configuration settings for the service telemetry resource.
+// Experimental: *NOTE* this structure is subject to change or removal in the future.
+type ResourceConfig = migration.ResourceConfigV030
+
 // Validate checks whether the current configuration is valid
 func (c *Config) Validate() error {
 	// Check when service telemetry metric level is not none, the metrics readers should not be empty

service/telemetry/otelconftelemetry/config_test.go

@@ -18,6 +18,7 @@ import (
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/confmap/xconfmap"
+	"go.opentelemetry.io/collector/service/telemetry/otelconftelemetry/internal/migration"
 )
 
 func TestComponentConfigStruct(t *testing.T) {
@@ -126,3 +127,36 @@ func TestConfig(t *testing.T) {
 		})
 	}
 }
+
+func TestConfigMarshalResource(t *testing.T) {
+	cfg := createDefaultConfig().(*Config)
+	cfg.Resource = migration.ResourceConfigV030{
+		Resource: config.Resource{
+			Attributes: []config.AttributeNameValue{
+				{Name: "service.name", Value: "custom-service"},
+			},
+		},
+		LegacyAttributes: map[string]any{
+			"legacy.attr":     "legacy-value",
+			"service.version": nil,
+		},
+	}
+
+	cm := confmap.New()
+	require.NoError(t, cm.Marshal(cfg))
+	raw := cm.ToStringMap()
+
+	resourceRaw, ok := raw["resource"].(map[string]any)
+	require.True(t, ok)
+	assert.Equal(t, "legacy-value", resourceRaw["legacy.attr"])
+	assert.Contains(t, resourceRaw, "service.version")
+	assert.Nil(t, resourceRaw["service.version"])
+
+	attrs, ok := resourceRaw["attributes"].([]any)
+	require.True(t, ok)
+	require.Len(t, attrs, 1)
+	attr, ok := attrs[0].(map[string]any)
+	require.True(t, ok)
+	assert.Equal(t, "service.name", attr["name"])
+	assert.Equal(t, "custom-service", attr["value"])
+}

service/telemetry/otelconftelemetry/factory.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
 	"go.uber.org/zap/zapcore"
 
 	"go.opentelemetry.io/collector/component"
@@ -33,6 +34,8 @@ func createDefaultConfig() component.Config {
 		metricsHost = ""
 	}
 
+	schemaURL := semconv.SchemaURL
+
 	return &Config{
 		Logs: LogsConfig{
 			Level:       zapcore.InfoLevel,
@@ -67,6 +70,11 @@ func createDefaultConfig() component.Config {
 				},
 			},
 		},
+		Resource: ResourceConfig{
+			Resource: config.Resource{
+				SchemaUrl: &schemaURL,
+			},
+		},
 	}
 }