Skip to content

Commit 3a67f16

Browse files
lym953claude
andcommitted
chore(deps): upgrade prost to 0.14 along with opentelemetry-proto and tonic-types
Replaces the prost014 alias workaround with a straightforward prost 0.14 upgrade. opentelemetry-proto (0.30→0.31) and tonic-types (0.13→0.14) both moved to prost 0.14, so all three can be bumped together, eliminating the dual-version dependency. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 43d46d6 commit 3a67f16

3 files changed

Lines changed: 79 additions & 28 deletions

File tree

bottlecap/Cargo.lock

Lines changed: 74 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bottlecap/Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,13 @@ rustls-pemfile = { version = "2.0", default-features = false, features = ["std"]
4444
rustls-pki-types = { version = "1.0", default-features = false }
4545
hyper-rustls = { version = "0.27.7", default-features = false }
4646
rand = { version = "0.8", default-features = false }
47-
prost = { version = "0.13", default-features = false }
48-
# libdd-trace-protobuf uses prost 0.14, so we alias it here to call encoded_len() on TracerPayload
49-
prost014 = { package = "prost", version = "0.14", default-features = false }
50-
tonic-types = { version = "0.13", default-features = false }
47+
prost = { version = "0.14", default-features = false }
48+
tonic-types = { version = "0.14", default-features = false }
5149
zstd = { version = "0.13.3", default-features = false }
5250
futures = { version = "0.3.31", default-features = false }
5351
serde-aux = { version = "4.7", default-features = false }
5452
serde_html_form = { version = "0.2", default-features = false }
55-
opentelemetry-proto = { version = "0.30.0", features = ["trace", "with-serde", "gen-tonic"] }
53+
opentelemetry-proto = { version = "0.31.0", features = ["trace", "with-serde", "gen-tonic"] }
5654
opentelemetry-semantic-conventions = { version = "0.30", features = ["semconv_experimental"] }
5755
# Pinned to <0.8.3: version 0.8.3 upgraded to openssl-probe 0.2.x which scans all cert
5856
# directories and parses ~200 individual cert files on Lambda instead of loading a single

bottlecap/src/traces/trace_processor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use tracing::{debug, error};
3434
use crate::traces::stats_generator::StatsGenerator;
3535
use crate::traces::trace_aggregator::{OwnedTracerHeaderTags, SendDataBuilderInfo};
3636
use libdd_trace_normalization::normalizer::SamplerPriority;
37-
use prost014::Message as _;
37+
use prost::Message as _;
3838

3939
#[derive(Clone)]
4040
#[allow(clippy::module_name_repetitions)]
@@ -1265,7 +1265,7 @@ mod tests {
12651265
#[test]
12661266
fn test_process_traces_body_size_reflects_filtered_payload() {
12671267
use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig;
1268-
use prost014::Message as _;
1268+
use prost::Message as _;
12691269

12701270
let config = Arc::new(Config {
12711271
apm_dd_url: "https://trace.agent.datadoghq.com".to_string(),

0 commit comments

Comments
 (0)