Remove transaction.id

elastic · Jun 18, 2021 · e3bb235 · e3bb235
1 parent 2ab60f0
commit e3bb235
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 63 deletions.
diff --git a/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java b/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java
@@ -56,7 +56,6 @@ private KeyValuePair[] additionalFields() {
             return new KeyValuePair[] {
                 new KeyValuePair("event.dataset", dataset),
                 new KeyValuePair("trace.id", "%trace_id"),
-                new KeyValuePair("transaction.id", "%transaction_id"),
                 new KeyValuePair("elasticsearch.cluster.uuid", "%cluster_id"),
                 new KeyValuePair("elasticsearch.node.id", "%node_id"),
                 new KeyValuePair("elasticsearch.node.name", "%ESnode_name"),

diff --git a/server/src/main/java/org/elasticsearch/common/logging/TransactionIdConverter.java b/server/src/main/java/org/elasticsearch/common/logging/TransactionIdConverter.java
diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java
@@ -354,7 +354,6 @@ private void tryAllHandlers(final RestRequest request, final RestChannel channel
                     String[] tokens  = traceparent.split("-");
                     if (tokens.length == 4) {
                         threadContext.putTransient(Task.TRACE_ID, tokens[1]);
-                        threadContext.putTransient(Task.TRANSACTION_ID, tokens[2]);
                     }
                     threadContext.putHeader(name, String.join(",", distinctHeaderValues));
                 } else {

diff --git a/server/src/main/java/org/elasticsearch/tasks/Task.java b/server/src/main/java/org/elasticsearch/tasks/Task.java
@@ -32,8 +32,6 @@ public class Task {
 
     public static final String TRACE_ID = "trace.id";
 
-    public static final String TRANSACTION_ID = "transaction.id";
-
     private final long id;
 
     private final String type;