Skip to content
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

Jump to bottom

opentelemetry: Assign default ids if missing #1027

Merged
merged 1 commit into from
Oct 10, 2020
Merged

opentelemetry: Assign default ids if missing #1027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 24 additions & 2 deletions tracing-opentelemetry/src/tracer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,18 @@ impl PreSampledTracer for api::NoopTracer {

impl PreSampledTracer for sdk::Tracer {
fn sampled_span_context(&self, builder: &mut api::SpanBuilder) -> api::SpanContext {
let span_id = builder.span_id.expect("Builders must have id");
let span_id = builder
.span_id
.unwrap_or_else(|| self.provider().config().id_generator.new_span_id());
jtescher marked this conversation as resolved.
Show resolved Hide resolved
let (trace_id, trace_flags) = builder
.parent_context
.as_ref()
.filter(|parent_context| parent_context.is_valid())
.map(|parent_context| (parent_context.trace_id(), parent_context.trace_flags()))
.unwrap_or_else(|| {
let trace_id = builder.trace_id.expect("trace_id should exist");
let trace_id = builder
.trace_id
.unwrap_or_else(|| self.provider().config().id_generator.new_trace_id());

// ensure sampling decision is recorded so all span contexts have consistent flags
let sampling_decision = if let Some(result) = builder.sampling_result.as_ref() {
Expand Down Expand Up @@ -111,3 +115,21 @@ impl PreSampledTracer for sdk::Tracer {
self.provider().config().id_generator.new_span_id()
}
}

#[cfg(test)]
mod tests {
use super::*;
use opentelemetry::api::{Provider, SpanBuilder};
use opentelemetry::sdk;

#[test]
fn assigns_default_ids_if_missing() {
let tracer = sdk::Provider::default().get_tracer("test");
let mut builder = SpanBuilder::from_name("empty".to_string());
builder.trace_id = None;
builder.span_id = None;
let span_context = tracer.sampled_span_context(&mut builder);

assert!(span_context.is_valid());
}
}