Rename carrier to injector/extractor to match OTEL arg names
https://claude.ai/code/session_01Tbgz29e8A9KS4Bh94skkFX
diff --git a/quire-ci/src/main.rs b/quire-ci/src/main.rs
index 876462e..6ac0f77 100644
--- a/quire-ci/src/main.rs
+++ b/quire-ci/src/main.rs
@@ -369,10 +369,11 @@ fn main() -> Result<()> {
let run_span =
tracing::info_span!("quire.ci.run", sha = %meta.sha, r#ref = %meta.r#ref);
if let Some(tp) = sentry_ctx.traceparent.as_deref() {
- let mut carrier = std::collections::HashMap::new();
- carrier.insert("traceparent".to_string(), tp.to_string());
+ let mut extractor = std::collections::HashMap::new();
+ extractor.insert("traceparent".to_string(), tp.to_string());
run_span.set_parent(
- opentelemetry_sdk::propagation::TraceContextPropagator::new().extract(&carrier),
+ opentelemetry_sdk::propagation::TraceContextPropagator::new()
+ .extract(&extractor),
);
}
let _run_span = run_span.entered();
diff --git a/quire-server/src/ci/mod.rs b/quire-server/src/ci/mod.rs
index f4032d1..9277ed7 100644
--- a/quire-server/src/ci/mod.rs
+++ b/quire-server/src/ci/mod.rs
@@ -169,11 +169,11 @@ fn run_ref(ctx: &TriggerContext<'_>, pushed_at: jiff::Timestamp, push_ref: &Push
let span = tracing::info_span!("quire.ci.run", repo = %ctx.event_repo);
let traceparent = {
- let mut carrier = std::collections::HashMap::new();
+ let mut injector = std::collections::HashMap::new();
opentelemetry::global::get_text_map_propagator(|p| {
- p.inject_context(&span.context(), &mut carrier)
+ p.inject_context(&span.context(), &mut injector)
});
- carrier.remove("traceparent")
+ injector.remove("traceparent")
};
let _guard = span.enter();