-
Notifications
You must be signed in to change notification settings - Fork 535
feat: add support for otelc in net/http #5000
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
Draft
hannahkm
wants to merge
8
commits into
hannahkm/setup-otelc
Choose a base branch
from
hannahkm/migrate-net-http
base: hannahkm/setup-otelc
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+598
−0
Draft
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
005566e
first wip
hannahkm 9a19519
Merge remote-tracking branch 'refs/remotes/origin/hannahkm/migrate-ne…
hannahkm 56bff6d
remove replace
hannahkm 1ebf69f
Merge branch 'hannahkm/setup-otelc', remote-tracking branch 'origin' …
hannahkm 7553f81
fix go mod files for otelc
hannahkm 66efffa
run generate and fix modules
hannahkm 2bccfb8
Merge branch 'hannahkm/setup-otelc' into hannahkm/migrate-net-http
hannahkm 76809e2
remove imports for otelc
hannahkm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
contrib/aws/datadog-lambda-go/test/integration_tests/hello/go.sum
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // Unless explicitly stated otherwise all files in this repository are licensed | ||
| // under the Apache License Version 2.0. | ||
| // This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| // Copyright 2026 Datadog, Inc. | ||
|
|
||
| //go:build tools | ||
|
|
||
| //nolint:revive | ||
| package http | ||
|
|
||
| import ( | ||
| _ "github.com/DataDog/dd-trace-go/contrib/net/http/v2/otelc" | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # Unless explicitly stated otherwise all files in this repository are licensed | ||
| # under the Apache License Version 2.0. | ||
| # This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| # Copyright 2026-present Datadog, Inc. | ||
| --- | ||
|
|
||
| net-client: | ||
| target: net/http | ||
| where: | ||
| func: RoundTrip | ||
| recv: "*Transport" | ||
| do: | ||
| - inject_hooks: | ||
| before: BeforeRoundTrip | ||
| after: AfterRoundTrip | ||
| path: github.com/DataDog/dd-trace-go/contrib/net/http/v2/otelc | ||
|
|
||
| net-server: | ||
| target: net/http | ||
| where: | ||
| func: ServeHTTP | ||
| recv: serverHandler | ||
| do: | ||
| - inject_hooks: | ||
| before: BeforeServeHTTP | ||
| after: AfterServeHTTP | ||
| path: github.com/DataDog/dd-trace-go/contrib/net/http/v2/otelc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| // Unless explicitly stated otherwise all files in this repository are licensed | ||
| // under the Apache License Version 2.0. | ||
| // This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| // Copyright 2026 Datadog, Inc. | ||
|
|
||
| // Package otelc holds the hook functions that otelc | ||
| // (opentelemetry-go-compile-instrumentation) injects into net/http to produce | ||
| // Datadog spans. They are referenced by otelc.yaml's inject_hooks rules; the | ||
| // tool calls the Before* hook at function entry and the After* hook just before | ||
| // the function returns. | ||
| // | ||
| // This package cannot live under internal/: otelc forces a plain import of it | ||
| // into a generated otelc.runtime.go file in the consumer's own package (e.g. | ||
| // package main), alongside the //go:linkname trampoline it wires into net/http | ||
| // itself. Go's internal-visibility rule would reject that import if this | ||
| // package were nested under internal/. These functions are not a supported | ||
| // public API — they exist only to satisfy otelc's hook-injection contract. | ||
| package otelc | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
| "sync" | ||
|
|
||
| "github.com/open-telemetry/opentelemetry-go-compile-instrumentation/pkg/hook" | ||
|
|
||
| "github.com/DataDog/dd-trace-go/contrib/net/http/v2/internal/config" | ||
| "github.com/DataDog/dd-trace-go/contrib/net/http/v2/internal/wrap" | ||
|
|
||
| "github.com/DataDog/dd-trace-go/v2/instrumentation" | ||
| "github.com/DataDog/dd-trace-go/v2/instrumentation/env" | ||
| "github.com/DataDog/dd-trace-go/v2/instrumentation/httptrace" | ||
| "github.com/DataDog/dd-trace-go/v2/instrumentation/options" | ||
| ) | ||
|
|
||
| // tracerVersionHeader is set by the tracer on every request it sends to the | ||
| // Datadog agent (see ddtrace/tracer/transport.go). Instrumenting those requests | ||
| // would create spans whose submission generates more requests: a span bomb. | ||
| // Orchestrion avoids this with a DD__tracer_internal field on http.Transport, | ||
| // but otelc has no equivalent join point, so we skip on this header instead. | ||
| const tracerVersionHeader = "Datadog-Meta-Tracer-Version" | ||
|
|
||
| // BeforeRoundTrip starts a client span for req and stashes the after-hook that | ||
| // finishes it. It is injected at the top of (*http.Transport).RoundTrip; the | ||
| // receiver is parameter 0 and req is parameter 1. | ||
| func BeforeRoundTrip(ictx hook.HookContext, _ *http.Transport, req *http.Request) { | ||
| if req.Header.Get(tracerVersionHeader) != "" { | ||
| return | ||
| } | ||
| newReq, after, err := wrap.ObserveRoundTrip(defaultRoundTripperConfig(), req) | ||
| if err != nil { | ||
| return | ||
| } | ||
| ictx.SetParam(1, newReq) | ||
| ictx.SetData(after) | ||
| } | ||
|
|
||
| // AfterRoundTrip finishes the client span started by BeforeRoundTrip, applying | ||
| // any response/error mutation the after-hook performs. | ||
| func AfterRoundTrip(ictx hook.HookContext, resp *http.Response, err error) { | ||
| after, ok := ictx.GetData().(wrap.AfterRoundTrip) | ||
| if !ok || after == nil { | ||
| return | ||
| } | ||
| resp, err = after(resp, err) | ||
| ictx.SetReturnVal(0, resp) | ||
| ictx.SetReturnVal(1, err) | ||
| } | ||
|
|
||
| var ( | ||
| cfg *config.RoundTripperConfig | ||
| cfgOnce sync.Once | ||
| ) | ||
|
|
||
| // defaultRoundTripperConfig mirrors the default client configuration built by | ||
| // contrib/net/http/v2/internal/orchestrion so otelc and orchestrion produce | ||
| // identical spans. | ||
| func defaultRoundTripperConfig() *config.RoundTripperConfig { | ||
| cfgOnce.Do(func() { | ||
| cfg = &config.RoundTripperConfig{ | ||
| CommonConfig: config.CommonConfig{ | ||
| AnalyticsRate: func() float64 { | ||
| if options.GetBoolEnv("DD_TRACE_HTTP_ANALYTICS_ENABLED", false) { | ||
| return 1.0 | ||
| } | ||
| return config.Instrumentation.AnalyticsRate(true) | ||
| }(), | ||
| IgnoreRequest: func(*http.Request) bool { return false }, | ||
| ResourceNamer: func() func(req *http.Request) string { | ||
| if options.GetBoolEnv("DD_TRACE_HTTP_CLIENT_RESOURCE_NAME_QUANTIZE", false) { | ||
| return func(req *http.Request) string { | ||
| return fmt.Sprintf("%s %s", req.Method, httptrace.QuantizeURL(req.URL.Path)) | ||
| } | ||
| } | ||
| return func(req *http.Request) string { return fmt.Sprintf("%s %s", req.Method, req.URL.Path) } | ||
| }(), | ||
| IsStatusError: func() func(int) bool { | ||
| envVal := env.Get(config.EnvClientErrorStatuses) | ||
| if fn := httptrace.GetErrorCodesFromInput(envVal); fn != nil { | ||
| return fn | ||
| } | ||
| return func(statusCode int) bool { return statusCode >= 400 && statusCode < 500 } | ||
| }(), | ||
| ServiceName: config.Instrumentation.ServiceName(instrumentation.ComponentClient, nil), | ||
| }, | ||
| Propagation: true, | ||
| QueryString: options.GetBoolEnv(config.EnvClientQueryStringEnabled, true), | ||
| SpanNamer: func(*http.Request) string { | ||
| return config.Instrumentation.OperationName(instrumentation.ComponentClient, nil) | ||
| }, | ||
| } | ||
| }) | ||
| return cfg | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't leak into this module.
We should have another dedicated module for the hooks (if we want to go down that path)