From 4aad29359dafb8a205734ba12d73bbe6d5a6be8d Mon Sep 17 00:00:00 2001
From: Arya Mohanan <arya.mohanan@ibm.com>
Date: Mon, 9 Sep 2024 15:09:10 +0530
Subject: [PATCH] test: removed the references of header-format

---
 packages/collector/src/announceCycle/unannounced.js       | 1 -
 packages/collector/test/announceCycle/unannounced_test.js | 3 +--
 packages/core/src/tracing/cls.js                          | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/collector/src/announceCycle/unannounced.js b/packages/collector/src/announceCycle/unannounced.js
index 9ea9760798..2aba50cd80 100644
--- a/packages/collector/src/announceCycle/unannounced.js
+++ b/packages/collector/src/announceCycle/unannounced.js
@@ -49,7 +49,6 @@ const maxRetryDelay = 60 * 1000; // one minute
 /**
  * @typedef {Object} KafkaTracingConfig
  * @property {boolean} [trace-correlation]
- * @property {string} [header-format]
  */
 
 module.exports = {
diff --git a/packages/collector/test/announceCycle/unannounced_test.js b/packages/collector/test/announceCycle/unannounced_test.js
index 7c6b56d47b..37fbf9e790 100644
--- a/packages/collector/test/announceCycle/unannounced_test.js
+++ b/packages/collector/test/announceCycle/unannounced_test.js
@@ -166,8 +166,7 @@ describe('unannounced state', () => {
       prepareAnnounceResponse({
         tracing: {
           kafka: {
-            'trace-correlation': false,
-            'header-format': 'string'
+            'trace-correlation': false
           }
         }
       });
diff --git a/packages/core/src/tracing/cls.js b/packages/core/src/tracing/cls.js
index 7138f9170a..9fd0fe8a21 100644
--- a/packages/core/src/tracing/cls.js
+++ b/packages/core/src/tracing/cls.js
@@ -283,8 +283,7 @@ function startSpan(spanName, kind, traceId, parentSpanId, w3cTraceContext) {
 
   // If the client code has specified a trace ID/parent ID, use the provided IDs.
   if (traceId) {
-    // The incoming trace ID/span ID from an upstream tracer could be shorter than the standard length. Some of our code
-    // (in particular, the binary Kafka trace correlation header X_INSTANA_C) assumes the standard length. We normalize
+    // The incoming trace ID/span ID from an upstream tracer could be shorter than the standard length. We normalize
     // both IDs here by left-padding with 0 characters.
 
     // Maintenance note (128-bit-trace-ids): When we switch to 128 bit trace IDs, we need to left-pad the trace ID to 32