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

simplify the span exporter #591

Merged
merged 2 commits into from
Feb 7, 2025
Merged

simplify the span exporter #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86d1482
simplify the span exporter
jerbly Feb 7, 2025
1795979
remove unused fields from SpanExporter struct
jerbly Feb 7, 2025
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
28 changes: 4 additions & 24 deletions crates/weaver_emit/src/spans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ mod tests {
use opentelemetry_sdk::{trace as sdktrace, Resource};

use futures_util::future::BoxFuture;
use opentelemetry::trace::{SpanKind, TraceError};
use opentelemetry::trace::SpanKind;
use opentelemetry_sdk::export::{self, trace::ExportResult};
use ordered_float::OrderedFloat;
use std::sync::{atomic, Arc, Mutex};
use std::sync::{Arc, Mutex};
use weaver_forge::registry::{ResolvedGroup, ResolvedRegistry};
use weaver_resolved_schema::attribute::Attribute;
use weaver_semconv::attribute::{
Expand All @@ -174,8 +174,6 @@ mod tests {

#[derive(Debug)]
pub struct SpanExporter {
resource: Resource,
is_shutdown: atomic::AtomicBool,
spans: Arc<Mutex<Vec<export::trace::SpanData>>>,
}

Expand All @@ -184,31 +182,15 @@ mod tests {
&mut self,
batch: Vec<export::trace::SpanData>,
) -> BoxFuture<'static, ExportResult> {
if self.is_shutdown.load(atomic::Ordering::SeqCst) {
Box::pin(std::future::ready(Err(TraceError::from(
"exporter is shut down",
))))
} else {
self.spans.lock().unwrap().extend(batch);
Box::pin(std::future::ready(Ok(())))
}
}

fn shutdown(&mut self) {
self.is_shutdown.store(true, atomic::Ordering::SeqCst);
}

fn set_resource(&mut self, res: &Resource) {
self.resource = res.clone();
self.spans.lock().unwrap().extend(batch);
Box::pin(std::future::ready(Ok(())))
}
}

#[test]
fn test_emit_trace_for_registry() {
let spans = Arc::new(Mutex::new(Vec::new()));
let span_exporter = SpanExporter {
resource: Resource::empty(),
is_shutdown: atomic::AtomicBool::new(false),
spans: spans.clone(),
};
let tracer_provider = sdktrace::TracerProvider::builder()
Expand Down Expand Up @@ -843,9 +825,7 @@ mod tests {
},
],
};

super::emit_trace_for_registry(&registry, "TEST");

global::shutdown_tracer_provider();

// Now check the spans stored in the span exporter
Expand Down
Loading