8000 feat: add tracing for sql by f0ssel · Pull Request #1610 · coder/coder · GitHub
[go: up one dir, main page]

Skip to content

feat: add tracing for sql #1610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 20, 2022
Prev Previous commit
Next Next commit
fix merge
  • Loading branch information
f0ssel committed May 20, 2022
commit 2005d4cbd0b3b20a1ea72d11e83ea5509cb07134
1 change: 1 addition & 0 deletions cli/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/pion/webrtc/v3"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"golang.org/x/oauth2"
xgithub "golang.org/x/oauth2/github"
"golang.org/x/xerrors"
Expand Down
5 changes: 0 additions & 5 deletions coderd/coderd.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/coder/coder/codersdk"
"github.com/coder/coder/provisionerd/proto"
"github.com/coder/coder/site"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)

// Options are requires parameters for Coder to start.
Expand Down Expand Up @@ -103,11 +102,7 @@ func newRouter(options *Options, a *api) chi.Router {
})
},
httpmw.Prometheus,
<<<<<<< HEAD
tracing.HTTPMW(a.TracerProvider, "coderd.http"),
=======
tracing.HTTPMW(api.TracerProvider, "coderd.http"),
>>>>>>> move to coderd
)

r.Route("/api/v2", func(r chi.Router) {
Expand Down
0