Skip to content

feat: Move from datadog to generic otel #1567

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.

Sign up for GitHub

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 10 commits into from
May 19, 2022
Merged

feat: Move from datadog to generic otel #1567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9249229
feat: Move from datadog to generic otel
f0ssel May 18, 2022
e0e433c
add telemetry pkg
f0ssel May 18, 2022
bdd60f5
add telemetry package
f0ssel May 18, 2022
33cfd74
cleanup data we send
f0ssel May 18, 2022
4d62113
add doc comment
f0ssel May 18, 2022
1974a1e
rename to tracing
f0ssel May 18, 2022
776d8fc
rename to tracing for real
f0ssel May 18, 2022
3d22060
remove datadog logger
f0ssel May 18, 2022
c0099b5
move to coderd
f0ssel May 18, 2022
195a1ba
pr comments
f0ssel May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename to tracing
  • Loading branch information
@f0ssel
f0ssel committed May 18, 2022
commit 1974a1e44671203c7b74b1029ea26f37f882614f
11 changes: 7 additions & 4 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import (
"google.golang.org/api/idtoken"
"google.golang.org/api/option"

sdktrace "go.opentelemetry.io/otel/sdk/trace"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/sloghuman"
"github.com/coder/coder/cli/cliflag"
Expand All @@ -50,8 +52,7 @@ import (
"github.com/coder/coder/provisionerd"
"github.com/coder/coder/provisionersdk"
"github.com/coder/coder/provisionersdk/proto"
"github.com/coder/coder/telemetry"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"github.com/coder/coder/tracing"
)

// nolint:gocyclo
Expand Down Expand Up @@ -102,11 +103,13 @@ func server() *cobra.Command {
var tracerProvider *sdktrace.TracerProvider
var err error
if trace {
tracerProvider, err = telemetry.TracerProvider(cmd.Context(), "coderd")
tracerProvider, err = tracing.TracerProvider(cmd.Context(), "coderd")
if err != nil {
logger.Warn(cmd.Context(), "failed to start telemetry exporter", slog.Error(err))
} else {
defer tracerProvider.Shutdown(cmd.Context())
defer func() {
_ = tracerProvider.Shutdown(cmd.Context())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't want to use cmd.Context() here since it is quite likely to already be cancelled, which would prevent Shutdown from waiting for flush. Perhaps we should create a new context with a timeout instead, say 5 seconds?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, that makes sense

}()
}
}

Expand Down
7 changes: 4 additions & 3 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import (
"golang.org/x/xerrors"
"google.golang.org/api/idtoken"

sdktrace "go.opentelemetry.io/otel/sdk/trace"

"cdr.dev/slog"
"github.com/coder/coder/buildinfo"
"github.com/coder/coder/coderd/awsidentity"
Expand All @@ -26,8 +28,7 @@ import (
"github.com/coder/coder/coderd/turnconn"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/site"
"github.com/coder/coder/telemetry"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"github.com/coder/coder/tracing"
)

// Options are requires parameters for Coder to start.
Expand Down Expand Up @@ -93,7 +94,7 @@ func New(options *Options) (http.Handler, func()) {
})
},
httpmw.Prometheus,
telemetry.HTTPMW(api.TracerProvider, "coderd.http"),
tracing.HTTPMW(api.TracerProvider, "coderd.http"),
)

r.Route("/api/v2", func(r chi.Router) {
Expand Down
38 changes: 0 additions & 38 deletions telemetry/exporter.go
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions telemetry/httpmw.go
View file
Open in desktop

This file was deleted.