remove some attributes and refactor

Author: rachelyangdog

libdd-data-pipeline/src/lib.rs

@@ -12,7 +12,7 @@
 
 pub mod agent_info;
 mod health_metrics;
-pub mod otlp;
+pub(crate) mod otlp;
 mod pausable_worker;
 #[allow(missing_docs)]
 pub mod stats_exporter;

libdd-data-pipeline/src/trace_exporter/mod.rs

@@ -544,7 +544,6 @@ impl TraceExporter {
             r.language = self.metadata.language.clone();
             r.tracer_version = self.metadata.tracer_version.clone();
             r.runtime_id = self.metadata.runtime_id.clone();
-            r.git_commit_sha = self.metadata.git_commit_sha.clone();
             r
         };
         let request = map_traces_to_otlp(traces, &resource_info);

libdd-trace-utils/src/otlp_encoder/mapper.rs

@@ -89,18 +89,6 @@ fn build_resource(resource_info: &OtlpResourceInfo) -> Resource {
             value: AnyValue::StringValue(resource_info.runtime_id.clone()),
         });
     }
-    if !resource_info.git_commit_sha.is_empty() {
-        attributes.push(KeyValue {
-            key: "git.commit.sha".to_string(),
-            value: AnyValue::StringValue(resource_info.git_commit_sha.clone()),
-        });
-    }
-    if !resource_info.git_repository_url.is_empty() {
-        attributes.push(KeyValue {
-            key: "git.repository_url".to_string(),
-            value: AnyValue::StringValue(resource_info.git_repository_url.clone()),
-        });
-    }
     Resource { attributes }
 }
 
@@ -211,7 +199,7 @@ fn map_span_events<T: TraceData>(events: &[SpanEvent<T>]) -> (Vec<OtlpSpanEvent>
         let attributes: Vec<KeyValue> = ev
             .attributes
             .iter()
-            .filter_map(|(k, v)| event_attr_to_key_value(k, v))
+            .map(|(k, v)| event_attr_to_key_value(k, v))
             .collect();
         otlp_events.push(OtlpSpanEvent {
             time_unix_nano: ev.time_unix_nano.to_string(),
@@ -227,7 +215,7 @@ fn map_span_events<T: TraceData>(events: &[SpanEvent<T>]) -> (Vec<OtlpSpanEvent>
 fn event_attr_to_key_value<T: TraceData>(
     k: &T::Text,
     v: &crate::span::v04::AttributeAnyValue<T>,
-) -> Option<KeyValue> {
+) -> KeyValue {
     use crate::span::v04::AttributeArrayValue;
     let value = match v {
         crate::span::v04::AttributeAnyValue::SingleValue(av) => match av {
@@ -249,10 +237,10 @@ fn event_attr_to_key_value<T: TraceData>(
             AnyValue::ArrayValue(crate::otlp_encoder::json_types::ArrayValue { values })
         }
     };
-    Some(KeyValue {
+    KeyValue {
         key: k.borrow().to_string(),
         value,
-    })
+    }
 }
 
 /// Maps the explicit "span.kind" meta tag (set by OTEL-instrumented tracers) to an OTLP SpanKind.

libdd-trace-utils/src/otlp_encoder/mod.rs

@@ -11,8 +11,7 @@ pub use mapper::map_traces_to_otlp;
 /// Tracer-level attributes used to populate the OTLP Resource on export.
 ///
 /// These are the fields from the tracer's configuration that map to OTLP Resource attributes
-/// (service.name, deployment.environment.name, service.version, telemetry.sdk.*, runtime-id,
-/// git.commit.sha, git.repository_url).
+/// (service.name, deployment.environment.name, service.version, telemetry.sdk.*, runtime-id).
 /// Callers should build this from their own tracer metadata struct.
 #[derive(Clone, Debug, Default)]
 #[non_exhaustive]
@@ -23,6 +22,4 @@ pub struct OtlpResourceInfo {
     pub language: String,
     pub tracer_version: String,
     pub runtime_id: String,
-    pub git_commit_sha: String,
-    pub git_repository_url: String,
 }