Skip to content

Commit 1974a1e

Browse files
committed
rename to tracing
1 parent 4d62113 commit 1974a1e

File tree

4 files changed

+11
-114
lines changed

4 files changed

+11
-114
lines changed

cli/server.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import (
3232
"google.golang.org/api/idtoken"
3333
"google.golang.org/api/option"
3434

35+
sdktrace "go.opentelemetry.io/otel/sdk/trace"
36+
3537
"cdr.dev/slog"
3638
"cdr.dev/slog/sloggers/sloghuman"
3739
"github.com/coder/coder/cli/cliflag"
@@ -50,8 +52,7 @@ import (
5052
"github.com/coder/coder/provisionerd"
5153
"github.com/coder/coder/provisionersdk"
5254
"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"
5556
)
5657

5758
// nolint:gocyclo
@@ -102,11 +103,13 @@ func server() *cobra.Command {
102103
var tracerProvider *sdktrace.TracerProvider
103104
var err error
104105
if trace {
105-
tracerProvider, err = telemetry.TracerProvider(cmd.Context(), "coderd")
106+
tracerProvider, err = tracing.TracerProvider(cmd.Context(), "coderd")
106107
if err != nil {
107108
logger.Warn(cmd.Context(), "failed to start telemetry exporter", slog.Error(err))
108109
} else {
109-
defer tracerProvider.Shutdown(cmd.Context())
110+
defer func() {
111+
_ = tracerProvider.Shutdown(cmd.Context())
112+
}()
110113
}
111114
}
112115

coderd/coderd.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import (
1515
"golang.org/x/xerrors"
1616
"google.golang.org/api/idtoken"
1717

18+
sdktrace "go.opentelemetry.io/otel/sdk/trace"
19+
1820
"cdr.dev/slog"
1921
"github.com/coder/coder/buildinfo"
2022
"github.com/coder/coder/coderd/awsidentity"
@@ -26,8 +28,7 @@ import (
2628
"github.com/coder/coder/coderd/turnconn"
2729
"github.com/coder/coder/codersdk"
2830
"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"
3132
)
3233

3334
// Options are requires parameters for Coder to start.
@@ -93,7 +94,7 @@ func New(options *Options) (http.Handler, func()) {
9394
})
9495
},
9596
httpmw.Prometheus,
96-
telemetry.HTTPMW(api.TracerProvider, "coderd.http"),
97+
tracing.HTTPMW(api.TracerProvider, "coderd.http"),
9798
)
9899

99100
r.Route("/api/v2", func(r chi.Router) {

telemetry/exporter.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

telemetry/httpmw.go

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)