review comments

Author: lalitb

opentelemetry-otlp/src/exporter/http/mod.rs

@@ -309,11 +309,13 @@ impl OtlpHttpClient {
         spans: Vec<SpanData>,
         resource: &opentelemetry_proto::transform::common::tonic::ResourceAttributesWithSchema,
     ) -> opentelemetry::trace::TraceResult<(Vec<u8>, &'static str)> {
-        use opentelemetry_proto::tonic::collector::trace::v1::ExportTraceServiceRequest;
+        use opentelemetry_proto::tonic::{
+            collector::trace::v1::ExportTraceServiceRequest, trace::v1::ResourceSpans,
+        };
 
         let resource_spans = spans
             .into_iter()
-            .map(|log_event| (log_event, resource).into())
+            .map(|span| ResourceSpans::new(span, resource))
             .collect::<Vec<_>>();
 
         let req = ExportTraceServiceRequest { resource_spans };

opentelemetry-otlp/src/exporter/tonic/trace.rs

@@ -5,6 +5,7 @@ use opentelemetry::trace::TraceError;
 use opentelemetry_proto::tonic::collector::trace::v1::{
     trace_service_client::TraceServiceClient, ExportTraceServiceRequest,
 };
+use opentelemetry_proto::tonic::trace::v1::ResourceSpans;
 use opentelemetry_sdk::export::trace::{ExportResult, SpanData, SpanExporter};
 use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
 
@@ -74,8 +75,7 @@ impl SpanExporter for TonicTracesClient {
         let resource_spans = {
             batch
                 .into_iter()
-                .map(|log_data| (log_data, &self.resource))
-                .map(Into::into)
+                .map(|log_data| ResourceSpans::new(log_data, &self.resource))
                 .collect()
         };
 

opentelemetry-proto/src/transform/trace.rs

@@ -45,8 +45,8 @@ pub mod tonic {
         }
     }
 
-    impl From<(SpanData, &ResourceAttributesWithSchema)> for ResourceSpans {
-        fn from((source_span, resource): (SpanData, &ResourceAttributesWithSchema)) -> Self {
+    impl ResourceSpans {
+        pub fn new(source_span: SpanData, resource: &ResourceAttributesWithSchema) -> Self {
             let span_kind: span::SpanKind = source_span.span_kind.into();
             ResourceSpans {
                 resource: Some(Resource {

opentelemetry-sdk/src/testing/trace/in_memory_exporter.rs

@@ -147,7 +147,9 @@ impl SpanExporter for InMemorySpanExporter {
     }
 
     fn set_resource(&mut self, resource: &Resource) {
-        let mut res_guard = self.resource.lock().expect("Resource lock poisoned");
-        *res_guard = resource.clone();
+        self.resource
+            .lock()
+            .map(|mut res_guard| *res_guard = resource.clone())
+            .expect("Resource lock poisoned");
     }
 }

opentelemetry-stdout/src/trace/exporter.rs

@@ -38,15 +38,13 @@ impl Default for SpanExporter {
 impl opentelemetry_sdk::export::trace::SpanExporter for SpanExporter {
     fn export(&mut self, batch: Vec<export::trace::SpanData>) -> BoxFuture<'static, ExportResult> {
         let res = if let Some(writer) = &mut self.writer {
-            (self.encoder)(
-                writer,
-                crate::trace::SpanData::from((batch, &self.resource)),
+            (self.encoder)(writer, crate::trace::SpanData::new(batch, &self.resource)).and_then(
+                |_| {
+                    writer
+                        .write_all(b"\n")
+                        .map_err(|err| TraceError::Other(Box::new(err)))
+                },
             )
-            .and_then(|_| {
-                writer
-                    .write_all(b"\n")
-                    .map_err(|err| TraceError::Other(Box::new(err)))
-            })
         } else {
             Err("exporter is shut down".into())
         };

opentelemetry-stdout/src/trace/transform.rs

@@ -9,17 +9,10 @@ pub struct SpanData {
     resource_spans: Vec<ResourceSpans>,
 }
 
-impl
-    From<(
-        Vec<opentelemetry_sdk::export::trace::SpanData>,
-        &opentelemetry_sdk::Resource,
-    )> for SpanData
-{
-    fn from(
-        (sdk_spans, sdk_resource): (
-            Vec<opentelemetry_sdk::export::trace::SpanData>,
-            &opentelemetry_sdk::Resource,
-        ),
+impl SpanData {
+    pub(crate) fn new(
+        sdk_spans: Vec<opentelemetry_sdk::export::trace::SpanData>,
+        sdk_resource: &opentelemetry_sdk::Resource,
     ) -> Self {
         let mut resource_spans = HashMap::<AttributeSet, ResourceSpans>::new();
         for sdk_span in sdk_spans {