Breaking changes, initial implementation for replacing clone() with refs

Author: Puffy1215

opentelemetry-sdk/src/trace/export.rs

@@ -73,30 +73,30 @@ pub trait SpanExporter: Send + Sync + Debug {
 /// `SpanData` contains all the information collected by a `Span` and can be used
 /// by exporters as a standard input.
 #[derive(Clone, Debug, PartialEq)]
-pub struct SpanData {
+pub struct SpanData<'a> {
     /// Exportable `SpanContext`
     pub span_context: SpanContext,
     /// Span parent id
     pub parent_span_id: SpanId,
     /// Span kind
-    pub span_kind: SpanKind,
+    pub span_kind: &'a SpanKind,
     /// Span name
-    pub name: Cow<'static, str>,
+    pub name: &'a Cow<'static, str>,
     /// Span start time
     pub start_time: SystemTime,
     /// Span end time
     pub end_time: SystemTime,
     /// Span attributes
-    pub attributes: Vec<KeyValue>,
+    pub attributes: &'a Vec<KeyValue>,
     /// The number of attributes that were above the configured limit, and thus
     /// dropped.
     pub dropped_attributes_count: u32,
     /// Span events
-    pub events: crate::trace::SpanEvents,
+    pub events: &'a crate::trace::SpanEvents,
     /// Span Links
-    pub links: crate::trace::SpanLinks,
+    pub links: &'a crate::trace::SpanLinks,
     /// Span status
-    pub status: Status,
+    pub status: &'a Status,
     /// Instrumentation scope that produced this span
     pub instrumentation_scope: InstrumentationScope,
 }

opentelemetry-sdk/src/trace/span.rs

@@ -16,7 +16,7 @@ use std::time::SystemTime;
 
 /// Single operation within a trace.
 #[derive(Debug)]
-pub struct Span {
+pub struct Span<> {
     span_context: SpanContext,
     data: Option<SpanData>,
     tracer: crate::trace::SdkTracer,
@@ -74,12 +74,12 @@ impl Span {
     /// Convert information in this span into `exporter::trace::SpanData`.
     /// This function copies all data from the current span, which will create a
     /// overhead.
-    pub fn exported_data(&self) -> Option<crate::trace::SpanData> {
+    pub fn exported_data<'a>(&'a mut self) -> Option<crate::trace::SpanData<'a>> {
         let (span_context, tracer) = (self.span_context.clone(), &self.tracer);
 
         self.data
-            .as_ref()
-            .map(|data| build_export_data(data.clone(), span_context, tracer))
+            .as_mut()
+            .map(|data| build_export_data(data, span_context, tracer))
     }
 }
 
@@ -199,7 +199,7 @@ impl opentelemetry::trace::Span for Span {
 impl Span {
     fn ensure_ended_and_exported(&mut self, timestamp: Option<SystemTime>) {
         // skip if data has already been exported
-        let mut data = match self.data.take() {
+        let data = &mut match self.data.take() {
             Some(data) => data,
             None => return,
         };
@@ -220,19 +220,11 @@ impl Span {
         match provider.span_processors() {
             [] => {}
             [processor] => {
-                processor.on_end(build_export_data(
-                    data,
-                    self.span_context.clone(),
-                    &self.tracer,
-                ));
+                processor.on_end();
             }
             processors => {
                 for processor in processors {
-                    processor.on_end(build_export_data(
-                        data.clone(),
-                        self.span_context.clone(),
-                        &self.tracer,
-                    ));
+                    processor.on_end();
                 }
             }
         }
@@ -246,23 +238,23 @@ impl Drop for Span {
     }
 }
 
-fn build_export_data(
-    data: SpanData,
+fn build_export_data<'a>(
+    data: &'a mut SpanData,
     span_context: SpanContext,
-    tracer: &crate::trace::SdkTracer,
-) -> crate::trace::SpanData {
+    tracer: &'a crate::trace::SdkTracer,
+) -> crate::trace::SpanData<'a> {
     crate::trace::SpanData {
         span_context,
         parent_span_id: data.parent_span_id,
-        span_kind: data.span_kind,
-        name: data.name,
+        span_kind: &data.span_kind,
+        name: &data.name,
         start_time: data.start_time,
         end_time: data.end_time,
-        attributes: data.attributes,
+        attributes: &data.attributes,
         dropped_attributes_count: data.dropped_attributes_count,
-        events: data.events,
-        links: data.links,
-        status: data.status,
+        events: &data.events,
+        links: &data.links,
+        status: &data.status,
         instrumentation_scope: tracer.instrumentation_scope().clone(),
     }
 }
@@ -721,7 +713,7 @@ mod tests {
         let res = provider.shutdown();
         println!("{:?}", res);
         assert!(res.is_ok());
-        let dropped_span = tracer.start("span_with_dropped_provider");
+        let mut dropped_span = tracer.start("span_with_dropped_provider");
         // return none if the provider has already been dropped
         assert!(dropped_span.exported_data().is_none());
     }