Move OTLP source code functions to common to allow Relay/Decoder to use

rayz · rayz · commit 4e73b586e39c · 2025-12-26T10:51:15.000-05:00
diff --git a/lib/saluki-components/src/common/otlp/attributes/mod.rs b/lib/saluki-components/src/common/otlp/attributes/mod.rs
@@ -7,9 +7,8 @@ use otlp_protos::opentelemetry::proto::common::v1::{self as otlp_common, any_val
 use saluki_common::collections::{FastHashMap, FastHashSet};
 use saluki_context::{origin::RawOrigin, tags::TagSet};
 
-use crate::common::otlp::util::{extract_container_tags_from_resource_attributes, resource_to_source};
+use crate::common::otlp::util::extract_container_tags_from_resource_attributes;
 
-pub mod source;
 pub mod translator;
 
 static CORE_MAPPING: LazyLock<FastHashMap<&'static str, &'static str>> = LazyLock::new(|| {
@@ -122,7 +121,7 @@ static KUBERNETES_DD_TAGS: LazyLock<FastHashSet<&'static str>> = LazyLock::new(|
 
 // HTTPMappings defines the mapping between OpenTelemetry semantic conventions
 // and Datadog Agent conventions for HTTP attributes.
-pub(crate) static HTTP_MAPPINGS: LazyLock<FastHashMap<&'static str, &'static str>> = LazyLock::new(|| {
+pub static HTTP_MAPPINGS: LazyLock<FastHashMap<&'static str, &'static str>> = LazyLock::new(|| {
     let mut m = FastHashMap::default();
     m.insert(CLIENT_ADDRESS, "http.client_ip");
     m.insert(HTTP_RESPONSE_BODY_SIZE, "http.response.content_length");
@@ -138,7 +137,7 @@ pub(crate) static HTTP_MAPPINGS: LazyLock<FastHashMap<&'static str, &'static str
     m
 });
 
-pub(super) fn tags_from_attributes(attributes: &[otlp_common::KeyValue]) -> TagSet {
+pub fn tags_from_attributes(attributes: &[otlp_common::KeyValue]) -> TagSet {
     let mut tags = TagSet::default();
 
     for kv in attributes {
@@ -266,7 +265,7 @@ fn try_get_int_from_value(value: Option<&otlp_common::any_value::Value>) -> Opti
     }
 }
 
-pub(super) fn get_int_attribute<'a>(attributes: &'a [otlp_common::KeyValue], key: &str) -> Option<&'a i64> {
+pub fn get_int_attribute<'a>(attributes: &'a [otlp_common::KeyValue], key: &str) -> Option<&'a i64> {
     attributes.iter().find_map(|kv| {
         if kv.key == key {
             if let Some(Value::IntValue(i_val)) = kv.value.as_ref().and_then(|v| v.value.as_ref()) {
diff --git a/lib/saluki-components/src/common/otlp/attributes/translator.rs b/lib/saluki-components/src/common/otlp/attributes/translator.rs
@@ -1,8 +1,8 @@
 use otlp_protos::opentelemetry::proto::common::v1 as otlp_common;
 use saluki_context::tags::TagSet;
 
-use super::{origin_id_from_attributes, resource_to_source, tags_from_attributes};
-use crate::sources::otlp::attributes::source::Source;
+use super::{origin_id_from_attributes, tags_from_attributes};
+use crate::common::otlp::util::{resource_to_source, Source};
 
 pub struct AttributeTranslator {}
 
diff --git a/lib/saluki-components/src/common/otlp/mod.rs b/lib/saluki-components/src/common/otlp/mod.rs
@@ -2,7 +2,10 @@
 //!
 //! Provides shared server setup code for both OTLP receiver (proxy mode) and OTLP source (translation mode).
 
+pub mod attributes;
 pub mod config;
+pub mod origin;
+pub mod traces;
 pub mod util;
 
 use std::sync::Arc;
diff --git a/lib/saluki-components/src/common/otlp/origin.rs b/lib/saluki-components/src/common/otlp/origin.rs
@@ -8,7 +8,7 @@ use saluki_env::WorkloadProvider;
 use tracing::trace;
 
 #[derive(Clone)]
-pub(super) struct OtlpOriginTagResolver {
+pub struct OtlpOriginTagResolver {
     workload_provider: Arc<dyn WorkloadProvider + Send + Sync>,
 }
 
diff --git a/lib/saluki-components/src/common/otlp/traces/mod.rs b/lib/saluki-components/src/common/otlp/traces/mod.rs
@@ -0,0 +1,5 @@
+//! OTLP traces translation logic (shared between source and decoder)
+
+pub mod normalize;
+pub mod transform;
+pub mod translator;
diff --git a/lib/saluki-components/src/common/otlp/traces/normalize.rs b/lib/saluki-components/src/common/otlp/traces/normalize.rs
diff --git a/lib/saluki-components/src/common/otlp/traces/transform.rs b/lib/saluki-components/src/common/otlp/traces/transform.rs
@@ -20,14 +20,14 @@ use serde_json::{Map as JsonMap, Value as JsonValue};
 use stringtheory::MetaString;
 use tracing::error;
 
+use crate::common::otlp::attributes::{get_int_attribute, HTTP_MAPPINGS};
+use crate::common::otlp::traces::normalize::{normalize_service, normalize_tag_value};
+use crate::common::otlp::traces::normalize::{truncate_utf8, MAX_RESOURCE_LEN};
+use crate::common::otlp::traces::translator::{convert_span_id, convert_trace_id};
 use crate::common::otlp::util::get_string_attribute;
 use crate::common::otlp::util::{
     DEPLOYMENT_ENVIRONMENT_KEY, KEY_DATADOG_CONTAINER_ID, KEY_DATADOG_ENVIRONMENT, KEY_DATADOG_VERSION,
 };
-use crate::sources::otlp::attributes::{get_int_attribute, HTTP_MAPPINGS};
-use crate::sources::otlp::traces::normalize::{normalize_service, normalize_tag_value};
-use crate::sources::otlp::traces::normalize::{truncate_utf8, MAX_RESOURCE_LEN};
-use crate::sources::otlp::traces::translator::{convert_span_id, convert_trace_id};
 
 pub(crate) const SAMPLING_PRIORITY_METRIC_KEY: &str = "_sampling_priority_v1";
 const EVENT_EXTRACTION_METRIC_KEY: &str = "_dd1.sr.eausr";
diff --git a/lib/saluki-components/src/common/otlp/traces/translator.rs b/lib/saluki-components/src/common/otlp/traces/translator.rs
@@ -7,9 +7,9 @@ use saluki_core::data_model::event::trace::{Span as DdSpan, Trace};
 use saluki_core::data_model::event::Event;
 
 use crate::common::otlp::config::TracesConfig;
-use crate::sources::otlp::traces::transform::otel_span_to_dd_span;
-use crate::sources::otlp::traces::transform::otlp_value_to_string;
-use crate::sources::otlp::Metrics;
+use crate::common::otlp::traces::transform::otel_span_to_dd_span;
+use crate::common::otlp::traces::transform::otlp_value_to_string;
+use crate::common::otlp::Metrics;
 
 pub fn convert_trace_id(trace_id: &[u8]) -> u64 {
     if trace_id.len() < 8 {
diff --git a/lib/saluki-components/src/sources/otlp/attributes/source/mod.rs b/lib/saluki-components/src/sources/otlp/attributes/source/mod.rs
diff --git a/lib/saluki-components/src/sources/otlp/logs/translator.rs b/lib/saluki-components/src/sources/otlp/logs/translator.rs
@@ -9,12 +9,11 @@ use saluki_context::tags::{SharedTagSet, Tag};
 use saluki_core::data_model::event::Event;
 use stringtheory::MetaString;
 
-use super::super::attributes::raw_origin_from_attributes;
-use crate::common::otlp::util::{get_string_attribute, resource_to_source};
-use crate::sources::otlp::attributes::source::SourceKind;
-use crate::sources::otlp::attributes::tags_from_attributes;
+use crate::common::otlp::attributes::raw_origin_from_attributes;
+use crate::common::otlp::attributes::tags_from_attributes;
+use crate::common::otlp::origin::OtlpOriginTagResolver;
+use crate::common::otlp::util::{get_string_attribute, resource_to_source, SourceKind};
 use crate::sources::otlp::logs::transform::transform_log_record;
-use crate::sources::otlp::origin::OtlpOriginTagResolver;
 
 static OTEL_SOURCE_TAG: Tag = Tag::from_static("otel_source:datadog_agent");
 
diff --git a/lib/saluki-components/src/sources/otlp/metrics/translator.rs b/lib/saluki-components/src/sources/otlp/metrics/translator.rs
@@ -17,15 +17,15 @@ use saluki_core::data_model::event::Event;
 use saluki_error::GenericError;
 use tracing::{debug, warn};
 
-use super::super::attributes::raw_origin_from_attributes;
-use super::super::attributes::source::{Source, SourceKind};
-use super::super::attributes::translator::AttributeTranslator;
 use super::cache::PointsCache;
 use super::config::{HistogramMode, NumberMode, OtlpMetricsTranslatorConfig};
 use super::dimensions::Dimensions;
 use super::internal::{instrumentationlibrary, instrumentationscope};
 use super::remap;
 use super::runtime_metrics::{RuntimeMetricMapping, RUNTIME_METRICS_MAPPINGS};
+use crate::common::otlp::attributes::raw_origin_from_attributes;
+use crate::common::otlp::attributes::translator::AttributeTranslator;
+use crate::common::otlp::util::{Source, SourceKind};
 use crate::sources::otlp::metrics::config::InitialCumulMonoValueMode;
 use crate::sources::otlp::Metrics;
 
diff --git a/lib/saluki-components/src/sources/otlp/mod.rs b/lib/saluki-components/src/sources/otlp/mod.rs
@@ -40,17 +40,14 @@ use crate::common::otlp::config::OtlpConfig;
 use crate::common::otlp::config::TracesConfig;
 use crate::common::otlp::{build_metrics, Metrics, OtlpHandler, OtlpServerBuilder};
 
-mod attributes;
 mod logs;
 mod metrics;
-mod origin;
 mod resolver;
-pub mod traces;
 use self::logs::translator::OtlpLogsTranslator;
 use self::metrics::translator::OtlpMetricsTranslator;
-use self::origin::OtlpOriginTagResolver;
 use self::resolver::build_context_resolver;
-use self::traces::translator::OtlpTracesTranslator;
+use crate::common::otlp::origin::OtlpOriginTagResolver;
+use crate::common::otlp::traces::translator::OtlpTracesTranslator;
 
 const fn default_context_string_interner_size() -> ByteSize {
     ByteSize::mib(2)
diff --git a/lib/saluki-components/src/sources/otlp/traces/mod.rs b/lib/saluki-components/src/sources/otlp/traces/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ use saluki_env::WorkloadProvider;`
`8`	`8`	`use tracing::trace;`
`9`	`9`
`10`	`10`	`#[derive(Clone)]`
`11`		`-pub(super) struct OtlpOriginTagResolver {`
	`11`	`+pub struct OtlpOriginTagResolver {`
`12`	`12`	`workload_provider: Arc<dyn WorkloadProvider + Send + Sync>,`
`13`	`13`	`}`
`14`	`14`