Fix merge conflicts errors

Author: VianneyRuhlmann

data-pipeline/src/stats_exporter.rs

@@ -229,7 +229,7 @@ fn encode_bucket(key: BucketKey, bucket: Bucket) -> pb::ClientGroupedStats {
         span_kind: String::new(),
         db_type: String::new(),
         peer_tags: Vec::new(),
-        is_trace_root: false,
+        is_trace_root: pb::Trilean::False.into(),
     }
 }
 

ddcommon/src/lib.rs

@@ -24,8 +24,8 @@ pub mod header {
     pub const DATADOG_CONTAINER_ID: HeaderName = HeaderName::from_static("datadog-container-id");
     pub const DATADOG_ENTITY_ID: HeaderName = HeaderName::from_static("datadog-entity-id");
     pub const DATADOG_TRACE_COUNT: HeaderName = HeaderName::from_static("x-datadog-trace-count");
-
     pub const DATADOG_API_KEY: HeaderName = HeaderName::from_static("dd-api-key");
+
     pub const APPLICATION_JSON: HeaderValue = HeaderValue::from_static("application/json");
     pub const APPLICATION_MSGPACK: HeaderValue = HeaderValue::from_static("application/msgpack");
 }

ddcommon/src/tag.rs

@@ -132,7 +132,7 @@ impl Tag {
     }
 
     pub fn into_string(self) -> String {
-        self.value
+        self.value.to_string()
     }
 }
 

trace-normalization/src/normalizer.rs

@@ -30,57 +30,10 @@ fn normalize_span(s: &mut pb::Span) -> anyhow::Result<()> {
     normalize_utils::normalize_span_start_duration(&mut s.start, &mut s.duration);
     normalize_utils::normalize_span_type(&mut s.r#type);
 
-    s.name = normalized_name;
-
-    if s.resource.is_empty() {
-        s.resource.clone_from(&s.name)
-    }
-
-    // ParentID, TraceID and SpanID set in the client could be the same
-    // Supporting the ParentID == TraceID == SpanID for the root span, is compliant
-    // with the Zipkin implementation. Furthermore, as described in the PR
-    // https://github.com/openzipkin/zipkin/pull/851 the constraint that the
-    // root span's ``trace id = span id`` has been removed
-    if s.parent_id == s.trace_id && s.parent_id == s.span_id {
-        s.parent_id = 0;
-    }
-
-    // Start & Duration as nanoseconds timestamps
-    // if s.Start is very little, less than year 2000 probably a unit issue so discard
-    if s.duration < 0 {
-        s.duration = 0;
-    }
-    if s.duration > i64::MAX - s.start {
-        s.duration = 0;
-    }
-    if s.start < YEAR_2000_NANOSEC_TS {
-        let now = match SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .map(|t| t.as_nanos() as i64)
-        {
-            Ok(time) => time,
-            Err(err) => {
-                anyhow::bail!(format!("Normalizer Error: {err}"))
-            }
-        };
-        s.start = now - s.duration;
-        if s.start < 0 {
-            s.start = now;
-        }
-    }
-
-    if s.r#type.len() > MAX_TYPE_LEN {
-        s.r#type = normalize_utils::truncate_utf8(&s.r#type, MAX_TYPE_LEN).to_string();
+    if let Some(env_tag) = s.meta.get_mut("env") {
+        normalize_utils::normalize_tag(env_tag);
     }
 
-    if s.meta.contains_key("env") {
-        if let Some(env_tag) = s.meta.get("env") {
-            if let Ok(normalized_tag) = normalize_utils::normalize_tag(env_tag) {
-                s.meta.insert("env".to_string(), normalized_tag);
-            }
-        }
-    };
-
     if let Some(code) = s.meta.get("http.status_code") {
         if !is_valid_status_code(code) {
             s.meta.remove("http.status_code");