Extend enrichment to support logs and metrics (#200)

* Extend enrichment to support logs and metrics

* Set processor.event for logs and metrics

* Add header

Author: gregkalapos

enrichments/trace/config/config.go renamed to enrichments/config/config.go

@@ -24,6 +24,8 @@ type Config struct {
 	Transaction ElasticTransactionConfig `mapstructure:"elastic_transaction"`
 	Span        ElasticSpanConfig        `mapstructure:"elastic_span"`
 	SpanEvent   SpanEventConfig          `mapstructure:"span_event"`
+	Log         ElasticLogConfig         `mapstructure:"elastic_log"`
+	Metric      ElasticMetricConfig      `mapstructure:"elastic_metric"`
 }
 
 // ResourceConfig configures the enrichment of resource attributes.
@@ -97,6 +99,16 @@ type SpanEventConfig struct {
 	ErrorGroupingName     AttributeConfig `mapstructure:"error_grouping_name"`
 }
 
+// ElasticLogConfig configures the enrichment attributes for logs
+type ElasticLogConfig struct {
+	ProcessorEvent AttributeConfig `mapstructure:"processor_event"`
+}
+
+// ElasticMetricConfig configures the enrichment attributes for metrics
+type ElasticMetricConfig struct {
+	ProcessorEvent AttributeConfig `mapstructure:"processor_event"`
+}
+
 // AttributeConfig is the configuration options for each attribute.
 type AttributeConfig struct {
 	Enabled bool `mapstructure:"enabled"`

enrichments/trace/config/config_test.go renamed to enrichments/config/config_test.go

@@ -15,12 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package trace
+package enrichments
 
 import (
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/internal/elastic"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
+	"github.com/elastic/opentelemetry-lib/enrichments/internal/elastic"
 	"github.com/ua-parser/uap-go/uaparser"
+	"go.opentelemetry.io/collector/pdata/plog"
+	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 )
 
@@ -34,19 +36,11 @@ type Enricher struct {
 	Config config.Config
 }
 
-// NewEnricher creates a new instance of Enricher.
-func NewEnricher(cfg config.Config) *Enricher {
-	return &Enricher{
-		Config:          cfg,
-		userAgentParser: uaparser.NewFromSaved(),
-	}
-}
-
-// Enrich enriches the OTel traces with attributes required to power
+// EnrichTraces enriches the OTel traces with attributes required to power
 // functionalities in the Elastic UI. The traces are processed as per the
 // Elastic's definition of transactions and spans. The traces passed to
 // this function are mutated.
-func (e *Enricher) Enrich(pt ptrace.Traces) {
+func (e *Enricher) EnrichTraces(pt ptrace.Traces) {
 	resSpans := pt.ResourceSpans()
 	for i := 0; i < resSpans.Len(); i++ {
 		resSpan := resSpans.At(i)
@@ -62,3 +56,46 @@ func (e *Enricher) Enrich(pt ptrace.Traces) {
 		}
 	}
 }
+
+// EnrichLogs enriches the OTel logs with attributes required to power
+// functionalities in the Elastic UI. The logs passed to this function are mutated.
+func (e *Enricher) EnrichLogs(pl plog.Logs) {
+	resLogs := pl.ResourceLogs()
+	for i := 0; i < resLogs.Len(); i++ {
+		resLog := resLogs.At(i)
+		elastic.EnrichResource(resLog.Resource(), e.Config)
+		scopeLogs := resLog.ScopeLogs()
+		for j := 0; j < scopeLogs.Len(); j++ {
+			scopeSpan := scopeLogs.At(j)
+			elastic.EnrichScope(scopeSpan.Scope(), e.Config)
+			logRecords := scopeSpan.LogRecords()
+			for k := 0; k < logRecords.Len(); k++ {
+				elastic.EnrichLog(logRecords.At(k), e.Config)
+			}
+		}
+	}
+}
+
+// EnrichMetrics enriches the OTel metrics with attributes required to power
+// functionalities in the Elastic UI. The metrics passed to this function are mutated.
+func (e *Enricher) EnrichMetrics(pl pmetric.Metrics) {
+	resMetrics := pl.ResourceMetrics()
+	for i := 0; i < resMetrics.Len(); i++ {
+		resMetric := resMetrics.At(i)
+		elastic.EnrichMetric(resMetric, e.Config)
+		elastic.EnrichResource(resMetric.Resource(), e.Config)
+		scopeMetics := resMetric.ScopeMetrics()
+		for j := 0; j < scopeMetics.Len(); j++ {
+			scopeMetric := scopeMetics.At(j)
+			elastic.EnrichScope(scopeMetric.Scope(), e.Config)
+		}
+	}
+}
+
+// NewEnricher creates a new instance of Enricher.
+func NewEnricher(cfg config.Config) *Enricher {
+	return &Enricher{
+		Config:          cfg,
+		userAgentParser: uaparser.NewFromSaved(),
+	}
+}

enrichments/trace/trace.go renamed to enrichments/enricher.go

@@ -0,0 +1,32 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package elastic
+
+import (
+	"github.com/elastic/opentelemetry-lib/elasticattr"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
+	"go.opentelemetry.io/collector/pdata/plog"
+)
+
+func EnrichLog(log plog.LogRecord, cfg config.Config) {
+	if cfg.Log.ProcessorEvent.Enabled {
+		if _, exists := log.Attributes().Get(elasticattr.ProcessorEvent); !exists {
+			log.Attributes().PutStr(elasticattr.ProcessorEvent, "log")
+		}
+	}
+}

enrichments/internal/elastic/log.go

@@ -0,0 +1,32 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package elastic
+
+import (
+	"github.com/elastic/opentelemetry-lib/elasticattr"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
+	"go.opentelemetry.io/collector/pdata/pmetric"
+)
+
+func EnrichMetric(metric pmetric.ResourceMetrics, cfg config.Config) {
+	if cfg.Metric.ProcessorEvent.Enabled {
+		if _, exists := metric.Resource().Attributes().Get(elasticattr.ProcessorEvent); !exists {
+			metric.Resource().Attributes().PutStr(elasticattr.ProcessorEvent, "metric")
+		}
+	}
+}

enrichments/internal/elastic/metric.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/elastic/opentelemetry-lib/elasticattr"
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	semconv25 "go.opentelemetry.io/otel/semconv/v1.25.0"
 	semconv "go.opentelemetry.io/otel/semconv/v1.27.0"

enrichments/trace/internal/elastic/resource.go renamed to enrichments/internal/elastic/resource.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/elastic/opentelemetry-lib/elasticattr"
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/pdata/pcommon"

enrichments/trace/internal/elastic/resource_test.go renamed to enrichments/internal/elastic/resource_test.go

@@ -19,7 +19,7 @@ package elastic
 
 import (
 	"github.com/elastic/opentelemetry-lib/elasticattr"
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 

enrichments/trace/internal/elastic/scope.go renamed to enrichments/internal/elastic/scope.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/elastic/opentelemetry-lib/elasticattr"
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/pdata/pcommon"

enrichments/trace/internal/elastic/scope_test.go renamed to enrichments/internal/elastic/scope_test.go

@@ -31,7 +31,7 @@ import (
 	"strings"
 
 	"github.com/elastic/opentelemetry-lib/elasticattr"
-	"github.com/elastic/opentelemetry-lib/enrichments/trace/config"
+	"github.com/elastic/opentelemetry-lib/enrichments/config"
 	"github.com/ua-parser/uap-go/uaparser"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"