Skip to content

Commit 116ea62

Browse files
f0sself0ssel
committed
move to coderd
1 parent 5c39d0b commit 116ea62

File tree

7 files changed

+1
-132
lines changed

7 files changed

+1
-132
lines changed

‎cli/server.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import (
5858
"github.com/coder/coder/provisionerd"
5959
"github.com/coder/coder/provisionersdk"
6060
"github.com/coder/coder/provisionersdk/proto"
61-
"github.com/coder/coder/tracing"
6261
)
6362

6463
// nolint:gocyclo

‎coderd/coderd.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,8 @@ import (
2929
"github.com/coder/coder/coderd/turnconn"
3030
"github.com/coder/coder/codersdk"
3131
"github.com/coder/coder/site"
32-
<<<<<<< HEAD
33-
<<<<<<< HEAD
34-
=======
35-
"github.com/coder/coder/telemetry"
36-
>>>>>>> add telemetry package
37-
sdktrace "go.opentelemetry.io/otel/sdk/trace"
38-
=======
3932
"github.com/coder/coder/tracing"
40-
>>>>>>> rename to tracing
33+
sdktrace "go.opentelemetry.io/otel/sdk/trace"
4134
)
4235

4336
// Options are requires parameters for Coder to start.
@@ -103,15 +96,7 @@ func New(options *Options) (http.Handler, func()) {
10396
})
10497
},
10598
httpmw.Prometheus,
106-
<<<<<<< HEAD
107-
<<<<<<< HEAD
108-
tracing.HTTPMW(api.TracerProvider, "coderd.http"),
109-
=======
110-
telemetry.HTTPMW(api.TracerProvider, "coderd.http"),
111-
>>>>>>> add telemetry package
112-
=======
11399
tracing.HTTPMW(api.TracerProvider, "coderd.http"),
114-
>>>>>>> rename to tracing
115100
)
116101

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

‎coderd/tracing/httpmw.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
func HTTPMW(tracerProvider *sdktrace.TracerProvider, name string) func(http.Handler) http.Handler {
1616
return func(next http.Handler) http.Handler {
1717
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
18-
// do not trace if exporter has not be initialized
1918
if tracerProvider == nil {
2019
next.ServeHTTP(rw, r)
2120
return

‎go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ require (
240240
go.opentelemetry.io/otel v1.7.0
241241
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
242242
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0
243-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0
244243
go.opentelemetry.io/otel/sdk v1.7.0
245244
go.opentelemetry.io/otel/trace v1.7.0 // indirect
246245
go.opentelemetry.io/proto/otlp v0.16.0 // indirect

‎go.sum

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,6 @@ go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwk
16011601
go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI=
16021602
go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
16031603
go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
1604-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg=
16051604
go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
16061605
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
16071606
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40=
@@ -1616,8 +1615,6 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.3/go.mod h1
16161615
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0 h1:MFAyzUPrTwLOwCi+cltN0ZVyy4phU41lwH+lyMyQTS4=
16171616
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0/go.mod h1:E+/KKhwOSw8yoPxSSuUHG6vKppkvhN+S1Jc7Nib3k3o=
16181617
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
1619-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0 h1:pLP0MH4MAqeTEV0g/4flxw9O8Is48uAIauAnjznbW50=
1620-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0/go.mod h1:aFXT9Ng2seM9eizF+LfKiyPBGy8xIZKwhusC1gIu3hA=
16211618
go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
16221619
go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw=
16231620
go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=

‎tracing/exporter.go

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

‎tracing/httpmw.go

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

0 commit comments

Comments
 (0)