Skip to content

Commit 13a2986

Browse files
committed
fix merge
1 parent 7a232ec commit 13a2986

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

cli/logout_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package cli_test
33
import (
44
"testing"
55

6+
"github.com/stretchr/testify/require"
7+
68
"github.com/coder/coder/cli/clitest"
79
"github.com/coder/coder/coderd/coderdtest"
810
"github.com/coder/coder/pty/ptytest"
9-
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestLogout(t *testing.T) {

cli/server.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,12 @@ import (
2626
"github.com/pion/webrtc/v3"
2727
"github.com/prometheus/client_golang/prometheus/promhttp"
2828
"github.com/spf13/cobra"
29+
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2930
"golang.org/x/oauth2"
3031
xgithub "golang.org/x/oauth2/github"
3132
"golang.org/x/xerrors"
3233
"google.golang.org/api/idtoken"
3334
"google.golang.org/api/option"
34-
<<<<<<< HEAD
35-
36-
sdktrace "go.opentelemetry.io/otel/sdk/trace"
37-
=======
38-
>>>>>>> feat: Move from datadog to generic otel
39-
40-
sdktrace "go.opentelemetry.io/otel/sdk/trace"
4135

4236
"cdr.dev/slog"
4337
"cdr.dev/slog/sloggers/sloghuman"
@@ -117,7 +111,7 @@ func server() *cobra.Command {
117111
logger.Warn(cmd.Context(), "failed to start telemetry exporter", slog.Error(err))
118112
} else {
119113
defer func() {
120-
// allow time for traces to flush even if command context is cancelled
114+
// allow time for traces to flush even if command context is canceled
121115
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
122116
defer cancel()
123117
_ = tracerProvider.Shutdown(ctx)

coderd/coderd.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import (
2828
"github.com/coder/coder/coderd/turnconn"
2929
"github.com/coder/coder/codersdk"
3030
"github.com/coder/coder/site"
31-
"github.com/coder/coder/tracing"
32-
sdktrace "go.opentelemetry.io/otel/sdk/trace"
3331
)
3432

3533
// Options are requires parameters for Coder to start.

0 commit comments

Comments
 (0)