Skip to content

Commit 992aad7

Browse files
krisztianfeketethockin
authored andcommitted
chore(otel): bump semconv v1.21.0 -> v1.40.0 and pin schema_url
1 parent 1a40c9d commit 992aad7

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

internal/ateclient/builder.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"go.opentelemetry.io/otel/propagation"
3131
"go.opentelemetry.io/otel/sdk/resource"
3232
sdktrace "go.opentelemetry.io/otel/sdk/trace"
33-
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
33+
semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
3434
"google.golang.org/grpc"
3535
"google.golang.org/grpc/credentials"
3636

@@ -308,6 +308,7 @@ func (c bearerTokenCreds) RequireTransportSecurity() bool { return true }
308308

309309
func initTracing(ctx context.Context, enabled bool) (*sdktrace.TracerProvider, error) {
310310
res, err := resource.New(ctx,
311+
resource.WithSchemaURL(semconv.SchemaURL),
311312
resource.WithAttributes(
312313
semconv.UserAgentOriginal("kubectl-ate"),
313314
),

internal/benchmarking/boomer/trace/trace.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"go.opentelemetry.io/otel/propagation"
3131
"go.opentelemetry.io/otel/sdk/resource"
3232
sdktrace "go.opentelemetry.io/otel/sdk/trace"
33-
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
33+
semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
3434
)
3535

3636
// UpdatableSampler wraps a TraceIDRatioBased sampler whose probability can
@@ -70,6 +70,7 @@ func Init(ctx context.Context, serviceName string, sampler sdktrace.Sampler) (*s
7070
}
7171
res, err := resource.New(ctx,
7272
resource.WithTelemetrySDK(),
73+
resource.WithSchemaURL(semconv.SchemaURL),
7374
resource.WithAttributes(
7475
semconv.ServiceName(serviceName),
7576
semconv.ServiceInstanceID(uuid.NewString()),

internal/serverboot/serverboot.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
3939
"go.opentelemetry.io/otel/sdk/resource"
4040
sdktrace "go.opentelemetry.io/otel/sdk/trace"
41-
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
41+
semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
4242
)
4343

4444
// InitLogger sets the global slog logger to a JSON handler wrapped in
@@ -62,6 +62,9 @@ var serviceInstanceID = uuid.NewString()
6262
func newResource(ctx context.Context, serviceName string) (*resource.Resource, error) {
6363
res, err := resource.New(ctx,
6464
resource.WithTelemetrySDK(),
65+
// Must track the schema version the SDK's own detectors emit, else the
66+
// merge drops the schema URL with ErrSchemaURLConflict (tolerated below).
67+
resource.WithSchemaURL(semconv.SchemaURL),
6568
resource.WithAttributes(
6669
semconv.ServiceName(serviceName),
6770
semconv.ServiceInstanceID(serviceInstanceID),

0 commit comments

Comments
 (0)