fix merge

f0ssel · f0ssel · commit 2005d4cbd0b3 · 2022-05-20T15:33:38.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -28,6 +28,7 @@ import (
 	"github.com/pion/webrtc/v3"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"golang.org/x/oauth2"
 	xgithub "golang.org/x/oauth2/github"
 	"golang.org/x/xerrors"
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -29,7 +29,6 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/provisionerd/proto"
 	"github.com/coder/coder/site"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
 // Options are requires parameters for Coder to start.
@@ -103,11 +102,7 @@ func newRouter(options *Options, a *api) chi.Router {
 			})
 		},
 		httpmw.Prometheus,
-<<<<<<< HEAD
 		tracing.HTTPMW(a.TracerProvider, "coderd.http"),
-=======
-		tracing.HTTPMW(api.TracerProvider, "coderd.http"),
->>>>>>> move to coderd
 	)
 
 	r.Route("/api/v2", func(r chi.Router) {
