Skip to content

Commit 5cd5a63

Browse files
authored
Merge pull request moby#5503 from jsternberg/otel-semconv-sever
detect: sever semconv relationship to otel sdk
2 parents 6d93e03 + 9863dd3 commit 5cd5a63

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

util/tracing/detect/resource.go

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package detect
25

36
import (
@@ -7,6 +10,7 @@ import (
710
"sync"
811

912
"go.opentelemetry.io/otel"
13+
"go.opentelemetry.io/otel/sdk"
1014
"go.opentelemetry.io/otel/sdk/resource"
1115
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
1216
)
@@ -23,7 +27,7 @@ func Resource() *resource.Resource {
2327
res, err := resource.New(context.Background(),
2428
resource.WithDetectors(serviceNameDetector{}),
2529
resource.WithFromEnv(),
26-
resource.WithTelemetrySDK(),
30+
resource.WithDetectors(telemetrySDK{}),
2731
)
2832
if err != nil {
2933
otel.Handle(err)
@@ -42,7 +46,15 @@ func OverrideResource(res *resource.Resource) {
4246
})
4347
}
4448

45-
type serviceNameDetector struct{}
49+
type (
50+
telemetrySDK struct{}
51+
serviceNameDetector struct{}
52+
)
53+
54+
var (
55+
_ resource.Detector = telemetrySDK{}
56+
_ resource.Detector = serviceNameDetector{}
57+
)
4658

4759
func (serviceNameDetector) Detect(ctx context.Context) (*resource.Resource, error) {
4860
return resource.StringDetector(
@@ -56,3 +68,13 @@ func (serviceNameDetector) Detect(ctx context.Context) (*resource.Resource, erro
5668
},
5769
).Detect(ctx)
5870
}
71+
72+
// Detect returns a *Resource that describes the OpenTelemetry SDK used.
73+
func (telemetrySDK) Detect(context.Context) (*resource.Resource, error) {
74+
return resource.NewWithAttributes(
75+
semconv.SchemaURL,
76+
semconv.TelemetrySDKName("opentelemetry"),
77+
semconv.TelemetrySDKLanguageGo,
78+
semconv.TelemetrySDKVersion(sdk.Version()),
79+
), nil
80+
}

0 commit comments

Comments
 (0)