cleanup data we send

f0ssel · f0ssel · commit 33cfd7472404 · 2022-05-18T20:55:10.000Z
diff --git a/telemetry/exporter.go b/telemetry/exporter.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
+	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
@@ -21,7 +21,7 @@ func TracerProvider(ctx context.Context, service string) (*sdktrace.TracerProvid
 		),
 	)
 
-	exporter, err := otlptrace.New(ctx, otlptracehttp.NewClient())
+	exporter, err := otlptrace.New(ctx, otlptracegrpc.NewClient(otlptracegrpc.WithInsecure()))
 	if err != nil {
 		return nil, xerrors.Errorf("creating otlp exporter: %w", err)
 	}
diff --git a/telemetry/httpmw.go b/telemetry/httpmw.go
@@ -31,13 +31,23 @@ func HTTPMW(tracerProvider *sdktrace.TracerProvider, name string) func(http.Hand
 			next.ServeHTTP(rw, r)
 
 			// set the resource name as we get it only once the handler is executed
-			resourceName := chi.RouteContext(r.Context()).RoutePattern()
-			if resourceName == "" {
-				resourceName = "unknown"
+			route := chi.RouteContext(r.Context()).RoutePattern()
+			if route == "" {
+				route = "unknown"
 			}
-			resourceName = r.Method + " " + resourceName
-			fmt.Println(resourceName)
-			span.SetName(resourceName)
+			span.SetName(fmt.Sprintf("%s %s", r.Method, route))
+			span.SetAttributes(attribute.KeyValue{
+				Key:   "http.method",
+				Value: attribute.StringValue(r.Method),
+			})
+			span.SetAttributes(attribute.KeyValue{
+				Key:   "http.route",
+				Value: attribute.StringValue(route),
+			})
+			span.SetAttributes(attribute.KeyValue{
+				Key:   "http.path",
+				Value: attribute.StringValue(r.URL.EscapedPath()),
+			})
 
 			// set the status code
 			status := wrw.Status()
