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

refactor: EntrySpan and ExitSpan support modifying attributes in async mode (#7086)

This commit is contained in:
wallezhang 2021-06-10 13:11:00 +08:00 committed by GitHub
parent 8258407b7a
commit 1c5dab8463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -8,7 +8,7 @@ Release Notes.
#### Java Agent
* Supports modifying span attributes in async mode.
#### OAP-Backend

6
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java
View File

@ -55,7 +55,7 @@ public class EntrySpan extends StackBasedTracingSpan {
@Override
public EntrySpan tag(String key, String value) {
if (stackDepth == currentMaxDepth) {
if (stackDepth == currentMaxDepth || isInAsyncMode) {
super.tag(key, value);
}
return this;
@ -63,7 +63,7 @@ public class EntrySpan extends StackBasedTracingSpan {
@Override
public AbstractTracingSpan setLayer(SpanLayer layer) {
if (stackDepth == currentMaxDepth) {
if (stackDepth == currentMaxDepth || isInAsyncMode) {
return super.setLayer(layer);
} else {
return this;
@ -72,7 +72,7 @@ public class EntrySpan extends StackBasedTracingSpan {
@Override
public AbstractTracingSpan setComponent(Component component) {
if (stackDepth == currentMaxDepth) {
if (stackDepth == currentMaxDepth || isInAsyncMode) {
return super.setComponent(component);
} else {
return this;

13
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java
View File

@ -35,6 +35,7 @@ import org.apache.skywalking.apm.network.trace.component.Component;
* the httpcomponent span's info.
*/
public class ExitSpan extends StackBasedTracingSpan implements ExitTypeSpan {
public ExitSpan(int spanId, int parentSpanId, String operationName, String peer, TracingContext owner) {
super(spanId, parentSpanId, operationName, peer, owner);
}
@ -56,7 +57,7 @@ public class ExitSpan extends StackBasedTracingSpan implements ExitTypeSpan {
@Override
public ExitSpan tag(String key, String value) {
if (stackDepth == 1) {
if (stackDepth == 1 || isInAsyncMode) {
super.tag(key, value);
}
return this;
@ -64,7 +65,7 @@ public class ExitSpan extends StackBasedTracingSpan implements ExitTypeSpan {
@Override
public AbstractTracingSpan tag(AbstractTag<?> tag, String value) {
if (stackDepth == 1 || tag.isCanOverwrite()) {
if (stackDepth == 1 || tag.isCanOverwrite() || isInAsyncMode) {
super.tag(tag, value);
}
return this;
@ -72,7 +73,7 @@ public class ExitSpan extends StackBasedTracingSpan implements ExitTypeSpan {
@Override
public AbstractTracingSpan setLayer(SpanLayer layer) {
if (stackDepth == 1) {
if (stackDepth == 1 || isInAsyncMode) {
return super.setLayer(layer);
} else {
return this;
@ -81,7 +82,7 @@ public class ExitSpan extends StackBasedTracingSpan implements ExitTypeSpan {
@Override
public AbstractTracingSpan setComponent(Component component) {
if (stackDepth == 1) {
if (stackDepth == 1 || isInAsyncMode) {
return super.setComponent(component);
} else {
return this;
@ -90,9 +91,7 @@ public class ExitSpan extends StackBasedTracingSpan implements ExitTypeSpan {
@Override
public ExitSpan log(Throwable t) {
if (stackDepth == 1) {
super.log(t);
}
super.log(t);
return this;
}