api/standard package has moved to semconv

open-telemetry · Aug 4, 2020 · eceaa35 · eceaa35
1 parent 91d579f
commit eceaa35
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/instrumentation/net/http/go.sum b/instrumentation/net/http/go.sum
@@ -40,6 +40,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+go.opentelemetry.io v0.1.0 h1:EANZoRCOP+A3faIlw/iN6YEWoYb1vleZRKm1EvH8T48=
 go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0=
 go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

diff --git a/instrumentation/net/http/handler.go b/instrumentation/net/http/handler.go
@@ -23,8 +23,8 @@ import (
 	"go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/metric"
 	"go.opentelemetry.io/otel/api/propagation"
-	"go.opentelemetry.io/otel/api/standard"
 	"go.opentelemetry.io/otel/api/trace"
+	"go.opentelemetry.io/otel/semconv"
 )
 
 var _ http.Handler = &Handler{}
@@ -125,9 +125,9 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	opts := append([]trace.StartOption{
-		trace.WithAttributes(standard.NetAttributesFromHTTPRequest("tcp", r)...),
-		trace.WithAttributes(standard.EndUserAttributesFromHTTPRequest(r)...),
-		trace.WithAttributes(standard.HTTPServerAttributesFromHTTPRequest(h.operation, "", r)...),
+		trace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", r)...),
+		trace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(r)...),
+		trace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(h.operation, "", r)...),
 	}, h.spanStartOptions...) // start with the configured options
 
 	ctx := propagation.ExtractHTTP(r.Context(), h.propagators, r.Header)
@@ -158,7 +158,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// Add request metrics
 
-	labels := standard.HTTPServerMetricAttributesFromHTTPRequest(h.operation, r)
+	labels := semconv.HTTPServerMetricAttributesFromHTTPRequest(h.operation, r)
 
 	h.counters[RequestContentLength].Add(ctx, bw.read, labels...)
 	h.counters[ResponseContentLength].Add(ctx, rww.written, labels...)
@@ -183,8 +183,8 @@ func setAfterServeAttributes(span trace.Span, read, wrote int64, statusCode int,
 		kv = append(kv, WroteBytesKey.Int64(wrote))
 	}
 	if statusCode > 0 {
-		kv = append(kv, standard.HTTPAttributesFromHTTPStatusCode(statusCode)...)
-		span.SetStatus(standard.SpanStatusFromHTTPStatusCode(statusCode))
+		kv = append(kv, semconv.HTTPAttributesFromHTTPStatusCode(statusCode)...)
+		span.SetStatus(semconv.SpanStatusFromHTTPStatusCode(statusCode))
 	}
 	if werr != nil && werr != io.EOF {
 		kv = append(kv, WriteErrorKey.String(werr.Error()))
@@ -197,7 +197,7 @@ func setAfterServeAttributes(span trace.Span, read, wrote int64, statusCode int,
 func WithRouteTag(route string, h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		span := trace.SpanFromContext(r.Context())
-		span.SetAttributes(standard.HTTPRouteKey.String(route))
+		span.SetAttributes(semconv.HTTPRouteKey.String(route))
 		h.ServeHTTP(w, r)
 	})
 }
diff --git a/instrumentation/net/http/handler_test.go b/instrumentation/net/http/handler_test.go
@@ -26,7 +26,7 @@ import (
 	"google.golang.org/grpc/codes"
 
 	"go.opentelemetry.io/otel/api/kv"
-	"go.opentelemetry.io/otel/api/standard"
+	"go.opentelemetry.io/otel/api/semconv"
 	"go.opentelemetry.io/otel/api/trace"
 
 	mockmeter "go.opentelemetry.io/contrib/internal/metric"
@@ -68,11 +68,11 @@ func TestHandlerBasics(t *testing.T) {
 	}
 
 	labelsToVerify := []kv.KeyValue{
-		standard.HTTPServerNameKey.String(operation),
-		standard.HTTPSchemeHTTP,
-		standard.HTTPHostKey.String(r.Host),
-		standard.HTTPFlavorKey.String(fmt.Sprintf("1.%d", r.ProtoMinor)),
-		standard.HTTPRequestContentLengthKey.Int64(3),
+		semconv.HTTPServerNameKey.String(operation),
+		semconv.HTTPSchemeHTTP,
+		semconv.HTTPHostKey.String(r.Host),
+		semconv.HTTPFlavorKey.String(fmt.Sprintf("1.%d", r.ProtoMinor)),
+		semconv.HTTPRequestContentLengthKey.Int64(3),
 	}
 
 	assertMetricLabels(t, labelsToVerify, meterimpl.MeasurementBatches)

diff --git a/instrumentation/net/http/transport.go b/instrumentation/net/http/transport.go
@@ -21,7 +21,7 @@ import (
 
 	"go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/api/propagation"
-	"go.opentelemetry.io/otel/api/standard"
+	"go.opentelemetry.io/otel/api/semconv"
 	"go.opentelemetry.io/otel/api/trace"
 
 	"google.golang.org/grpc/codes"
@@ -89,7 +89,7 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
 	ctx, span := t.tracer.Start(r.Context(), t.spanNameFormatter("", r), opts...)
 
 	r = r.WithContext(ctx)
-	span.SetAttributes(standard.HTTPClientAttributesFromHTTPRequest(r)...)
+	span.SetAttributes(semconv.HTTPClientAttributesFromHTTPRequest(r)...)
 	propagation.InjectHTTP(ctx, t.propagators, r.Header)
 
 	res, err := t.rt.RoundTrip(r)
@@ -99,8 +99,8 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
 		return res, err
 	}
 
-	span.SetAttributes(standard.HTTPAttributesFromHTTPStatusCode(res.StatusCode)...)
-	span.SetStatus(standard.SpanStatusFromHTTPStatusCode(res.StatusCode))
+	span.SetAttributes(semconv.HTTPAttributesFromHTTPStatusCode(res.StatusCode)...)
+	span.SetStatus(semconv.SpanStatusFromHTTPStatusCode(res.StatusCode))
 	res.Body = &wrappedBody{ctx: ctx, span: span, body: res.Body}
 
 	return res, err