Skip to content

[do not merge] v0.27 upgrade #8368

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

Closed
meryl-c wants to merge 25 commits into from
Closed

[do not merge] v0.27 upgrade #8368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2863a3d
Partial upgrade to v26
meryl-c Sep 16, 2025
347c4fb
update dependencies to v27.1
meryl-c Sep 16, 2025
b8459d5
Fix issues in `apollo-router/src/metrics/filter.rs` and `apollo-route…
meryl-c Sep 16, 2025
7593745
fix issues in `apollo-router/src/plugins/telemetry/otlp.rs`
meryl-c Sep 17, 2025
d9482bf
Migrate off of global error handler since it was removed
meryl-c Sep 18, 2025
57e06a5
Implement aggregationselectors as views
meryl-c Sep 18, 2025
62b4792
replace `SpanExporterBuilder` with `SpanExporter::builder()`
meryl-c Sep 18, 2025
6cbb706
replace `.tracer_provider` method calls as the method has been removed
meryl-c Sep 19, 2025
b78a2e4
`init` --> `build`
meryl-c Sep 19, 2025
7305a8f
handle non-exhaustive types
meryl-c Sep 19, 2025
87876db
Add implementation for `opentelemetry::trace::ExportError` to datadog…
meryl-c Sep 22, 2025
f2c92fd
tracer provider fixes
meryl-c Sep 22, 2025
d1749b1
replace `InstrumentationLibrary` with `InstrumentationScope`
meryl-c Sep 22, 2025
97c66da
handle non-exhaustive errors for `KeyValue`
meryl-c Sep 22, 2025
1a25a32
fix return type in `exporter` method
meryl-c Sep 22, 2025
d2aa4f1
Update `KeyValue` construction
meryl-c Sep 22, 2025
9e57ab5
fixes for aggregation views
meryl-c Sep 22, 2025
eed75e6
various small fixes
meryl-c Sep 25, 2025
9235e03
meterprovider fixes
meryl-c Sep 25, 2025
9489892
remove unused imports
meryl-c Sep 25, 2025
4d414a1
Comment out `exporter` method and callers since `MetricExporterBuilde…
meryl-c Sep 29, 2025
c650481
comment out/remove unused imports
meryl-c Sep 29, 2025
918a8f8
fix `versioned_meter` method, have `AggregateHistogram` etc impl Sync…
meryl-c Sep 30, 2025
d1a7c03
fix view
meryl-c Oct 1, 2025
d6804b1
remove methods that return `opentelemetry::global::Error` since it no…
meryl-c Oct 1, 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
107 changes: 59 additions & 48 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,15 @@ dependencies = [
"oci-client",
"once_cell",
"opentelemetry",
"opentelemetry-appender-tracing",
"opentelemetry-aws",
"opentelemetry-datadog",
"opentelemetry-http",
"opentelemetry-jaeger-propagator",
"opentelemetry-otlp",
"opentelemetry-prometheus",
"opentelemetry-proto",
"opentelemetry-semantic-conventions",
"opentelemetry-semantic-conventions 0.16.0",
"opentelemetry-stdout",
"opentelemetry-zipkin",
"opentelemetry_sdk",
Expand Down Expand Up @@ -2333,7 +2334,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.60.2",
"windows-sys 0.61.0",
]

[[package]]
Expand Down Expand Up @@ -2568,7 +2569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
dependencies = [
"libc",
"windows-sys 0.52.0",
"windows-sys 0.60.2",
]

[[package]]
Expand Down Expand Up @@ -3668,7 +3669,7 @@ dependencies = [
"libc",
"percent-encoding",
"pin-project-lite",
"socket2 0.5.10",
"socket2 0.6.0",
"tokio",
"tower-service",
"tracing",
Expand Down Expand Up @@ -3701,7 +3702,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
"windows-core 0.59.0",
"windows-core 0.61.2",
]

[[package]]
Expand Down Expand Up @@ -3950,7 +3951,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
dependencies = [
"hermit-abi",
"libc",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]

[[package]]
Expand All @@ -3968,15 +3969,6 @@ dependencies = [
"nom 8.0.0",
]

[[package]]
name = "itertools"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]

[[package]]
name = "itertools"
version = "0.13.0"
Expand Down Expand Up @@ -4896,45 +4888,57 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"

[[package]]
name = "opentelemetry"
version = "0.24.0"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96"
checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7"
dependencies = [
"futures-core",
"futures-sink",
"js-sys",
"once_cell",
"pin-project-lite",
"thiserror 1.0.69",
"tracing",
]

[[package]]
name = "opentelemetry-appender-tracing"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5feffc321035ad94088a7e5333abb4d84a8726e54a802e736ce9dd7237e85b"
dependencies = [
"opentelemetry",
"tracing",
"tracing-core",
"tracing-subscriber",
]

[[package]]
name = "opentelemetry-aws"
version = "0.12.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f2e5bd1a2e1d14877086a2defe4ac968f42a6a15cfc5862a0f0ecd0f3530135"
checksum = "85eacb6bb0b662955ba69d788c979462b079e70903e29867c2303cc1305ec8de"
dependencies = [
"once_cell",
"opentelemetry",
"opentelemetry_sdk",
"tracing",
]

