instrumentation/net/http/otelhttp: upgrade semconv to v1.26.0 (open-t…

…elemetry#5923) Bases on the discussion in open-telemetry#5902 , we have came to the conclusion that there's no new stable attributes introduced in semconv v1.26.0 for otelhttp. We can directly bump from v1.24.0 to v1.26.0 Changes in this PR: - bump semconv from v1.24.0 to v1.26.0 for otelhttp - rename the `instrumentation/net/http/otelhttp/internal/semconv/v1.24.0.go` to `instrumentation/net/http/otelhttp/internal/semconv/httpconv.go` to match with client side naming convention --------- Co-authored-by: Damien Mathieu <[email protected]>
scorpionknifes · Jul 19, 2024 · 000758e · 000758e
1 parent 7ce8deb
commit 000758e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   This module provides an OpenTelemetry logging bridge for `go.uber.org/zap`. (#5191)
 - The `go.opentelemetry.io/contrib/config` package supports configuring `with_resource_constant_labels` for the prometheus exporter. (#5890)
 - Add new runtime metrics to `go.opentelemetry.io/contrib/instrumentation/runtime`, which are still disabled by default. (#5870)
-- Support for the `OTEL_HTTP_CLIENT_COMPATIBILITY_MODE=http/dup` environment variable in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` to emit attributes for both the v1.20.0 and v1.24.0 semantic conventions. (#5401)
+- Support for the `OTEL_HTTP_CLIENT_COMPATIBILITY_MODE=http/dup` environment variable in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` to emit attributes for both the v1.20.0 and v1.26.0 semantic conventions. (#5401)
 
 ### Removed
 

diff --git a/...http/otelhttp/internal/semconv/v1.24.0.go → ...ttp/otelhttp/internal/semconv/httpconv.go b/...http/otelhttp/internal/semconv/v1.24.0.go → ...ttp/otelhttp/internal/semconv/httpconv.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconvNew "go.opentelemetry.io/otel/semconv/v1.24.0"
+	semconvNew "go.opentelemetry.io/otel/semconv/v1.26.0"
 )
 
 type newHTTPServer struct{}

diff --git a/...otelhttp/internal/semconv/v1.24.0_test.go → ...telhttp/internal/semconv/httpconv_test.go b/...otelhttp/internal/semconv/v1.24.0_test.go → ...telhttp/internal/semconv/httpconv_test.go
diff --git a/instrumentation/net/http/otelhttp/internal/semconv/util.go b/instrumentation/net/http/otelhttp/internal/semconv/util.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconvNew "go.opentelemetry.io/otel/semconv/v1.24.0"
+	semconvNew "go.opentelemetry.io/otel/semconv/v1.26.0"
 )
 
 // splitHostPort splits a network address hostport of the form "host",