File tree Expand file tree Collapse file tree 4 files changed +11
-114
lines changed Expand file tree Collapse file tree 4 files changed +11
-114
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,8 @@ import (
32
32
"google.golang.org/api/idtoken"
33
33
"google.golang.org/api/option"
34
34
35
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
36
+
35
37
"cdr.dev/slog"
36
38
"cdr.dev/slog/sloggers/sloghuman"
37
39
"github.com/coder/coder/cli/cliflag"
@@ -50,8 +52,7 @@ import (
50
52
"github.com/coder/coder/provisionerd"
51
53
"github.com/coder/coder/provisionersdk"
52
54
"github.com/coder/coder/provisionersdk/proto"
53
- "github.com/coder/coder/telemetry"
54
- sdktrace "go.opentelemetry.io/otel/sdk/trace"
55
+ "github.com/coder/coder/tracing"
55
56
)
56
57
57
58
// nolint:gocyclo
@@ -102,11 +103,13 @@ func server() *cobra.Command {
102
103
var tracerProvider * sdktrace.TracerProvider
103
104
var err error
104
105
if trace {
105
- tracerProvider , err = telemetry .TracerProvider (cmd .Context (), "coderd" )
106
+ tracerProvider , err = tracing .TracerProvider (cmd .Context (), "coderd" )
106
107
if err != nil {
107
108
logger .Warn (cmd .Context (), "failed to start telemetry exporter" , slog .Error (err ))
108
109
} else {
109
- defer tracerProvider .Shutdown (cmd .Context ())
110
+ defer func () {
111
+ _ = tracerProvider .Shutdown (cmd .Context ())
112
+ }()
110
113
}
111
114
}
112
115
Original file line number Diff line number Diff line change @@ -15,6 +15,8 @@ import (
15
15
"golang.org/x/xerrors"
16
16
"google.golang.org/api/idtoken"
17
17
18
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
19
+
18
20
"cdr.dev/slog"
19
21
"github.com/coder/coder/buildinfo"
20
22
"github.com/coder/coder/coderd/awsidentity"
@@ -26,8 +28,7 @@ import (
26
28
"github.com/coder/coder/coderd/turnconn"
27
29
"github.com/coder/coder/codersdk"
28
30
"github.com/coder/coder/site"
29
- "github.com/coder/coder/telemetry"
30
- sdktrace "go.opentelemetry.io/otel/sdk/trace"
31
+ "github.com/coder/coder/tracing"
31
32
)
32
33
33
34
// Options are requires parameters for Coder to start.
@@ -93,7 +94,7 @@ func New(options *Options) (http.Handler, func()) {
93
94
})
94
95
},
95
96
httpmw .Prometheus ,
96
- telemetry .HTTPMW (api .TracerProvider , "coderd.http" ),
97
+ tracing .HTTPMW (api .TracerProvider , "coderd.http" ),
97
98
)
98
99
99
100
r .Route ("/api/v2" , func (r chi.Router ) {
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments