Merge pull request moby#46645 from thaJeztah/otel_semconv

switch to go.opentelemetry.io/otel/semconv/v1.17.0
trebonian · Oct 16, 2023 · 91cb91a · 91cb91a
2 parents fd3066c + 25fb4dd
commit 91cb91a
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 3,021 deletions.
diff --git a/client/hijack.go b/client/hijack.go
@@ -16,7 +16,7 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/propagation"
-	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
+	"go.opentelemetry.io/otel/semconv/v1.17.0/httpconv"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -65,8 +65,8 @@ func (cli *Client) setupHijackConn(req *http.Request, proto string) (_ net.Conn,
 		}
 	}
 
-	ctx, span := tp.Tracer("").Start(ctx, req.Method+" "+req.URL.Path)
-	span.SetAttributes(semconv.HTTPClientAttributesFromHTTPRequest(req)...)
+	ctx, span := tp.Tracer("").Start(ctx, req.Method+" "+req.URL.Path, trace.WithSpanKind(trace.SpanKindClient))
+	span.SetAttributes(httpconv.ClientRequest(req)...)
 	defer func() {
 		if retErr != nil {
 			span.RecordError(retErr)
@@ -98,7 +98,7 @@ func (cli *Client) setupHijackConn(req *http.Request, proto string) (_ net.Conn,
 	// Server hijacks the connection, error 'connection closed' expected
 	resp, err := clientconn.Do(req)
 	if resp != nil {
-		span.SetStatus(semconv.SpanStatusFromHTTPStatusCode(resp.StatusCode))
+		span.SetStatus(httpconv.ClientStatus(resp.StatusCode))
 	}
 
 	//nolint:staticcheck // ignore SA1019 for connecting to old (pre go1.8) daemons

diff --git a/testutil/helpers.go b/testutil/helpers.go
@@ -16,7 +16,7 @@ import (
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/sdk/resource"
 	"go.opentelemetry.io/otel/sdk/trace"
-	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
 	"gotest.tools/v3/icmd"
 )
 

diff --git a/vendor/go.opentelemetry.io/otel/semconv/internal/http.go b/vendor/go.opentelemetry.io/otel/semconv/internal/http.go
diff --git a/vendor/go.opentelemetry.io/otel/semconv/v1.7.0/doc.go b/vendor/go.opentelemetry.io/otel/semconv/v1.7.0/doc.go