File tree Expand file tree Collapse file tree 3 files changed +4
-11
lines changed Expand file tree Collapse file tree 3 files changed +4
-11
lines changed Original file line number Diff line number Diff line change @@ -3,10 +3,11 @@ package cli_test
3
3
import (
4
4
"testing"
5
5
6
+ "github.com/stretchr/testify/require"
7
+
6
8
"github.com/coder/coder/cli/clitest"
7
9
"github.com/coder/coder/coderd/coderdtest"
8
10
"github.com/coder/coder/pty/ptytest"
9
- "github.com/stretchr/testify/require"
10
11
)
11
12
12
13
func TestLogout (t * testing.T ) {
Original file line number Diff line number Diff line change @@ -26,18 +26,12 @@ import (
26
26
"github.com/pion/webrtc/v3"
27
27
"github.com/prometheus/client_golang/prometheus/promhttp"
28
28
"github.com/spf13/cobra"
29
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
29
30
"golang.org/x/oauth2"
30
31
xgithub "golang.org/x/oauth2/github"
31
32
"golang.org/x/xerrors"
32
33
"google.golang.org/api/idtoken"
33
34
"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"
41
35
42
36
"cdr.dev/slog"
43
37
"cdr.dev/slog/sloggers/sloghuman"
@@ -117,7 +111,7 @@ func server() *cobra.Command {
117
111
logger .Warn (cmd .Context (), "failed to start telemetry exporter" , slog .Error (err ))
118
112
} else {
119
113
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
121
115
ctx , cancel := context .WithTimeout (context .Background (), 5 * time .Second )
122
116
defer cancel ()
123
117
_ = tracerProvider .Shutdown (ctx )
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.
You can’t perform that action at this time.
0 commit comments