From 11eaa4b44c6718ca85d303a7136b608811fd8b33 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 27 May 2025 08:37:15 -0700 Subject: [PATCH 1/3] Upgrade semconv to 1.34.0 in exporters/zipkin --- exporters/zipkin/model.go | 2 +- exporters/zipkin/model_test.go | 2 +- exporters/zipkin/zipkin_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exporters/zipkin/model.go b/exporters/zipkin/model.go index f7a259ad842..37363c1c22f 100644 --- a/exporters/zipkin/model.go +++ b/exporters/zipkin/model.go @@ -20,7 +20,7 @@ import ( semconv120 "go.opentelemetry.io/otel/semconv/v1.20.0" semconv121 "go.opentelemetry.io/otel/semconv/v1.21.0" semconv125 "go.opentelemetry.io/otel/semconv/v1.25.0" - semconv "go.opentelemetry.io/otel/semconv/v1.26.0" + semconv "go.opentelemetry.io/otel/semconv/v1.34.0" "go.opentelemetry.io/otel/trace" ) diff --git a/exporters/zipkin/model_test.go b/exporters/zipkin/model_test.go index 09330ee97e5..7c3c224cdd9 100644 --- a/exporters/zipkin/model_test.go +++ b/exporters/zipkin/model_test.go @@ -22,7 +22,7 @@ import ( tracesdk "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" semconv125 "go.opentelemetry.io/otel/semconv/v1.25.0" - semconv "go.opentelemetry.io/otel/semconv/v1.26.0" + semconv "go.opentelemetry.io/otel/semconv/v1.34.0" "go.opentelemetry.io/otel/trace" ) diff --git a/exporters/zipkin/zipkin_test.go b/exporters/zipkin/zipkin_test.go index 6a2b491807f..6c3f279aa4c 100644 --- a/exporters/zipkin/zipkin_test.go +++ b/exporters/zipkin/zipkin_test.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" - semconv "go.opentelemetry.io/otel/semconv/v1.26.0" + semconv "go.opentelemetry.io/otel/semconv/v1.34.0" "go.opentelemetry.io/otel/trace" ) From 8695dab3292bd8a636cacf02a6e1ca30afda1ee2 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 27 May 2025 08:54:48 -0700 Subject: [PATCH 2/3] Add a changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e5c7d91932..485a9e4b40c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Add metric's schema URL as `otel_scope_schema_url` label in `go.opentelemetry.io/otel/exporters/prometheus`. (#5947) - Add metric's scope attributes as `otel_scope_[attribute]` labels in `go.opentelemetry.io/otel/exporters/prometheus`. (#5947) +### Changed + +- The semantic conventions have been upgraded from `v1.26.0` to `v1.34.0` in `go.opentelemetry.io/otel/exporters/zipkin`. (#6829) + From c296df40d0ada139632a5ec931fe14c62bac2f65 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 28 May 2025 10:11:37 -0700 Subject: [PATCH 3/3] Fix merge --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d12acbb76b9..d108778f281 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,9 +27,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed - The semantic conventions have been upgraded from `v1.26.0` to `v1.34.0` in `go.opentelemetry.io/otel/bridge/opentracing`. (#6827) - -### Changed - - The semantic conventions have been upgraded from `v1.26.0` to `v1.34.0` in `go.opentelemetry.io/otel/exporters/zipkin`. (#6829)