Update support for semconv versions up to semconv 1.27.0 (#440)

elastic · Feb 10, 2025 · 1e73b0c · 1e73b0c
1 parent da36b71
commit 1e73b0c
Show file tree

Hide file tree

Showing 6 changed files with 212 additions and 92 deletions.
diff --git a/input/otlp/exceptions_test.go b/input/otlp/exceptions_test.go
@@ -43,7 +43,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
-	semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
 	"google.golang.org/protobuf/testing/protocmp"
 
 	"github.com/elastic/apm-data/model/modelpb"

diff --git a/input/otlp/logs.go b/input/otlp/logs.go
@@ -42,7 +42,7 @@ import (
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/plog"
-	semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
 
 	"github.com/elastic/apm-data/model/modelpb"
 )
@@ -180,7 +180,7 @@ func (c *Consumer) convertLogRecord(
 				event.Session = &modelpb.Session{}
 			}
 			event.Session.Id = v.Str()
-		case attributeNetworkConnectionType:
+		case semconv.AttributeNetworkConnectionType:
 			if event.Network == nil {
 				event.Network = &modelpb.Network{}
 			}

diff --git a/input/otlp/logs_test.go b/input/otlp/logs_test.go
@@ -46,7 +46,7 @@ import (
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/plog"
-	semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
 	"golang.org/x/sync/semaphore"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"
@@ -280,6 +280,7 @@ func TestConsumerConsumeLogsException(t *testing.T) {
 	record2 := newLogRecord("bar")
 	record2.Attributes().PutStr("event.name", "crash")
 	record2.Attributes().PutStr("event.domain", "device")
+	record2.Attributes().PutBool("exception.escaped", true)
 	record2.Attributes().PutStr("exception.type", "HighLevelException")
 	record2.Attributes().PutStr("exception.message", "MidLevelException: LowLevelException")
 	record2.Attributes().PutStr("exception.stacktrace", `
@@ -359,7 +360,7 @@ Caused by: LowLevelException
 			Exception: &modelpb.Exception{
 				Type:    "HighLevelException",
 				Message: "MidLevelException: LowLevelException",
-				Handled: newBool(true),
+				Handled: newBool(false),
 				Stacktrace: []*modelpb.StacktraceFrame{{
 					Classname: "Junk",
 					Function:  "a",
@@ -373,7 +374,7 @@ Caused by: LowLevelException
 				}},
 				Cause: []*modelpb.Exception{{
 					Message: "MidLevelException: LowLevelException",
-					Handled: newBool(true),
+					Handled: newBool(false),
 					Stacktrace: []*modelpb.StacktraceFrame{{
 						Classname: "Junk",
 						Function:  "c",
@@ -397,7 +398,7 @@ Caused by: LowLevelException
 					}},
 					Cause: []*modelpb.Exception{{
 						Message: "LowLevelException",
-						Handled: newBool(true),
+						Handled: newBool(false),
 						Stacktrace: []*modelpb.StacktraceFrame{{
 							Classname: "Junk",
 							Function:  "e",

diff --git a/input/otlp/metadata.go b/input/otlp/metadata.go
@@ -25,7 +25,8 @@ import (
 	"unicode"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
-	semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
+	semconv26 "go.opentelemetry.io/collector/semconv/v1.26.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
 
 	"github.com/elastic/apm-data/model/modelpb"
 )
@@ -66,8 +67,7 @@ func translateResourceMetadata(resource pcommon.Resource, out *modelpb.APMEvent)
 			out.Service.Node.Name = truncate(v.Str())
 
 		// deployment.*
-		// deployment.environment is deprecated, use deployment.environment.name instead
-		case semconv.AttributeDeploymentEnvironment, "deployment.environment.name":
+		case semconv26.AttributeDeploymentEnvironment, semconv.AttributeDeploymentEnvironmentName:
 			if out.Service == nil {
 				out.Service = &modelpb.Service{}
 			}