Skip to content

Commit 1e73b0c

Browse files
authored
Update support for semconv versions up to semconv 1.27.0 (#440)
1 parent da36b71 commit 1e73b0c

File tree

6 files changed

+212
-92
lines changed

6 files changed

+212
-92
lines changed

input/otlp/exceptions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"github.com/stretchr/testify/require"
4444
"go.opentelemetry.io/collector/pdata/pcommon"
4545
"go.opentelemetry.io/collector/pdata/ptrace"
46-
semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
46+
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
4747
"google.golang.org/protobuf/testing/protocmp"
4848

4949
"github.com/elastic/apm-data/model/modelpb"

input/otlp/logs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242

4343
"go.opentelemetry.io/collector/pdata/pcommon"
4444
"go.opentelemetry.io/collector/pdata/plog"
45-
semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
45+
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
4646

4747
"github.com/elastic/apm-data/model/modelpb"
4848
)
@@ -180,7 +180,7 @@ func (c *Consumer) convertLogRecord(
180180
event.Session = &modelpb.Session{}
181181
}
182182
event.Session.Id = v.Str()
183-
case attributeNetworkConnectionType:
183+
case semconv.AttributeNetworkConnectionType:
184184
if event.Network == nil {
185185
event.Network = &modelpb.Network{}
186186
}

input/otlp/logs_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
"go.opentelemetry.io/collector/consumer"
4747
"go.opentelemetry.io/collector/pdata/pcommon"
4848
"go.opentelemetry.io/collector/pdata/plog"
49-
semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
49+
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
5050
"golang.org/x/sync/semaphore"
5151
"google.golang.org/protobuf/proto"
5252
"google.golang.org/protobuf/testing/protocmp"
@@ -280,6 +280,7 @@ func TestConsumerConsumeLogsException(t *testing.T) {
280280
record2 := newLogRecord("bar")
281281
record2.Attributes().PutStr("event.name", "crash")
282282
record2.Attributes().PutStr("event.domain", "device")
283+
record2.Attributes().PutBool("exception.escaped", true)
283284
record2.Attributes().PutStr("exception.type", "HighLevelException")
284285
record2.Attributes().PutStr("exception.message", "MidLevelException: LowLevelException")
285286
record2.Attributes().PutStr("exception.stacktrace", `
@@ -359,7 +360,7 @@ Caused by: LowLevelException
359360
Exception: &modelpb.Exception{
360361
Type: "HighLevelException",
361362
Message: "MidLevelException: LowLevelException",
362-
Handled: newBool(true),
363+
Handled: newBool(false),
363364
Stacktrace: []*modelpb.StacktraceFrame{{
364365
Classname: "Junk",
365366
Function: "a",
@@ -373,7 +374,7 @@ Caused by: LowLevelException
373374
}},
374375
Cause: []*modelpb.Exception{{
375376
Message: "MidLevelException: LowLevelException",
376-
Handled: newBool(true),
377+
Handled: newBool(false),
377378
Stacktrace: []*modelpb.StacktraceFrame{{
378379
Classname: "Junk",
379380
Function: "c",
@@ -397,7 +398,7 @@ Caused by: LowLevelException
397398
}},
398399
Cause: []*modelpb.Exception{{
399400
Message: "LowLevelException",
400-
Handled: newBool(true),
401+
Handled: newBool(false),
401402
Stacktrace: []*modelpb.StacktraceFrame{{
402403
Classname: "Junk",
403404
Function: "e",

input/otlp/metadata.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import (
2525
"unicode"
2626

2727
"go.opentelemetry.io/collector/pdata/pcommon"
28-
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
28+
semconv26 "go.opentelemetry.io/collector/semconv/v1.26.0"
29+
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
2930

3031
"github.com/elastic/apm-data/model/modelpb"
3132
)
@@ -66,8 +67,7 @@ func translateResourceMetadata(resource pcommon.Resource, out *modelpb.APMEvent)
6667
out.Service.Node.Name = truncate(v.Str())
6768

6869
// deployment.*
69-
// deployment.environment is deprecated, use deployment.environment.name instead
70-
case semconv.AttributeDeploymentEnvironment, "deployment.environment.name":
70+
case semconv26.AttributeDeploymentEnvironment, semconv.AttributeDeploymentEnvironmentName:
7171
if out.Service == nil {
7272
out.Service = &modelpb.Service{}
7373
}

0 commit comments

Comments
 (0)