add telemetry package

coder · f0ssel · May 20, 2022 · May 18, 2022 · May 18, 2022 · May 18, 2022
commit 93ec8180d47bb5ec8609db50f2be8415548d7897
diff --git a/cli/server.go b/cli/server.go
@@ -59,6 +59,7 @@ import (
 	"github.com/coder/coder/provisionersdk"
 	"github.com/coder/coder/provisionersdk/proto"
 	"github.com/coder/coder/telemetry"
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
 // nolint:gocyclo

diff --git a/go.mod b/go.mod
@@ -240,6 +240,7 @@ require (
 	go.opentelemetry.io/otel v1.7.0
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0
 	go.opentelemetry.io/otel/sdk v1.7.0
 	go.opentelemetry.io/otel/trace v1.7.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.16.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1601,6 +1601,7 @@ go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwk
 go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI=
 go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
 go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
+go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg=
 go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40=
@@ -1615,6 +1616,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.3/go.mod h1
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0 h1:MFAyzUPrTwLOwCi+cltN0ZVyy4phU41lwH+lyMyQTS4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0/go.mod h1:E+/KKhwOSw8yoPxSSuUHG6vKppkvhN+S1Jc7Nib3k3o=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0 h1:pLP0MH4MAqeTEV0g/4flxw9O8Is48uAIauAnjznbW50=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0/go.mod h1:aFXT9Ng2seM9eizF+LfKiyPBGy8xIZKwhusC1gIu3hA=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
 go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw=
 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=

diff --git a/telemetry/exporter.go b/telemetry/exporter.go
@@ -3,27 +3,25 @@ package telemetry
 import (
 	"context"
 
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 	"golang.org/x/xerrors"
 )
 
-// Exporter creates a grpc otlp exporter and sets it as the global trace provider.
-// Caller is responsible for closing exporter to ensure all data is flushed.
-func Exporter(ctx context.Context, service string) (func(), error) {
+// TracerProvider creates a grpc otlp exporter and configures a trace provider.
+// Caller is responsible for calling TracerProvider.Shutdown to ensure all data is flushed.
+func TracerProvider(ctx context.Context, service string) (*sdktrace.TracerProvider, error) {
 	res, err := resource.New(ctx,
 		resource.WithAttributes(
 			// the service name used to display traces in backends
 			semconv.ServiceNameKey.String(service),
 		),
 	)
 
-	otlptracegrpc.NewClient()
-	exporter, err := otlptrace.New(ctx, otlptracegrpc.NewClient())
+	exporter, err := otlptrace.New(ctx, otlptracehttp.NewClient())
 	if err != nil {
 		return nil, xerrors.Errorf("creating otlp exporter: %w", err)
 	}
@@ -32,9 +30,6 @@ func Exporter(ctx context.Context, service string) (func(), error) {
 		sdktrace.WithBatcher(exporter),
 		sdktrace.WithResource(res),
 	)
-	otel.SetTracerProvider(tracerProvider)
 
-	return func() {
-		_ = tracerProvider.Shutdown(ctx)
-	}, nil
+	return tracerProvider, nil
 }
diff --git a/telemetry/httpmw.go b/telemetry/httpmw.go
@@ -6,17 +6,23 @@ import (
 
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
 // HTTPMW adds tracing to http routes.
-func HTTPMW(tracer string) func(http.Handler) http.Handler {
+func HTTPMW(tracerProvider *sdktrace.TracerProvider, name string) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+			// // do not trace if exporter has not be initialized
+			if tracerProvider == nil {
+				next.ServeHTTP(rw, r)
+				return
+			}
+
 			// start span with default span name. Span name will be updated once request finishes
-			_, span := otel.Tracer(tracer).Start(r.Context(), "http.request")
+			_, span := tracerProvider.Tracer(name).Start(r.Context(), "http.request")
 			defer span.End()
 
 			wrw := middleware.NewWrapResponseWriter(rw, r.ProtoMajor)
@@ -30,6 +36,7 @@ func HTTPMW(tracer string) func(http.Handler) http.Handler {
 				resourceName = "unknown"
 			}
 			resourceName = r.Method + " " + resourceName
+			fmt.Println(resourceName)
 			span.SetName(resourceName)
 
 			// set the status code