-
Notifications
You must be signed in to change notification settings - Fork 24.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds minimal traceparent header support to Elasticsearch backport(#74210
) (#75331) This adds just enough support for the traceparent header to be useful in es7 Contrary to es8 in 7.x branch the logs are in custom JSON format - not in ECS. trace.id is added to deprecation, slow logs and server JSON logs backport #74210
- Loading branch information
Showing
13 changed files
with
178 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
server/src/main/java/org/elasticsearch/common/logging/TraceIdConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* 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 trace id provided in the traceparent header into JSON fields <code>trace.id</code>. | ||
*/ | ||
@Plugin(category = PatternConverter.CATEGORY, name = "TraceIdConverter") | ||
@ConverterKeys({"trace_id"}) | ||
public final class TraceIdConverter extends LogEventPatternConverter { | ||
/** | ||
* Called by log4j2 to initialize this converter. | ||
*/ | ||
public static TraceIdConverter newInstance(@SuppressWarnings("unused") final String[] options) { | ||
return new TraceIdConverter(); | ||
} | ||
|
||
public TraceIdConverter() { | ||
super("trace_id", "trace_id"); | ||
} | ||
|
||
public static String getTraceId() { | ||
return HeaderWarning.THREAD_CONTEXT.stream() | ||
.map(t -> t.<String>getHeader(Task.TRACE_ID)) | ||
.filter(Objects::nonNull) | ||
.findFirst() | ||
.orElse(null); | ||
} | ||
|
||
/** | ||
* Formats the trace.id into json fields. | ||
* | ||
* @param event - a log event is ignored in this method as it uses the clusterId value | ||
* from <code>NodeAndClusterIdStateListener</code> to format | ||
*/ | ||
@Override | ||
public void format(LogEvent event, StringBuilder toAppendTo) { | ||
String traceId = getTraceId(); | ||
if (traceId != null) { | ||
toAppendTo.append("\"trace.id\": \"" + traceId + "\""); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.