Merge branch 'main' into asher/monitoring

coder · code-asher · May 13, 2022 · May 13, 2022 · May 13, 2022 · May 16, 2022
commit bdc21440f211a6cca76af9af40ddcbeb3657efc9
diff --git a/cli/server.go b/cli/server.go
@@ -47,6 +47,7 @@ import (
 	"github.com/coder/coder/coderd/devtunnel"
 	"github.com/coder/coder/coderd/gitsshkey"
 	"github.com/coder/coder/coderd/monitoring"
+	"github.com/coder/coder/coderd/tracing"
 	"github.com/coder/coder/coderd/turnconn"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
@@ -109,7 +110,7 @@ func server() *cobra.Command {
 				sqlDriver      = "postgres"
 			)
 			if trace {
-				tracerProvider, err = tracing.TracerProvider(cmd.Context(), "coderd")
+				tracerProvider, err = tracing.Provider(cmd.Context(), "coderd")
 				if err != nil {
 					logger.Warn(cmd.Context(), "failed to start telemetry exporter", slog.Error(err))
 				} else {
@@ -280,12 +281,12 @@ func server() *cobra.Command {
 			}
 
 			options.Monitor = monitoring.New(cmd.Context(), &monitoring.Options{
-				Database:        options.Database,
-				Logger:          options.Logger,
-				Telemetry:       telemetry,
+				Database:  options.Database,
+				Logger:    options.Logger,
+				Telemetry: telemetry,
 			})
 
-			handler, closeCoderd := coderd.New(options)
+			coderAPI := coderd.New(options)
 			client := codersdk.New(localURL)
 			if tlsEnable {
 				// Secure transport isn't needed for locally communicating!

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -94,7 +94,7 @@ func New(options *Options) *API {
 			})
 		},
 		httpmw.Prometheus(options.Monitor),
-		chitrace.Middleware(),
+		tracing.HTTPMW(api.TracerProvider, "coderd.http"),
 	)
 
 	r.Route("/api/v2", func(r chi.Router) {

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -499,7 +499,7 @@ func (q *fakeQuerier) GetLatestWorkspaceResources(ctx context.Context) ([]databa
 			buildNumbers[workspaceBuild.WorkspaceID] = workspaceBuild.BuildNumber
 		}
 	}
-	
+
 	// Get resources for each latest build.
 	resources := make([]database.WorkspaceResource, 0)
 	for _, workspaceBuild := range q.workspaceBuilds {

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/tracing/exporter.go b/coderd/tracing/exporter.go
@@ -13,7 +13,7 @@ import (
 
 // 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) {
+func Provider(ctx context.Context, service string) (*sdktrace.TracerProvider, error) {
 	res, err := resource.New(ctx,
 		resource.WithAttributes(
 			// the service name used to display traces in backends