Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 19 additions & 42 deletions bottlecap/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bottlecap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ lazy_static = { version = "1.5", default-features = false }
log = { version = "0.4", default-features = false }
mime = { version = "0.3", default-features = false }
multipart = { version = "0.18", default-features = false, features = ["server"] }
nix = { version = "0.26", default-features = false, features = ["feature", "fs"] }
nix = { version = "0.29", default-features = false, features = ["feature", "fs"] }
ordered_hash_map = { version = "0.4", default-features = false }
regex = { version = "1.10", default-features = false }
reqwest = { version = "0.12.11", features = ["json", "http2"], default-features = false }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
thiserror = { version = "1.0", default-features = false }
thiserror = { version = "2.0", default-features = false }
# Transitive dependency (pulled in via cookie). Pinned to >=0.3.47 so cargo audit / CI passes (RUSTSEC-2026-0009).
time = { version = "0.3.47", default-features = false }
tokio = { version = "1.47", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
Expand All @@ -46,7 +46,7 @@ rustls-webpki = { version = "0.103.13", default-features = false }
rustls-pemfile = { version = "2.0", default-features = false, features = ["std"] }
rustls-pki-types = { version = "1.0", default-features = false }
hyper-rustls = { version = "0.27.7", default-features = false }
rand = { version = "0.8", default-features = false }
rand = { version = "0.9", default-features = false }
prost = { version = "0.14", default-features = false }
tonic = { version = "0.14", features = ["transport", "codegen", "server", "channel", "router"], default-features = false }
tonic-types = { version = "0.14", default-features = false }
Expand All @@ -55,7 +55,7 @@ futures = { version = "0.3.31", default-features = false }
serde-aux = { version = "4.7", default-features = false }
serde_html_form = { version = "0.2", default-features = false }
opentelemetry-proto = { version = "0.31.0", features = ["trace", "with-serde", "gen-tonic"] }
opentelemetry-semantic-conventions = { version = "0.30", features = ["semconv_experimental"] }
opentelemetry-semantic-conventions = { version = "0.31", features = ["semconv_experimental"] }
# Pinned to <0.8.3: version 0.8.3 upgraded to openssl-probe 0.2.x which scans all cert
# directories and parses ~200 individual cert files on Lambda instead of loading a single
# bundle file, adding ~45ms to each reqwest::Client::build() call.
Expand Down
14 changes: 10 additions & 4 deletions bottlecap/src/lifecycle/invocation/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use base64::{DecodeError, Engine, engine::general_purpose};
use libdd_trace_protobuf::pb::Span;
use rand::{Rng, RngCore, rngs::OsRng};
use rand::rngs::OsRng;
use rand::{Rng, TryRngCore};
use std::collections::HashMap;

use crate::tags::lambda::tags::{INIT_TYPE, SNAP_START_VALUE};
Expand Down Expand Up @@ -51,11 +52,16 @@ fn create_empty_span(name: String, resource: &str, service: &str) -> Span {
#[must_use]
pub fn generate_span_id() -> u64 {
if std::env::var(INIT_TYPE).is_ok_and(|it| it == SNAP_START_VALUE) {
return OsRng.next_u64();
// SnapStart restores from a snapshot, so seed directly from OS entropy to
// avoid reusing the snapshotted RNG state. Fall back to the thread RNG on
// the (effectively impossible) OS RNG failure rather than panicking.
if let Ok(id) = OsRng.try_next_u64() {
return id;
}
}

let mut rng = rand::thread_rng();
rng.r#gen()
let mut rng = rand::rng();
rng.random()
}

fn redact_value(key: &str, value: String) -> String {
Expand Down
Loading