From d1bbebcc7bd01f4fe32ed72355f16945faa6b128 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Tue, 22 Apr 2025 14:37:40 +0100
Subject: [PATCH] Tempo: Copy full trace id on imported trace (#104264)

* Ensure all of trace id is copied

* Update tests
---
 public/app/plugins/datasource/tempo/datasource.test.ts   | 2 +-
 public/app/plugins/datasource/tempo/resultTransformer.ts | 2 +-
 public/app/plugins/datasource/tempo/test/testResponse.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts
index e12b53d7f70..cc80ddf516d 100644
--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -303,7 +303,7 @@ describe('Tempo data source', () => {
     const field = response.data[0].fields[0];
     expect(field.name).toBe('traceID');
     expect(field.type).toBe(FieldType.string);
-    expect(field.values[0]).toBe('60ba2abb44f13eae');
+    expect(field.values[0]).toBe('000000000000000060ba2abb44f13eae');
     expect(field.values.length).toBe(6);
   });
 
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index e637c26df9d..49a7b0faa9e 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -166,7 +166,7 @@ export function transformFromOTLP(
       for (const librarySpan of data.instrumentationLibrarySpans) {
         for (const span of librarySpan.spans) {
           frame.add({
-            traceID: span.traceId.length > 16 ? span.traceId.slice(16) : span.traceId,
+            traceID: span.traceId,
             spanID: span.spanId,
             parentSpanID: span.parentSpanId || '',
             operationName: span.name || '',
diff --git a/public/app/plugins/datasource/tempo/test/testResponse.ts b/public/app/plugins/datasource/tempo/test/testResponse.ts
index be3a14631fb..c06071a067b 100644
--- a/public/app/plugins/datasource/tempo/test/testResponse.ts
+++ b/public/app/plugins/datasource/tempo/test/testResponse.ts
@@ -12,7 +12,7 @@ export const otlpDataFrameFromResponse = new MutableDataFrame({
       name: 'traceID',
       type: FieldType.string,
       config: {},
-      values: ['60ba2abb44f13eae'],
+      values: ['000000000000000060ba2abb44f13eae'],
     },
     {
       name: 'spanID',
@@ -188,7 +188,7 @@ export const otlpDataFrameToResponse = new MutableDataFrame({
       name: 'traceID',
       type: FieldType.string,
       config: {},
-      values: ['60ba2abb44f13eae'],
+      values: ['000000000000000060ba2abb44f13eae'],
       state: {
         displayName: 'traceID',
       },