Skip to content

Upgrade OTel to 0.24 to support Hyper 1 #6493

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 43 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7de42fe
Upgraded opentelemetry to 0.24, and upgraded related packages to vers…
tninesling Dec 18, 2024
9adc772
Removed Jaeger exporter because it has been deprecated by OTel, attem…
tninesling Dec 18, 2024
b4fdf65
Got tests compiling properly, deleted Jaeger-oriented test configs, a…
tninesling Dec 19, 2024
bece864
Update otel snapshots now that resource is removed. Span preparation …
tninesling Dec 19, 2024
1b2404e
Linter roundup for extra imports and deprecated methods.
tninesling Dec 19, 2024
9625ceb
Use updated trace SDK to set resource once per export instead of merg…
tninesling Dec 19, 2024
bd571f0
Include set_resource implementation for span exporter wrappers.
tninesling Dec 19, 2024
84f3031
Include set_resource implementation for span processor wrappers.
tninesling Dec 19, 2024
0de5d04
Merge branch 'next' into tninesling/otel-0_24
tninesling Dec 20, 2024
366cb8b
Reinstate migration test
tninesling Dec 20, 2024
dd9789b
Restore sort order for snapshot in test_text_logging_with_custom_events
tninesling Dec 20, 2024
e28b0a4
Remove pinned stale versions of http-serde, reqwest, and tonic. http-…
tninesling Dec 20, 2024
dab7f75
Ignore gitleaks false positive for internal metric name
tninesling Dec 20, 2024
d4b4d91
Use same attribute representation in LightSpanData to avoid collectin…
tninesling Jan 2, 2025
29c84b2
Simplify attribute extraction by collecting to HashMap during export
tninesling Jan 2, 2025
556fa21
Revert "Simplify attribute extraction by collecting to HashMap during…
tninesling Jan 2, 2025
c9fd9bb
Revert "Use same attribute representation in LightSpanData to avoid c…
tninesling Jan 2, 2025
1e9c42b
Merge branch 'next' into tninesling/otel-0_24
tninesling Jan 2, 2025
ffe1bf1
Clean up stale comments, and reduce clones in LightSpanData
tninesling Jan 6, 2025
fea1ec5
Merge branch 'next' into tninesling/otel-0_24
tninesling Jan 7, 2025
963ecad
Changeset
tninesling Jan 7, 2025
fc55cf7
Remove tracing configs that distract from logging tests
tninesling Jan 9, 2025
3e2d868
Revert "Remove tracing configs that distract from logging tests"
tninesling Jan 9, 2025
a6216d1
Merge branch 'next' into tninesling/otel-0_24
tninesling Jan 9, 2025
34e9792
Merge branch 'next' into tninesling/otel-0_24
tninesling Jan 13, 2025
052646a
Merge branch 'next' into tninesling/otel-0_24
BrynCooke Jan 15, 2025
95362a8
Replace custom agent sampling with the one from opentelemetry-datadog
tninesling Jan 16, 2025
4cdbb4e
Reenable explicitly setting the sampling.priority attribute in datado…
tninesling Jan 16, 2025
83acdbd
Revert "Reenable explicitly setting the sampling.priority attribute i…
tninesling Jan 17, 2025
f22b4bc
Revert "Replace custom agent sampling with the one from opentelemetry…
tninesling Jan 17, 2025
5ff1bc0
Port datadog encoder updates for handling resource outside spans
tninesling Jan 17, 2025
6bc16e4
Allow too many arguments on trace encoder
tninesling Jan 17, 2025
8364847
Merge dev
Jan 21, 2025
3ab15ad
Added tests for resources as this PR did have to backport some relate…
Jan 21, 2025
3ece21f
Add migration
Jan 21, 2025
e22592b
Fix TLS issues. Native certs are no longer enabled by tonic by default.
Jan 21, 2025
1e81156
Lint
Jan 21, 2025
ec3582d
Remove jaeger from a bunch of places.
Jan 21, 2025
dd0aa21
Update jaeger documentation to indicate that propagation must be enabled
Jan 21, 2025
dd633aa
Minor test logic
Jan 21, 2025
e75b7ba
Merge dev
Jan 21, 2025
9f9c854
Fix docs config files
Jan 21, 2025
f6e7d4f
Fix tests that relied on a crypto provider being set.
Jan 21, 2025
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
32 changes: 32 additions & 0 deletions .changesets/breaking_tninesling_otel_0_24.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
### Upgrade OTel to support Hyper 1 ([PR #6493](https://github.com/apollographql/router/pull/6493))

Upgrades OpenTelemetry dependencies to support hyper 1. The latest versions of OpenTelemetry do not support legacy Jaeger traces. Users should export OpenTelemetry Protocol (OTLP) traces to Jaeger instead. Note that Jaeger _propagation_ is still supported.

(Deprecated) Legacy Jaeger Exporter:

```yaml
telemetry.exporters.tracing:
propagation:
jaeger: true
jaeger:
enabled: true
batch_processor:
scheduled_delay: 100ms
agent:
endpoint: default
```

(Recommended) OTLP Exporter:

```yaml
telemetry.exporters.tracing:
propagation:
jaeger: true
otlp:
enabled: true
batch_processor:
scheduled_delay: 100ms
endpoint: default
```

By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/6493
2 changes: 1 addition & 1 deletion .changesets/feat_bryn_named_runtime_channel.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
A new metric has been introduced to allow observation of how many spans are being dropped by an telemetry batch processor.

- `apollo.router.telemetry.batch_processor.errors` - The number of errors encountered by exporter batch processors.
- `name`: One of `apollo-tracing`, `datadog-tracing`, `jaeger-collector`, `otlp-tracing`, `zipkin-tracing`.
- `name`: One of `apollo-tracing`, `datadog-tracing`, `otlp-tracing`, `zipkin-tracing`.
- `error` = One of `channel closed`, `channel full`.

By observing the number of spans dropped it is possible to estimate what batch processor settings will work for you.
Expand Down
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ executors:
docker:
- image: cimg/base:current
- image: cimg/redis:7.4.1
- image: jaegertracing/all-in-one:1.54.0
- image: openzipkin/zipkin:3.4.3
- image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.17.0
resource_class: 2xlarge
Expand Down
1 change: 1 addition & 0 deletions .gitleaks.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"f12bcddc663aa4c4d90218a1bb718fe74e0e7be3",
"e1e6f93341aea383da2ec6b36a9bfcf7e63a111e",
"e5590027506337381887dadef9baadd063e05830",
"b4fdf65c5eaca08057886e5b30553201302b9764",

# https://github.com/apollographql/router/blob/d826844c8cf433f78938059f02feecc108468e49/licenses.html#L8558
# https://github.com/apollographql/router-private/blob/d826844c8cf433f78938059f02feecc108468e49/licenses.html#L8558
Expand Down
Loading
Loading