Skip to content

Commit b9bebd2

Browse files
MrAliasMrAlias
committed
WIP: Upgrade to semconv/v1.17.0
1 parent 4afb19f commit b9bebd2

File tree

168 files changed

+446
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+446
-373
lines changed

‎detectors/aws/ec2/ec2.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"go.opentelemetry.io/otel/attribute"
2727
"go.opentelemetry.io/otel/sdk/resource"
28-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
28+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2929
)
3030

3131
type config struct {

‎detectors/aws/ec2/ec2_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
"go.opentelemetry.io/otel/attribute"
3030
"go.opentelemetry.io/otel/sdk/resource"
31-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
31+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
3232
)
3333

3434
func TestAWS_Detect(t *testing.T) {

‎detectors/aws/ec2/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/aws/aws-sdk-go v1.44.184
77
github.com/stretchr/testify v1.8.1
8-
go.opentelemetry.io/otel v1.11.2
8+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
99
go.opentelemetry.io/otel/sdk v1.11.2
1010
)
1111

‎detectors/aws/ec2/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
2424
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
2525
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
2626
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
27-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
28-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
27+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
28+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
2929
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
3030
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
3131
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=

‎detectors/aws/ecs/ecs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
"go.opentelemetry.io/otel/attribute"
3030
"go.opentelemetry.io/otel/sdk/resource"
31-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
31+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
3232
)
3333

3434
const (

‎detectors/aws/ecs/ecs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"go.opentelemetry.io/otel/attribute"
2323
"go.opentelemetry.io/otel/sdk/resource"
24-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
24+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2525

2626
"github.com/stretchr/testify/assert"
2727
"github.com/stretchr/testify/mock"

‎detectors/aws/ecs/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20220812150832-b6b31c6eeeaf
77
github.com/stretchr/testify v1.8.1
8-
go.opentelemetry.io/otel v1.11.2
8+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
99
go.opentelemetry.io/otel/sdk v1.11.2
1010
)
1111

‎detectors/aws/ecs/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
1919
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
2020
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
2121
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
22-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
23-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
22+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
23+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
2424
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
2525
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
2626
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=

‎detectors/aws/ecs/test/ecs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
ecs "go.opentelemetry.io/contrib/detectors/aws/ecs"
2626
"go.opentelemetry.io/otel/attribute"
2727
"go.opentelemetry.io/otel/sdk/resource"
28-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
28+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2929

3030
"github.com/stretchr/testify/assert"
3131
)

‎detectors/aws/eks/detector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"go.opentelemetry.io/otel/attribute"
2929
"go.opentelemetry.io/otel/sdk/resource"
30-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
30+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
3131
)
3232

3333
const (

‎detectors/aws/eks/detector_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"go.opentelemetry.io/otel/attribute"
2626
"go.opentelemetry.io/otel/sdk/resource"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
27+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2828
)
2929

3030
type MockDetectorUtils struct {

‎detectors/aws/eks/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/stretchr/testify v1.8.1
7-
go.opentelemetry.io/otel v1.11.2
7+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
88
go.opentelemetry.io/otel/sdk v1.11.2
99
k8s.io/apimachinery v0.26.1
1010
k8s.io/client-go v0.26.1

‎detectors/aws/eks/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
184184
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
185185
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
186186
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
187-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
188-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
187+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
188+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
189189
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
190190
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
191191
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=

‎detectors/aws/lambda/detector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"go.opentelemetry.io/otel/attribute"
2424
"go.opentelemetry.io/otel/sdk/resource"
25-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
25+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2626
)
2727

2828
// For a complete list of reserved environment variables in Lambda, see:

‎detectors/aws/lambda/detector_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"go.opentelemetry.io/otel/attribute"
2525
"go.opentelemetry.io/otel/sdk/resource"
26-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
26+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2727
)
2828

2929
// successfully return resource when process is running on Amazon Lambda environment.

‎detectors/aws/lambda/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/stretchr/testify v1.8.1
7-
go.opentelemetry.io/otel v1.11.2
7+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
88
go.opentelemetry.io/otel/sdk v1.11.2
99
)
1010

‎detectors/aws/lambda/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
1616
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
1717
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
1818
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
19-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
20-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
19+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
20+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
2121
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
2222
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
2323
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=

‎detectors/gcp/cloud-function.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"go.opentelemetry.io/otel/attribute"
2222
"go.opentelemetry.io/otel/sdk/resource"
23-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
23+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2424
)
2525