[[package]]
name = "opentelemetry-datadog"
version = "0.12.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e55061f0b4acd624ce67434c4a6d6d1b5c341d62564bf80094bdaef884f1bf5b"
checksum = "bf575cba36695d55ac2f7e4b58abdb262eba7ceeb48cc2ba47b4187e6eee5e91"
dependencies = [
"ahash",
"futures-core",
"http 1.3.1",
"indexmap 2.11.3",
"itertools 0.11.0",
"itoa",
"once_cell",
"opentelemetry",
"opentelemetry-http",
"opentelemetry-semantic-conventions",
"opentelemetry-semantic-conventions 0.27.0",
"opentelemetry_sdk",
"reqwest",
"rmp",
Expand All @@ -4945,9 +4949,9 @@ dependencies = [

[[package]]
name = "opentelemetry-http"
version = "0.13.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab"
checksum = "10a8a7f5f6ba7c1b286c2fbca0454eaba116f63bbe69ed250b642d36fbb04d80"
dependencies = [
"async-trait",
"bytes",
Expand All @@ -4958,18 +4962,18 @@ dependencies = [

[[package]]
name = "opentelemetry-jaeger-propagator"
version = "0.3.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17"
checksum = "4e33208695c9d3049c848d2abf32f7336ec05cb5c02af1b710e89a99500edeb0"
dependencies = [
"opentelemetry",
]

[[package]]
name = "opentelemetry-otlp"
version = "0.17.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727"
checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76"
dependencies = [
"async-trait",
"futures-core",
Expand All @@ -4987,22 +4991,23 @@ dependencies = [

[[package]]
name = "opentelemetry-prometheus"
version = "0.17.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015"
checksum = "1b834e966ea5e2d03dfe5f2253f03d22cce21403ee940265070eeee96cee0bcc"
dependencies = [
"once_cell",
"opentelemetry",
"opentelemetry_sdk",
"prometheus",
"protobuf",
"tracing",
]

[[package]]
name = "opentelemetry-proto"
version = "0.7.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9"
checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6"
dependencies = [
"hex",
"opentelemetry",
Expand All @@ -5018,11 +5023,17 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05"

[[package]]
name = "opentelemetry-semantic-conventions"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc1b6902ff63b32ef6c489e8048c5e253e2e4a803ea3ea7e783914536eb15c52"

[[package]]
name = "opentelemetry-stdout"
version = "0.5.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287"
checksum = "bc8a298402aa5c260be90d10dc54b5a7d4e1025c354848f8e2c976d761351049"
dependencies = [
"async-trait",
"chrono",
Expand All @@ -5037,17 +5048,17 @@ dependencies = [

[[package]]
name = "opentelemetry-zipkin"
version = "0.22.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e68336254a44c5c20574989699582175910b933be85a593a13031ee58811d93d"
checksum = "4c630342febc883d74af134b87f75f0bded45bd56d1a7673685df23d400a9d26"
dependencies = [
"async-trait",
"futures-core",
"http 1.3.1",
"once_cell",
"opentelemetry",
"opentelemetry-http",
"opentelemetry-semantic-conventions",
"opentelemetry-semantic-conventions 0.27.0",
"opentelemetry_sdk",
"reqwest",
"serde",
Expand All @@ -5058,24 +5069,24 @@ dependencies = [

[[package]]
name = "opentelemetry_sdk"
version = "0.24.1"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df"
checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8"
dependencies = [
"async-std",
"async-trait",
"futures-channel",
"futures-executor",
"futures-util",
"glob",
"once_cell",
"opentelemetry",
"percent-encoding",
"rand 0.8.5",
"serde_json",
"thiserror 1.0.69",
"tokio",
"tokio-stream",
"tracing",
]

[[package]]
Expand Down Expand Up @@ -5647,7 +5658,7 @@ dependencies = [
"once_cell",
"socket2 0.5.10",
"tracing",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]

[[package]]
Expand Down Expand Up @@ -6253,7 +6264,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys",
"windows-sys 0.52.0",
"windows-sys 0.60.2",
]

[[package]]
Expand Down Expand Up @@ -7153,7 +7164,7 @@ dependencies = [
"getrandom 0.3.3",
"once_cell",
"rustix",
"windows-sys 0.52.0",
"windows-sys 0.61.0",
]

[[package]]
Expand Down Expand Up @@ -7736,9 +7747,9 @@ dependencies = [

[[package]]
name = "tracing-opentelemetry"
version = "0.25.0"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b"
checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053"
dependencies = [
"js-sys",
"once_cell",
Expand Down Expand Up @@ -8313,7 +8324,7 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
dependencies = [
"windows-sys 0.48.0",
"windows-sys 0.60.2",
]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ serde_json_bytes = { version = "0.2.5", features = ["preserve_order"] }
similar = { version = "2.5.0", features = ["inline"] }
sha1 = "0.10.6"
tempfile = "3.10.1"
tokio = { version = "1.36.0", features = ["full"] }
tokio = { version = "1.40.0", features = ["full"] }
tower = { version = "0.5.1", features = ["full"] }
Loading