coder
diff --git a/‎cli/server.go
Lines changed: 3 additions & 2 deletions b/‎cli/server.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎coderd/coderd.go
Lines changed: 10 additions & 0 deletions b/‎coderd/coderd.go
Lines changed: 10 additions & 0 deletions
diff --git a/‎telemetry/exporter.go
Lines changed: 0 additions & 38 deletions b/‎telemetry/exporter.go
Lines changed: 0 additions & 38 deletions
diff --git a/‎telemetry/httpmw.go
Lines changed: 0 additions & 69 deletions b/‎telemetry/httpmw.go
Lines changed: 0 additions & 69 deletions
@@ -37,6 +37,8 @@ import (
 =======
 >>>>>>> feat: Move from datadog to generic otel
 
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
 	"github.com/coder/coder/cli/cliflag"
@@ -56,8 +58,7 @@ import (
 	"github.com/coder/coder/provisionerd"
 	"github.com/coder/coder/provisionersdk"
 	"github.com/coder/coder/provisionersdk/proto"
-	"github.com/coder/coder/telemetry"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"github.com/coder/coder/tracing"
 )
 
 // nolint:gocyclo
 
@@ -15,6 +15,8 @@ import (
 	"golang.org/x/xerrors"
 	"google.golang.org/api/idtoken"
 
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+
 	"cdr.dev/slog"
 	"github.com/coder/coder/buildinfo"
 	"github.com/coder/coder/coderd/awsidentity"
@@ -28,10 +30,14 @@ import (
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/site"
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 	"github.com/coder/coder/telemetry"
 >>>>>>> add telemetry package
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+=======
+	"github.com/coder/coder/tracing"
+>>>>>>> rename to tracing
 )
 
 // Options are requires parameters for Coder to start.
@@ -97,11 +103,15 @@ func New(options *Options) (http.Handler, func()) {
 			})
 		},
 		httpmw.Prometheus,
+<<<<<<< HEAD
 <<<<<<< HEAD
 		tracing.HTTPMW(api.TracerProvider, "coderd.http"),
 =======
 		telemetry.HTTPMW(api.TracerProvider, "coderd.http"),
 >>>>>>> add telemetry package
+=======
+		tracing.HTTPMW(api.TracerProvider, "coderd.http"),
+>>>>>>> rename to tracing
 	)
 
 	r.Route("/api/v2", func(r chi.Router) {