2626
const (

‎detectors/gcp/cloud-function_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"go.opentelemetry.io/otel/attribute"
2626
"go.opentelemetry.io/otel/sdk/resource"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
27+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2828
)
2929

3030
var (

‎detectors/gcp/cloud-run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"go.opentelemetry.io/otel/attribute"
2626
"go.opentelemetry.io/otel/sdk/resource"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
27+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2828
)
2929

3030
const serviceNamespace = "cloud-run-managed"

‎detectors/gcp/detector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"go.opentelemetry.io/otel/attribute"
2525
"go.opentelemetry.io/otel/sdk/resource"
26-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
26+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2727
)
2828

2929
// NewDetector returns a resource detector which detects resource attributes on:

‎detectors/gcp/detector_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/stretchr/testify/assert"
2525

2626
"go.opentelemetry.io/otel/sdk/resource"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
27+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2828
)
2929

3030
func TestDetect(t *testing.T) {

‎detectors/gcp/gce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"go.opentelemetry.io/otel/attribute"
2626
"go.opentelemetry.io/otel/sdk/resource"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
27+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2828
)
2929

3030
// GCE collects resource information of GCE computing instances.

‎detectors/gcp/gke.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"go.opentelemetry.io/otel/attribute"
2525
"go.opentelemetry.io/otel/sdk/resource"
26-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
26+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2727
)
2828

2929
// GKE collects resource information of GKE computing instances.

‎detectors/gcp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2
88
github.com/google/go-cmp v0.5.9
99
github.com/stretchr/testify v1.8.1
10-
go.opentelemetry.io/otel v1.11.2
10+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
1111
go.opentelemetry.io/otel/sdk v1.11.2
1212
)
1313

‎detectors/gcp/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
2323
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
2424
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
2525
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
26-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
27-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
26+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
27+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
2828
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
2929
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
3030
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=

‎instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/Shopify/sarama"
2323

2424
"go.opentelemetry.io/otel/attribute"
25-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
25+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2626
"go.opentelemetry.io/otel/trace"
2727
)
2828

