fix merge

f0ssel · f0ssel · commit 13a2986940d4 · 2022-05-19T22:51:26.000Z
diff --git a/cli/logout_test.go b/cli/logout_test.go
@@ -3,10 +3,11 @@ package cli_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/pty/ptytest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestLogout(t *testing.T) {
diff --git a/cli/server.go b/cli/server.go
@@ -26,18 +26,12 @@ 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"
 	"google.golang.org/api/idtoken"
 	"google.golang.org/api/option"
-<<<<<<< HEAD
-
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
-=======
->>>>>>> feat: Move from datadog to generic otel
-
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
@@ -117,7 +111,7 @@ func server() *cobra.Command {
 					logger.Warn(cmd.Context(), "failed to start telemetry exporter", slog.Error(err))
 				} else {
 					defer func() {
-						// allow time for traces to flush even if command context is cancelled
+						// allow time for traces to flush even if command context is canceled
 						ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 						defer cancel()
 						_ = tracerProvider.Shutdown(ctx)
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -28,8 +28,6 @@ import (
 	"github.com/coder/coder/coderd/turnconn"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/site"
-	"github.com/coder/coder/tracing"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
 // Options are requires parameters for Coder to start.

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ import (`
`28`	`28`	`"github.com/coder/coder/coderd/turnconn"`
`29`	`29`	`"github.com/coder/coder/codersdk"`
`30`	`30`	`"github.com/coder/coder/site"`
`31`		`- "github.com/coder/coder/tracing"`
`32`		`- sdktrace "go.opentelemetry.io/otel/sdk/trace"`
`33`	`31`	`)`
`34`	`32`
`35`	`33`	`// Options are requires parameters for Coder to start.`