kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add log endpoint name (#171)

This commit is contained in:
Brandon Fergerson 2022-05-09 11:00:56 +04:00 committed by GitHub
parent bd7912106a
commit 4b24b7d795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -15,6 +15,7 @@ Release Notes.
* Fix NPE in elasticsearch plugin.
* Grpc plugin support trace client async generic call(without grpc stubs), support Method type: `UNARY`、`SERVER_STREAMING`.
* Enhance Apache ShenYu (incubating) plugin: support trace `grpc`,`sofarpc`,`motan`,`tars` rpc proxy.
* Add primary endpoint name to log events.
#### Documentation

5
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
View File

@ -133,4 +133,9 @@ public interface AbstractTracerContext {
* Get current correlation context
*/
CorrelationContext getCorrelationContext();
/**
* Get current primary endpoint name
*/
String getPrimaryEndpointName();
}

8
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
View File

@ -93,6 +93,14 @@ public class ContextManager implements BootService {
return Objects.nonNull(context) ? context.getSpanId() : -1;
}
/**
* @return the current primary endpoint name. Otherwise, the value is null.
*/
public static String getPrimaryEndpointName() {
AbstractTracerContext context = CONTEXT.get();
return Objects.nonNull(context) ? context.getPrimaryEndpointName() : null;
}
public static AbstractSpan createEntrySpan(String operationName, ContextCarrier carrier) {
AbstractSpan span;
AbstractTracerContext context;

5
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
View File

@ -126,6 +126,11 @@ public class IgnoredTracerContext implements AbstractTracerContext {
return this.correlationContext;
}
@Override
public String getPrimaryEndpointName() {
return null;
}
public static class ListenerManager {
private static List<IgnoreTracerContextListener> LISTENERS = new LinkedList<>();

5
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java
View File

@ -410,6 +410,11 @@ public class TracingContext implements AbstractTracerContext {
return this.correlationContext;
}
@Override
public String getPrimaryEndpointName() {
return primaryEndpoint.getName();
}
/**
* Re-check current trace need profiling, encase third part plugin change the operation name.
*

6
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/log/GRPCLogAppenderInterceptor.java
View File

@ -96,6 +96,12 @@ public class GRPCLogAppenderInterceptor implements InstanceMethodsAroundIntercep
.build())
.setBody(LogDataBody.newBuilder().setType(LogDataBody.ContentCase.TEXT.name())
.setText(TextLog.newBuilder().setText(transformLogText(appender, event)).build()).build());
String primaryEndpointName = ContextManager.getPrimaryEndpointName();
if (primaryEndpointName != null) {
builder.setEndpoint(primaryEndpointName);
}
return -1 == ContextManager.getSpanId() ? builder.build()
: builder.setTraceContext(TraceContext.newBuilder()
.setTraceId(ContextManager.getGlobalTraceId())

6
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/log/GRPCLogAppenderInterceptor.java
View File

@ -108,6 +108,12 @@ public class GRPCLogAppenderInterceptor implements InstanceMethodsAroundIntercep
.setTags(logTags.build())
.setBody(LogDataBody.newBuilder().setType(LogDataBody.ContentCase.TEXT.name())
.setText(TextLog.newBuilder().setText(transformLogText(appender, event)).build()).build());
String primaryEndpointName = ContextManager.getPrimaryEndpointName();
if (primaryEndpointName != null) {
builder.setEndpoint(primaryEndpointName);
}
return -1 == ContextManager.getSpanId() ? builder.build()
: builder.setTraceContext(TraceContext.newBuilder()
.setTraceId(ContextManager.getGlobalTraceId())

6
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/log/GRPCLogAppenderInterceptor.java
View File

@ -112,6 +112,12 @@ public class GRPCLogAppenderInterceptor implements InstanceMethodsAroundIntercep
.setTags(logTags.build())
.setBody(LogDataBody.newBuilder().setType(LogDataBody.ContentCase.TEXT.name())
.setText(TextLog.newBuilder().setText(transformLogText(appender, event)).build()).build());
String primaryEndpointName = ContextManager.getPrimaryEndpointName();
if (primaryEndpointName != null) {
builder.setEndpoint(primaryEndpointName);
}
return -1 == ContextManager.getSpanId() ? builder.build()
: builder.setTraceContext(TraceContext.newBuilder()
.setTraceId(ContextManager.getGlobalTraceId())

6
test/e2e/case/expected/logs-list.yml
View File

@ -19,8 +19,8 @@ logs:
serviceid: {{ b64enc "e2e-service-provider" }}.1
serviceinstancename: provider1
serviceinstanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
endpointname: null
endpointid: null
endpointname: POST:/info
endpointid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/info" }}
traceid: {{ notEmpty .traceid }}
timestamp: {{ gt .timestamp 0 }}
contenttype: TEXT
@ -36,4 +36,4 @@ logs:
value: {{ notEmpty .value }}
{{- end }}
{{- end }}
total: {{ gt .total 0 }}
total: {{ gt .total 0 }}