Fix import/module path errors in transform files

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

Author: Copilot

opentelemetry-otlp/src/transform/logs.rs

@@ -2,28 +2,28 @@
 pub mod tonic {
     use opentelemetry_proto::tonic::{
         common::v1::{
-            any_value::Value, AnyValue, ArrayValue, InstrumentationScope, KeyValue,
+            any_value::Value, AnyValue, ArrayValue, KeyValue,
             KeyValueList,
         },
         logs::v1::{LogRecord, ResourceLogs, ScopeLogs, SeverityNumber},
         resource::v1::Resource,
     };
-    use crate::transform::common::{to_nanos, tonic::ResourceAttributesWithSchema};
+    use crate::transform::common::{
+        to_nanos,
+        tonic::{ResourceAttributesWithSchema, instrumentation_scope_from_scope_ref_and_target},
+    };
     use opentelemetry::logs::{AnyValue as LogsAnyValue, Severity};
     use opentelemetry_sdk::logs::LogBatch;
     use std::borrow::Cow;
     use std::collections::HashMap;
 
-    impl From<LogsAnyValue> for AnyValue {
-        fn from(value: LogsAnyValue) -> Self {
-            AnyValue {
-                value: Some(value.into()),
-            }
+    fn any_value_from_logs_any_value(value: LogsAnyValue) -> AnyValue {
+        AnyValue {
+            value: Some(value_from_logs_any_value(value)),
         }
     }
 
-    impl From<LogsAnyValue> for Value {
-        fn from(value: LogsAnyValue) -> Self {
+    fn value_from_logs_any_value(value: LogsAnyValue) -> Value {
             match value {
                 LogsAnyValue::Double(f) => Value::DoubleValue(f),
                 LogsAnyValue::Int(i) => Value::IntValue(i),
@@ -32,26 +32,21 @@ pub mod tonic {
                 LogsAnyValue::ListAny(v) => Value::ArrayValue(ArrayValue {
                     values: v
                         .into_iter()
-                        .map(|v| AnyValue {
-                            value: Some(v.into()),
-                        })
+                        .map(|v| any_value_from_logs_any_value(v))
                         .collect(),
                 }),
                 LogsAnyValue::Map(m) => Value::KvlistValue(KeyValueList {
                     values: m
                         .into_iter()
                         .map(|(key, value)| KeyValue {
                             key: key.into(),
-                            value: Some(AnyValue {
-                                value: Some(value.into()),
-                            }),
+                            value: Some(any_value_from_logs_any_value(value)),
                         })
                         .collect(),
                 }),
                 LogsAnyValue::Bytes(v) => Value::BytesValue(*v),
                 _ => unreachable!("Nonexistent value type"),
             }
-        }
     }
 
     impl From<&opentelemetry_sdk::logs::SdkLogRecord> for LogRecord {
@@ -93,9 +88,7 @@ pub mod tonic {
                         .attributes_iter()
                         .map(|kv| KeyValue {
                             key: kv.0.to_string(),
-                            value: Some(AnyValue {
-                                value: Some(kv.1.clone().into()),
-                            }),
+                            value: Some(any_value_from_logs_any_value(kv.1.clone())),
                         })
                         .collect()
                 },
@@ -156,7 +149,7 @@ pub mod tonic {
                         .schema_url()
                         .map(ToOwned::to_owned)
                         .unwrap_or_default(),
-                    scope: Some(super::common::tonic::instrumentation_scope_from_scope_ref_and_target(instrumentation, log_record.target().cloned())),
+                    scope: Some(instrumentation_scope_from_scope_ref_and_target(instrumentation, log_record.target().cloned())),
                     log_records: vec![log_record.into()],
                 }],
             }
@@ -193,10 +186,10 @@ pub mod tonic {
         let scope_logs = scope_map
             .into_iter()
             .map(|(key, log_data)| ScopeLogs {
-                scope: Some(InstrumentationScope::from((
+                scope: Some(instrumentation_scope_from_scope_ref_and_target(
                     log_data.first().unwrap().1,
                     Some(key.into_owned().into()),
-                ))),
+                )),
                 schema_url: resource.schema_url.clone().unwrap_or_default(),
                 log_records: log_data
                     .into_iter()

opentelemetry-otlp/src/transform/metrics.rs

@@ -36,7 +36,10 @@ pub mod tonic {
         },
         resource::v1::Resource as TonicResource,
     };
-    use crate::transform::common::to_nanos;
+    use crate::transform::common::{
+        to_nanos,
+        tonic::instrumentation_scope_from_scope_ref_and_target,
+    };
 
     pub fn exemplar_value_from_u64(value: u64) -> exemplar::Value {
         exemplar::Value::AsInt(i64::try_from(value).unwrap_or_default())
@@ -127,7 +130,7 @@ pub mod tonic {
     impl From<&SdkScopeMetrics> for TonicScopeMetrics {
         fn from(sm: &SdkScopeMetrics) -> Self {
             TonicScopeMetrics {
-                scope: Some(super::common::tonic::instrumentation_scope_from_scope_ref_and_target(sm.scope(), None)),
+                scope: Some(instrumentation_scope_from_scope_ref_and_target(sm.scope(), None)),
                 metrics: sm.metrics().map(Into::into).collect(),
                 schema_url: sm
                     .scope()

opentelemetry-otlp/src/transform/trace.rs

@@ -4,7 +4,7 @@ pub mod tonic {
     use opentelemetry_proto::tonic::trace::v1::{span, status, ResourceSpans, ScopeSpans, Span, Status};
     use crate::transform::common::{
         to_nanos,
-        tonic::{Attributes, ResourceAttributesWithSchema},
+        tonic::{Attributes, ResourceAttributesWithSchema, instrumentation_scope_from_scope_and_target, instrumentation_scope_from_scope_ref_and_target},
     };
     use opentelemetry::trace;
     use opentelemetry::trace::{Link, SpanId, SpanKind};
@@ -90,8 +90,7 @@ pub mod tonic {
         }
     }
 
-    impl ResourceSpans {
-        pub fn new(source_span: SpanData, resource: &ResourceAttributesWithSchema) -> Self {
+    pub fn new_resource_spans(source_span: SpanData, resource: &ResourceAttributesWithSchema) -> ResourceSpans {
             let span_kind: span::SpanKind = source_span.span_kind.into();
             ResourceSpans {
                 resource: Some(Resource {
@@ -106,7 +105,7 @@ pub mod tonic {
                         .schema_url()
                         .map(ToOwned::to_owned)
                         .unwrap_or_default(),
-                    scope: Some(super::common::tonic::instrumentation_scope_from_scope_and_target(source_span.instrumentation_scope, None)),
+                    scope: Some(instrumentation_scope_from_scope_and_target(source_span.instrumentation_scope, None)),
                     spans: vec![Span {
                         trace_id: source_span.span_context.trace_id().to_bytes().to_vec(),
                         span_id: source_span.span_context.span_id().to_bytes().to_vec(),
@@ -149,7 +148,6 @@ pub mod tonic {
                 }],
             }
         }
-    }
 
     pub fn group_spans_by_resource_and_scope(
         spans: Vec<SpanData>,
@@ -169,7 +167,7 @@ pub mod tonic {
         let scope_spans = scope_map
             .into_iter()
             .map(|(instrumentation, span_records)| ScopeSpans {
-                scope: Some(super::common::tonic::instrumentation_scope_from_scope_ref_and_target(instrumentation, None)),
+                scope: Some(instrumentation_scope_from_scope_ref_and_target(instrumentation, None)),
                 schema_url: resource.schema_url.clone().unwrap_or_default(),
                 spans: span_records
                     .into_iter()
@@ -189,7 +187,8 @@ pub mod tonic {
             schema_url: resource.schema_url.clone().unwrap_or_default(),
         }]
     }
-}
+
+} // End of tonic module
 
 #[cfg(test)]
 mod tests {