Skip to content
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

Datadog exporter resource behavior and mapping #5386

Merged
merged 30 commits into from
Jul 3, 2024
+1,047 −161
Merged

Datadog exporter resource behavior and mapping #5386

Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e760c2e
add mapping for the router span
bnjjj Jun 10, 2024
27f1d96
Merge branch 'dev' of github.com:apollographql/router into bnjjj/fix_…
bnjjj Jun 25, 2024
1d43fd5
changelog
bnjjj Jun 25, 2024
e343f6b
Tmp
Jun 27, 2024
98de286
Add datadog resource config
Jun 27, 2024
ce332ef
lint
Jun 27, 2024
a45966b
Update json schema for yaml
Jun 28, 2024
869dc03
Enable tests for telemetry on all platforms.
Jun 28, 2024
5ab2310
Lint
Jun 28, 2024
b7e76a4
Switch to jaeger collector so that things work on osx
Jun 28, 2024
cd4c8af
Make sure to explicitly test overriding
Jun 28, 2024
17c7680
Update ddagent test docker image
Jun 28, 2024
b59a89d
Fix and add test for decimal trace id.
Jun 28, 2024
fd68371
Disable datadog tests for non-graphos
Jun 28, 2024
7045ad5
Make it so that original span name is always available.
Jun 28, 2024
f04cefa
Make is so that the user doesn't have to fix the span names for resou…
Jun 28, 2024
00539c6
`resource_mappings` -> `resource_mapping`
Jun 28, 2024
f8f92f5
rustdoc missing subgraph name
Jul 1, 2024
a2d5233
rustdoc missing query_planning mapping
Jul 1, 2024
f943b8f
Add option for fixed span names
Jul 1, 2024
8eb2639
Reduce visibility of fields
Jul 1, 2024
3ee148c
Use serde_derive_default
Jul 1, 2024
ddef1a5
Add docs, make enable_span_mapping and fixed_span_names the default f…
Jul 1, 2024
082a7d0
Update integration tests for new defaults.
Jul 1, 2024
704da6d
Update apollo-router/src/plugins/telemetry/tracing/datadog.rs
BrynCooke Jul 2, 2024
7d752fe
Add env unified tag
Jul 2, 2024
a34d972
Add changelog
Jul 2, 2024
fbda2bf
Factor out a bunch of consts, these were duplicated across the codebase
Jul 2, 2024
2adecb5
Added tests for and fixed override of span names
Jul 2, 2024
3c40231
Merge dev
Jul 2, 2024
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
1 change: 1 addition & 0 deletions apollo-router/src/plugins/telemetry/tracing/datadog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ lazy_static! {
static ref SPAN_RESOURCE_NAME_ATTRIBUTE_MAPPING: HashMap<&'static str, &'static str> = {
let mut map = HashMap::new();
map.insert("request", "http.route");
map.insert("router", "http.route");
Copy link

@Samjin Samjin Jun 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think based on this latest comment, we have to use router as the HTTP and Service entry span for now until if Datadog could auto instrument http span someday. I think this change could go in.

map.insert("supergraph", "graphql.operation.name");
map.insert("query_planning", "graphql.operation.name");
map.insert("subgraph", "subgraph.name");
Expand Down
Loading