From 5b9e7e134031bb85ad18feab22b33112cf050aec Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Fri, 11 Aug 2023 19:36:57 -0400 Subject: [PATCH] Bump otel/semconv usage to v1.20 (#4645) Make usage consistent across the codebase --------- Signed-off-by: Yuri Shkuro --- cmd/tracegen/main.go | 2 +- examples/hotrod/pkg/tracing/init.go | 2 +- examples/hotrod/pkg/tracing/rpcmetrics/observer.go | 2 +- examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go | 4 ++-- plugin/storage/cassandra/spanstore/reader.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/tracegen/main.go b/cmd/tracegen/main.go index 6e70b84fcbf..43c534fa761 100644 --- a/cmd/tracegen/main.go +++ b/cmd/tracegen/main.go @@ -30,7 +30,7 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.4.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/examples/hotrod/pkg/tracing/init.go b/examples/hotrod/pkg/tracing/init.go index 8ef811d46c6..fc89bffb639 100644 --- a/examples/hotrod/pkg/tracing/init.go +++ b/examples/hotrod/pkg/tracing/init.go @@ -31,7 +31,7 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.7.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" diff --git a/examples/hotrod/pkg/tracing/rpcmetrics/observer.go b/examples/hotrod/pkg/tracing/rpcmetrics/observer.go index 383660e1c81..ffcb2e27f5e 100644 --- a/examples/hotrod/pkg/tracing/rpcmetrics/observer.go +++ b/examples/hotrod/pkg/tracing/rpcmetrics/observer.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.7.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" "github.com/jaegertracing/jaeger/pkg/metrics" diff --git a/examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go b/examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go index 89f1db38695..ae04d8cdc84 100644 --- a/examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go +++ b/examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go @@ -21,12 +21,12 @@ import ( "time" opentracing "github.com/opentracing/opentracing-go" + "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" otbridge "go.opentelemetry.io/otel/bridge/opentracing" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.7.0" - "github.com/opentracing/opentracing-go/ext" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" u "github.com/jaegertracing/jaeger/internal/metricstest" ) diff --git a/plugin/storage/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go index 62d984fca3c..522171833b5 100644 --- a/plugin/storage/cassandra/spanstore/reader.go +++ b/plugin/storage/cassandra/spanstore/reader.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - semconv "go.opentelemetry.io/otel/semconv/v1.4.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" "go.uber.org/zap"