Fix Link conversion and module import issues in tracez.rs

Co-authored-by: lalitb <[email protected]>

Author: Copilot

opentelemetry-otlp/src/transform/logs.rs

@@ -244,7 +244,7 @@ mod tests {
         let resource: ResourceAttributesWithSchema = (&resource).into(); // Convert Resource to ResourceAttributesWithSchema
 
         let grouped_logs =
-            super::group_logs_by_resource_and_scope(log_batch, &resource);
+            super::tonic::group_logs_by_resource_and_scope(log_batch, &resource);
 
         assert_eq!(grouped_logs.len(), 1);
         let resource_logs = &grouped_logs[0];
@@ -264,7 +264,7 @@ mod tests {
         let log_batch = LogBatch::new(&logs);
         let resource: ResourceAttributesWithSchema = (&resource).into(); // Convert Resource to ResourceAttributesWithSchema
         let grouped_logs =
-            super::group_logs_by_resource_and_scope(log_batch, &resource);
+            super::tonic::group_logs_by_resource_and_scope(log_batch, &resource);
 
         assert_eq!(grouped_logs.len(), 1);
         let resource_logs = &grouped_logs[0];

opentelemetry-otlp/src/transform/trace.rs

@@ -195,7 +195,7 @@ mod tests {
         let resource: ResourceAttributesWithSchema = (&resource).into(); // Convert Resource to ResourceAttributesWithSchema
 
         let grouped_spans =
-            super::group_spans_by_resource_and_scope(spans, &resource);
+            super::tonic::group_spans_by_resource_and_scope(spans, &resource);
 
         assert_eq!(grouped_spans.len(), 1);
 
@@ -244,7 +244,7 @@ mod tests {
         let resource: ResourceAttributesWithSchema = (&resource).into(); // Convert Resource to ResourceAttributesWithSchema
 
         let grouped_spans =
-            super::group_spans_by_resource_and_scope(spans, &resource);
+            super::tonic::group_spans_by_resource_and_scope(spans, &resource);
 
         assert_eq!(grouped_spans.len(), 1);
 

opentelemetry-otlp/src/transform/tracez.rs

@@ -8,6 +8,7 @@ mod tonic {
         tracez::v1::{ErrorData, LatencyData, RunningData},
     };
     use crate::transform::common::{to_nanos, tonic::Attributes};
+    use crate::transform::trace::tonic::link_to_proto_link;
 
     pub fn span_data_to_latency_data(span_data: SpanData) -> LatencyData {
         LatencyData {
@@ -18,7 +19,7 @@ mod tonic {
             endtime: to_nanos(span_data.end_time),
             attributes: Attributes::from(span_data.attributes).0,
             events: span_data.events.iter().cloned().map(event_to_span_event).collect(),
-            links: span_data.links.iter().cloned().map(Into::into).collect(),
+            links: span_data.links.iter().cloned().map(link_to_proto_link).collect(),
         }
     }
 
@@ -30,7 +31,7 @@ mod tonic {
             starttime: to_nanos(span_data.start_time),
             attributes: Attributes::from(span_data.attributes).0,
             events: span_data.events.iter().cloned().map(event_to_span_event).collect(),
-            links: span_data.links.iter().cloned().map(Into::into).collect(),
+            links: span_data.links.iter().cloned().map(link_to_proto_link).collect(),
             status: match span_data.status {
                 Status::Error { description } => Some(SpanStatus {
                     message: description.to_string(),
@@ -49,7 +50,7 @@ mod tonic {
             starttime: to_nanos(span_data.start_time),
             attributes: Attributes::from(span_data.attributes).0,
             events: span_data.events.iter().cloned().map(event_to_span_event).collect(),
-            links: span_data.links.iter().cloned().map(Into::into).collect(),
+            links: span_data.links.iter().cloned().map(link_to_proto_link).collect(),
         }
     }
 

opentelemetry-proto/tests/json_serde.rs

@@ -1,4 +1,4 @@
-#[cfg(all(feature = "with-serde", feature = "gen-tonic-messages"))]
+#[cfg(all(feature = "with-serde", feature = "gen-tonic"))]
 mod json_serde {
     #[cfg(feature = "logs")]
     use opentelemetry_proto::tonic::collector::logs::v1::ExportLogsServiceRequest;