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

resources map to jaeger process tags #215

Merged
merged 1 commit into from
Sep 20, 2020
Merged

resources map to jaeger process tags #215

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
40 changes: 30 additions & 10 deletions opentelemetry-jaeger/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,25 @@ impl trace::SpanExporter for Exporter {
fn export(&self, batch: Vec<Arc<trace::SpanData>>) -> trace::ExportResult {
match self.uploader.lock() {
Ok(mut uploader) => {
let jaeger_spans = batch.into_iter().map(Into::into).collect();
uploader.upload(jaeger::Batch::new(self.process.clone(), jaeger_spans))
let mut jaeger_spans: Vec<jaeger::Span> = Vec::with_capacity(batch.len());
let mut process_tags: Vec<jaeger::Tag> = Vec::new();

for (idx, span) in batch.into_iter().enumerate() {
if idx == 0 {
process_tags.extend(build_process_tags(&span));
}
jaeger_spans.push(span.into());
}
let mut process = self.process.clone();
let tags: Vec<jaeger::Tag> = match process.tags {
Some(mut item) => {
item.extend(process_tags);
item
}
None => process_tags,
};
process.tags = Some(tags);
uploader.upload(jaeger::Batch::new(process, jaeger_spans))
}
Err(_) => trace::ExportResult::FailedNotRetryable,
}
Expand Down Expand Up @@ -455,7 +472,7 @@ impl Into<jaeger::Span> for Arc<trace::SpanData> {
.duration_since(self.start_time)
.unwrap_or_else(|_| Duration::from_secs(0))
.as_micros() as i64,
tags: build_tags(&self),
tags: build_span_tags(&self),
logs: events_to_logs(&self.message_events),
}
}
Expand Down Expand Up @@ -487,7 +504,16 @@ fn links_to_references(links: &sdk::EvictedQueue<api::Link>) -> Option<Vec<jaege
}
}

fn build_tags(span_data: &Arc<trace::SpanData>) -> Option<Vec<jaeger::Tag>> {
fn build_process_tags(span_data: &Arc<trace::SpanData>) -> Vec<jaeger::Tag> {
let tags = span_data
.resource
.iter()
.map(|(k, v)| api::KeyValue::new(k.clone(), v.clone()).into())
.collect::<Vec<_>>();
tags
}

fn build_span_tags(span_data: &Arc<trace::SpanData>) -> Option<Vec<jaeger::Tag>> {
let mut user_overrides = UserOverrides::default();
// TODO determine if namespacing is required to avoid collisions with set attributes
let mut tags = span_data
Expand All @@ -497,12 +523,6 @@ fn build_tags(span_data: &Arc<trace::SpanData>) -> Option<Vec<jaeger::Tag>> {
user_overrides.record_attr(k.as_str());
api::KeyValue::new(k.clone(), v.clone()).into()
})
.chain(
span_data
.resource
.iter()
.map(|(k, v)| api::KeyValue::new(k.clone(), v.clone()).into()),
)
.collect::<Vec<_>>();

// Ensure error status is set
Expand Down