Merge branch 'main' into dependabot/go_modules/tools/dependencies-f3a1f89f55

Author: kruskall

enrichments/trace/config/config.go

@@ -28,8 +28,9 @@ type Config struct {
 
 // ResourceConfig configures the enrichment of resource attributes.
 type ResourceConfig struct {
-	AgentName    AttributeConfig `mapstructure:"agent_name"`
-	AgentVersion AttributeConfig `mapstructure:"agent_version"`
+	AgentName        AttributeConfig `mapstructure:"agent_name"`
+	AgentVersion     AttributeConfig `mapstructure:"agent_version"`
+	OverrideHostName AttributeConfig `mapstructure:"override_host_name"`
 }
 
 // ScopeConfig configures the enrichment of scope attributes.
@@ -55,6 +56,7 @@ type ElasticTransactionConfig struct {
 	Type                AttributeConfig `mapstructure:"type"`
 	Result              AttributeConfig `mapstructure:"result"`
 	EventOutcome        AttributeConfig `mapstructure:"event_outcome"`
+	InferredSpans       AttributeConfig `mapstructure:"inferred_spans"`
 }
 
 // ElasticSpanConfig configures the enrichment attributes for the spans
@@ -72,15 +74,24 @@ type ElasticSpanConfig struct {
 	EventOutcome        AttributeConfig `mapstructure:"event_outcome"`
 	ServiceTarget       AttributeConfig `mapstructure:"service_target"`
 	DestinationService  AttributeConfig `mapstructure:"destination_service"`
+	InferredSpans       AttributeConfig `mapstructure:"inferred_spans"`
 }
 
 // SpanEventConfig configures enrichment attributes for the span events.
 type SpanEventConfig struct {
 	// TimestampUs is a temporary attribute to enable higher
 	// resolution timestamps in Elasticsearch. For more details see:
 	// https://github.com/elastic/opentelemetry-dev/issues/374.
-	TimestampUs    AttributeConfig `mapstructure:"timestamp_us"`
-	ProcessorEvent AttributeConfig `mapstructure:"processor_event"`
+	TimestampUs        AttributeConfig `mapstructure:"timestamp_us"`
+	TransactionSampled AttributeConfig `mapstructure:"transaction_sampled"`
+	TransactionType    AttributeConfig `mapstructure:"transaction_type"`
+	ProcessorEvent     AttributeConfig `mapstructure:"processor_event"`
+
+	// For exceptions/errors
+	ErrorID               AttributeConfig `mapstructure:"error_id"`
+	ErrorExceptionHandled AttributeConfig `mapstructure:"error_exception_handled"`
+	ErrorGroupingKey      AttributeConfig `mapstructure:"error_grouping_key"`
+	ErrorGroupingName     AttributeConfig `mapstructure:"error_grouping_name"`
 }
 
 // AttributeConfig is the configuration options for each attribute.
@@ -92,8 +103,9 @@ type AttributeConfig struct {
 func Enabled() Config {
 	return Config{
 		Resource: ResourceConfig{
-			AgentName:    AttributeConfig{Enabled: true},
-			AgentVersion: AttributeConfig{Enabled: true},
+			AgentName:        AttributeConfig{Enabled: true},
+			AgentVersion:     AttributeConfig{Enabled: true},
+			OverrideHostName: AttributeConfig{Enabled: true},
 		},
 		Scope: ScopeConfig{
 			ServiceFrameworkName:    AttributeConfig{Enabled: true},
@@ -111,6 +123,7 @@ func Enabled() Config {
 			Result:              AttributeConfig{Enabled: true},
 			EventOutcome:        AttributeConfig{Enabled: true},
 			RepresentativeCount: AttributeConfig{Enabled: true},
+			InferredSpans:       AttributeConfig{Enabled: true},
 		},
 		Span: ElasticSpanConfig{
 			TimestampUs:         AttributeConfig{Enabled: true},
@@ -122,10 +135,17 @@ func Enabled() Config {
 			ServiceTarget:       AttributeConfig{Enabled: true},
 			DestinationService:  AttributeConfig{Enabled: true},
 			RepresentativeCount: AttributeConfig{Enabled: true},
+			InferredSpans:       AttributeConfig{Enabled: true},
 		},
 		SpanEvent: SpanEventConfig{
-			TimestampUs:    AttributeConfig{Enabled: true},
-			ProcessorEvent: AttributeConfig{Enabled: true},
+			TimestampUs:           AttributeConfig{Enabled: true},
+			TransactionSampled:    AttributeConfig{Enabled: true},
+			TransactionType:       AttributeConfig{Enabled: true},
+			ProcessorEvent:        AttributeConfig{Enabled: true},
+			ErrorID:               AttributeConfig{Enabled: true},
+			ErrorExceptionHandled: AttributeConfig{Enabled: true},
+			ErrorGroupingKey:      AttributeConfig{Enabled: true},
+			ErrorGroupingName:     AttributeConfig{Enabled: true},
 		},
 	}
 }

enrichments/trace/internal/elastic/attributes.go

@@ -47,4 +47,12 @@ const (
 	AttributeSpanDestinationServiceResource = "span.destination.service.resource"
 	AttributeSpanDurationUs                 = "span.duration.us"
 	AttributeSpanRepresentativeCount        = "span.representative_count"
+	AttributeChildIDs                       = "child.id"
+
+	// span event attributes
+	AttributeParentID              = "parent.id"
+	AttributeErrorID               = "error.id"
+	AttributeErrorExceptionHandled = "error.exception.handled"
+	AttributeErrorGroupingKey      = "error.grouping_key"
+	AttributeErrorGroupingName     = "error.grouping_name"
 )

enrichments/trace/internal/elastic/resource.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
 	"go.opentelemetry.io/collector/pdata/pcommon"
-	semconv "go.opentelemetry.io/collector/semconv/v1.22.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
 )
 
 // EnrichResource derives and adds Elastic specific resource attributes.
@@ -32,6 +32,9 @@ func EnrichResource(resource pcommon.Resource, cfg config.Config) {
 }
 
 type resourceEnrichmentContext struct {
+	hostName    string
+	k8sNodeName string
+
 	telemetrySDKName       string
 	telemetrySDKLanguage   string
 	telemetrySDKVersion    string
@@ -42,6 +45,10 @@ type resourceEnrichmentContext struct {
 func (s *resourceEnrichmentContext) Enrich(resource pcommon.Resource, cfg config.ResourceConfig) {
 	resource.Attributes().Range(func(k string, v pcommon.Value) bool {
 		switch k {
+		case semconv.AttributeHostName:
+			s.hostName = v.Str()
+		case semconv.AttributeK8SNodeName:
+			s.k8sNodeName = v.Str()
 		case semconv.AttributeTelemetrySDKName:
 			s.telemetrySDKName = v.Str()
 		case semconv.AttributeTelemetrySDKLanguage:
@@ -62,6 +69,9 @@ func (s *resourceEnrichmentContext) Enrich(resource pcommon.Resource, cfg config
 	if cfg.AgentVersion.Enabled {
 		s.setAgentVersion(resource)
 	}
+	if cfg.OverrideHostName.Enabled {
+		s.overrideHostNameWithK8sNodeName(resource)
+	}
 }
 
 func (s *resourceEnrichmentContext) setAgentName(resource pcommon.Resource) {
@@ -105,3 +115,14 @@ func (s *resourceEnrichmentContext) setAgentVersion(resource pcommon.Resource) {
 	}
 	resource.Attributes().PutStr(AttributeAgentVersion, agentVersion)
 }
+
+func (s *resourceEnrichmentContext) overrideHostNameWithK8sNodeName(resource pcommon.Resource) {
+	if s.k8sNodeName == "" {
+		return
+	}
+	// Host name is set same as k8s node name. In case, both host name
+	// and k8s node name are set then host name is overridden as this is
+	// considered an invalid configuration/smell and k8s node name is
+	// given higher preference.
+	resource.Attributes().PutStr(semconv.AttributeHostName, s.k8sNodeName)
+}

enrichments/trace/internal/elastic/resource_test.go

@@ -162,6 +162,37 @@ func TestResourceEnrich(t *testing.T) {
 				AttributeAgentVersion: "1.2.3",
 			},
 		},
+		{
+			name: "host_name_override_with_k8s_node_name",
+			input: func() pcommon.Resource {
+				res := pcommon.NewResource()
+				res.Attributes().PutStr(semconv.AttributeHostName, "test-host")
+				res.Attributes().PutStr(semconv.AttributeK8SNodeName, "k8s-node")
+				return res
+			}(),
+			config: config.Enabled().Resource,
+			enrichedAttrs: map[string]any{
+				semconv.AttributeHostName:    "k8s-node",
+				semconv.AttributeK8SNodeName: "k8s-node",
+				AttributeAgentName:           "otlp",
+				AttributeAgentVersion:        "unknown",
+			},
+		},
+		{
+			name: "host_name_if_empty_set_from_k8s_node_name",
+			input: func() pcommon.Resource {
+				res := pcommon.NewResource()
+				res.Attributes().PutStr(semconv.AttributeK8SNodeName, "k8s-node")
+				return res
+			}(),
+			config: config.Enabled().Resource,
+			enrichedAttrs: map[string]any{
+				semconv.AttributeHostName:    "k8s-node",
+				semconv.AttributeK8SNodeName: "k8s-node",
+				AttributeAgentName:           "otlp",
+				AttributeAgentVersion:        "unknown",
+			},
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			// Merge existing resource attrs with the attrs added