diff --git a/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java b/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java index 5e50ed45f9724..849bf96a5b13d 100644 --- 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 deleted file mode 100644 index 07f914ca5c75a..0000000000000 --- a/server/src/main/java/org/elasticsearch/common/logging/TransactionIdConverter.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -package org.elasticsearch.common.logging; - -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.config.plugins.Plugin; -import org.apache.logging.log4j.core.pattern.ConverterKeys; -import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; -import org.apache.logging.log4j.core.pattern.PatternConverter; -import org.elasticsearch.tasks.Task; - -import java.util.Objects; - -/** - * Pattern converter to format the transaction id provided in the traceparent header into JSON fields transaction.id. - */ -@Plugin(category = PatternConverter.CATEGORY, name = "TransactionIdConverter") -@ConverterKeys({"transaction_id"}) -public final class TransactionIdConverter extends LogEventPatternConverter { - /** - * Called by log4j2 to initialize this converter. - */ - public static TransactionIdConverter newInstance(@SuppressWarnings("unused") final String[] options) { - return new TransactionIdConverter(); - } - - public TransactionIdConverter() { - super("transaction_id", "transaction_id"); - } - - public static String getTransactionId() { - return HeaderWarning.THREAD_CONTEXT.stream() - .map(t -> t.getTransient(Task.TRANSACTION_ID)) - .filter(Objects::nonNull) - .findFirst() - .orElse(null); - } - - /** - * Formats the transaction.id into json fields. - * - * @param event - a log event is ignored in this method as it uses the clusterId value - * from NodeAndClusterIdStateListener to format - */ - @Override - public void format(LogEvent event, StringBuilder toAppendTo) { - String transactionId = getTransactionId(); - if (transactionId != null) { - toAppendTo.append(transactionId); - } - } - -} diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java index b48e411851fc7..e4cba16772757 100644 --- 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 index a060a55750a74..beb25321310e0 100644 --- 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;