@@ -63,10 +63,10 @@ func (w *consumerMessagesDispatcherWrapper) Run() {
6363
attrs := []attribute.KeyValue{
6464
semconv.MessagingSystemKey.String("kafka"),
6565
semconv.MessagingDestinationKindTopic,
66-
semconv.MessagingDestinationKey.String(msg.Topic),
66+
semconv.MessagingDestinationNameKey.String(msg.Topic),
6767
semconv.MessagingOperationReceive,
6868
semconv.MessagingMessageIDKey.String(strconv.FormatInt(msg.Offset, 10)),
69-
semconv.MessagingKafkaPartitionKey.Int64(int64(msg.Partition)),
69+
semconv.MessagingKafkaSourcePartitionKey.Int64(int64(msg.Partition)),
7070
}
7171
opts := []trace.SpanStartOption{
7272
trace.WithAttributes(attrs...),

‎instrumentation/github.com/Shopify/sarama/otelsarama/example/consumer/consumer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/Shopify/sarama"
2828

2929
"go.opentelemetry.io/otel"
30-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
30+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
3131
"go.opentelemetry.io/otel/trace"
3232

3333
"go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama"

‎instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/ot
77
require (
88
github.com/Shopify/sarama v1.38.0
99
go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama v0.37.0
10-
go.opentelemetry.io/otel v1.11.2
10+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
1111
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2
1212
go.opentelemetry.io/otel/sdk v1.11.2
1313
go.opentelemetry.io/otel/trace v1.11.2

‎instrumentation/github.com/Shopify/sarama/otelsarama/example/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
5454
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
5555
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
5656
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
57-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
58-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
57+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
58+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
5959
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU=
6060
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2/go.mod h1:bx//lU66dPzNT+Y0hHA12ciKoMOH9iixEwCqC1OeQWQ=
6161
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=

‎instrumentation/github.com/Shopify/sarama/otelsarama/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/Shopify/sarama v1.38.0
77
github.com/stretchr/testify v1.8.1
8-
go.opentelemetry.io/otel v1.11.2
8+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
99
go.opentelemetry.io/otel/trace v1.11.2
1010
)
1111

‎instrumentation/github.com/Shopify/sarama/otelsarama/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
6262
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
6363
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
6464
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
65-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
66-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
65+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
66+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
6767
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=
6868
go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA=
6969
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

‎instrumentation/github.com/Shopify/sarama/otelsarama/producer.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"go.opentelemetry.io/otel/codes"
2727

2828
"go.opentelemetry.io/otel/attribute"
29-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
29+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
3030
"go.opentelemetry.io/otel/trace"
3131
)
3232

@@ -287,7 +287,7 @@ func startProducerSpan(cfg config, version sarama.KafkaVersion, msg *sarama.Prod
287287
attrs := []attribute.KeyValue{
288288
semconv.MessagingSystemKey.String("kafka"),
289289
semconv.MessagingDestinationKindTopic,
290-
semconv.MessagingDestinationKey.String(msg.Topic),
290+
semconv.MessagingDestinationNameKey.String(msg.Topic),
291291
semconv.MessagingMessagePayloadSizeBytesKey.Int(msgPayloadSize(msg, version)),
292292
semconv.MessagingOperationKey.String("send"),
293293
}
@@ -308,7 +308,7 @@ func startProducerSpan(cfg config, version sarama.KafkaVersion, msg *sarama.Prod
308308
func finishProducerSpan(span trace.Span, partition int32, offset int64, err error) {
309309
span.SetAttributes(
310310
semconv.MessagingMessageIDKey.String(strconv.FormatInt(offset, 10)),
311-
semconv.MessagingKafkaPartitionKey.Int64(int64(partition)),
311+
semconv.MessagingKafkaDestinationPartitionKey.Int64(int64(partition)),
312312
)
313313
if err != nil {
314314
span.SetStatus(codes.Error, err.Error())

‎instrumentation/github.com/Shopify/sarama/otelsarama/test/consumer_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"go.opentelemetry.io/otel/propagation"
3030
sdktrace "go.opentelemetry.io/otel/sdk/trace"
3131
"go.opentelemetry.io/otel/sdk/trace/tracetest"
32-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
32+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
3333
"go.opentelemetry.io/otel/trace"
3434
)
3535

@@ -109,10 +109,10 @@ func consumeAndCheck(t *testing.T, mt trace.Tracer, complFn func() []sdktrace.Re
109109
attributeList: []attribute.KeyValue{
110110
semconv.MessagingSystemKey.String("kafka"),
111111
semconv.MessagingDestinationKindTopic,
112-
semconv.MessagingDestinationKey.String("test-topic"),
112+
semconv.MessagingDestinationNameKey.String("test-topic"),
113113
semconv.MessagingOperationReceive,
114114
semconv.MessagingMessageIDKey.String("0"),
115-
semconv.MessagingKafkaPartitionKey.Int64(0),
115+
semconv.MessagingKafkaSourcePartitionKey.Int64(0),
116116
},
117117
parentSpanID: trace.SpanContextFromContext(ctx).SpanID(),
118118
kind: trace.SpanKindConsumer,
@@ -122,10 +122,10 @@ func consumeAndCheck(t *testing.T, mt trace.Tracer, complFn func() []sdktrace.Re
122122
attributeList: []attribute.KeyValue{
123123
semconv.MessagingSystemKey.String("kafka"),
124124
semconv.MessagingDestinationKindTopic,
125-
semconv.MessagingDestinationKey.String("test-topic"),
125+
semconv.MessagingDestinationNameKey.String("test-topic"),
126126
semconv.MessagingOperationReceive,
127127
semconv.MessagingMessageIDKey.String("1"),
128-
semconv.MessagingKafkaPartitionKey.Int64(0),
128+
semconv.MessagingKafkaSourcePartitionKey.Int64(0),
129129
},
130130
kind: trace.SpanKindConsumer,
131131
msgKey: []byte("foo2"),

‎instrumentation/github.com/Shopify/sarama/otelsarama/test/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/Shopify/sarama v1.38.0
77
github.com/stretchr/testify v1.8.1
88
go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama v0.37.0
9-
go.opentelemetry.io/otel v1.11.2
9+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f
1010
go.opentelemetry.io/otel/sdk v1.11.2
1111
go.opentelemetry.io/otel/trace v1.11.2
1212
)

‎instrumentation/github.com/Shopify/sarama/otelsarama/test/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
5959
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
6060
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
6161
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
62-
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
63-
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
62+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f h1:L7yZgGUs2H/zzXMF6LW7lBUQT5/nevS3ud1oHnzvW8I=
63+
go.opentelemetry.io/otel v1.11.3-0.20230124161041-c7e26795299f/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
6464
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
6565
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
6666
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=

0 commit comments

Comments
 (0)