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

Fix span processor exporting unsampled spans #871

Merged
merged 3 commits into from Sep 6, 2022
Merged

Fix span processor exporting unsampled spans #871

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dbd5de
Fix span processor exporting unsampled spans
jtescher Sep 2, 2022
0cc4eb4
Update CI deps for MSRV
jtescher Sep 2, 2022
922afaf
Add test for unsampled spans
jtescher Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions opentelemetry-sdk/src/testing/trace.rs
View file
Open in desktop
Expand Up @@ -9,14 +9,22 @@ use crate::{
use async_trait::async_trait;
use futures_util::future::BoxFuture;
pub use opentelemetry_api::testing::trace::TestSpan;
use opentelemetry_api::trace::{SpanContext, SpanId, SpanKind, Status};
use opentelemetry_api::trace::{
SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState,
};
use std::fmt::{Display, Formatter};
use std::sync::mpsc::{channel, Receiver, Sender};

pub fn new_test_export_span_data() -> SpanData {
let config = Config::default();
SpanData {
span_context: SpanContext::empty_context(),
span_context: SpanContext::new(
TraceId::from_u128(1),
SpanId::from_u64(1),
TraceFlags::SAMPLED,
false,
TraceState::default(),
),
parent_span_id: SpanId::INVALID,
span_kind: SpanKind::Internal,
name: "opentelemetry".into(),
Expand Down
8 changes: 8 additions & 0 deletions opentelemetry-sdk/src/trace/span_processor.rs
View file
Open in desktop
Expand Up @@ -141,6 +141,10 @@ impl SpanProcessor for SimpleSpanProcessor {
}

fn on_end(&self, span: SpanData) {
if !span.span_context.is_sampled() {
return;
}

if let Err(err) = self.sender.send(Some(span)) {
global::handle_error(TraceError::from(format!("error processing span {:?}", err)));
}
Expand Down Expand Up @@ -242,6 +246,10 @@ impl<R: TraceRuntime> SpanProcessor for BatchSpanProcessor<R> {
}

fn on_end(&self, span: SpanData) {
if !span.span_context.is_sampled() {
return;
}

let result = self.message_sender.try_send(BatchMessage::ExportSpan(span));

if let Err(err) = result {
Expand Down
7 changes: 5 additions & 2 deletions scripts/patch_dependencies.sh
View file
Open in desktop
@@ -1,6 +1,9 @@
# Dashmap 5.3.4 requires 1.59
# Dashmap >= 5.3.4 requires 1.59
latest_version=$(cargo search --limit 1 dashmap | head -1 | cut -d'"' -f2) &&
cargo update -p dashmap:$latest_version --precise 5.1.0 &&
# We have time 0.1 and 0.3
latest_version=$(cargo search --limit 1 time | head -1 | cut -d'"' -f2) &&
cargo update -p time:$latest_version --precise 0.3.9
cargo update -p time:$latest_version --precise 0.3.9 &&
# async-global-executor >= 2.3.0 requires 1.59
latest_version=$(cargo search --limit 1 async-global-executor | head -1 | cut -d'"' -f2) &&
cargo update -p async-global-executor:$latest_version --precise 2.2.0