Disable normalization when flushing traces to the agent.

data-pipeline/src/trace_exporter.rs

@@ -222,10 +222,16 @@ impl TraceExporter {
                 },
             ),
             TraceExporterOutputFormat::V07 => {
+                let mut normalize = false;
+                if self.endpoint.api_key.is_some() {
+                    normalize = true;
+                }
+
                 let tracer_payload = trace_utils::collect_trace_chunks(
                     traces,
                     &header_tags,
                     |_chunk, _root_span_index| {},
+                    normalize,
                 );
 
                 let endpoint = Endpoint {

sidecar/src/service/sidecar_server.rs

@@ -310,7 +310,7 @@ impl SidecarServer {
         }
 
         let payload =
-            trace_utils::collect_trace_chunks(traces, &headers, |_chunk, _root_span_index| {});
+            trace_utils::collect_trace_chunks(traces, &headers, |_chunk, _root_span_index| {}, false);
 
         // send trace payload to our trace flusher
         let data = SendData::new(size, payload, headers, target);

trace-mini-agent/src/trace_processor.rs

@@ -85,6 +85,7 @@ impl TraceProcessor for ServerlessTraceProcessor {
                     obfuscate_span(span, &config.obfuscation_config);
                 }
             },
+            true
         );
 
         let send_data = SendData::new(body_size, payload, tracer_header_tags, &config.trace_intake);

trace-utils/src/trace_utils.rs

@@ -288,6 +288,7 @@ pub fn collect_trace_chunks(
     mut traces: Vec<Vec<pb::Span>>,
     tracer_header_tags: &TracerHeaderTags,
     process_chunk: impl Fn(&mut TraceChunk, usize),
+    do_normalize: bool,
 ) -> pb::TracerPayload {
     let mut trace_chunks: Vec<pb::TraceChunk> = Vec::new();
 
@@ -309,8 +310,10 @@ pub fn collect_trace_chunks(
             }
         };
 
-        if let Err(e) = normalizer::normalize_chunk(&mut chunk, root_span_index) {
-            error!("Error normalizing trace chunk: {e}");
+        if do_normalize {
+            if let Err(e) = normalizer::normalize_chunk(&mut chunk, root_span_index) {
+                error!("Error normalizing trace chunk: {e}");
+            }
         }
 
         for span in chunk.spans.iter_mut() {