Skip to content

Commit 22451e4

Browse files
amarzialiamarziali
committed
Use DD_LEGACY_CONTEXT_MANAGER_ENABLED
1 parent 0ed0158 commit 22451e4

20 files changed

Lines changed: 76 additions & 76 deletions

File tree

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public boolean hasNext() {
4646
boolean moreMessages = delegate.hasNext();
4747
if (!moreMessages) {
4848
// no more messages, use this as a signal to close the last iteration scope
49-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
49+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
5050
final AgentSpan span = spanFromContext(getRootContext().swap());
5151
if (span != null) {
5252
span.finishWithEndToEnd();
@@ -67,13 +67,13 @@ public Message next() {
6767

6868
protected void startNewMessageSpan(Message message) {
6969
try {
70-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
70+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
71+
closePrevious(true);
72+
} else {
7173
final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
7274
if (prevSpan != null) {
7375
prevSpan.finishWithEndToEnd();
7476
}
75-
} else {
76-
closePrevious(true);
7777
}
7878
if (message != null) {
7979
AgentSpan queueSpan = null;
@@ -109,13 +109,13 @@ protected void startNewMessageSpan(Message message) {
109109

110110
CONSUMER_DECORATE.afterStart(span);
111111
CONSUMER_DECORATE.onConsume(span, queueUrl);
112-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
112+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
113+
activateNext(span);
114+
} else {
113115
final AgentSpan previous = spanFromContext(span.swap());
114116
if (previous != null) {
115117
previous.finishWithEndToEnd();
116118
}
117-
} else {
118-
activateNext(span);
119119
}
120120
if (queueSpan != null) {
121121
BROKER_DECORATE.beforeFinish(queueSpan);

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public boolean hasPrevious() {
2121
boolean moreMessages = delegate.hasPrevious();
2222
if (!moreMessages) {
2323
// no more messages, use this as a signal to close the last iteration scope
24-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
24+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
25+
closePrevious(true);
26+
} else {
2527
final AgentSpan span = spanFromContext(getRootContext().swap());
2628
if (span != null) {
2729
span.finishWithEndToEnd();
2830
}
29-
} else {
30-
closePrevious(true);
3131
}
3232
}
3333
return moreMessages;

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,6 @@ class SqsClientV0ContextSwapForkedTest extends SqsClientV0Test {
731731
@Override
732732
protected void configurePreAgent() {
733733
super.configurePreAgent()
734-
injectSysConfig(TraceInstrumentationConfig.MESSAGING_CONTEXT_SWAP_ENABLED, "true")
734+
injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false")
735735
}
736736
}

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public boolean hasNext() {
4848
boolean moreMessages = delegate.hasNext();
4949
if (!moreMessages) {
5050
// no more messages, use this as a signal to close the last iteration scope
51-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
51+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
52+
closePrevious(true);
53+
} else {
5254
final AgentSpan span = spanFromContext(getRootContext().swap());
5355
if (span != null) {
5456
span.finishWithEndToEnd();
5557
}
56-
} else {
57-
closePrevious(true);
5858
}
5959
}
6060
return moreMessages;
@@ -69,13 +69,13 @@ public Message next() {
6969

7070
protected void startNewMessageSpan(Message message) {
7171
try {
72-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
72+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
73+
closePrevious(true);
74+
} else {
7375
final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
7476
if (prevSpan != null) {
7577
prevSpan.finishWithEndToEnd();
7678
}
77-
} else {
78-
closePrevious(true);
7979
}
8080
if (message != null) {
8181
AgentSpan queueSpan = null;
@@ -111,13 +111,13 @@ protected void startNewMessageSpan(Message message) {
111111

112112
CONSUMER_DECORATE.afterStart(span);
113113
CONSUMER_DECORATE.onConsume(span, queueUrl, requestId);
114-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
114+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
115+
activateNext(span);
116+
} else {
115117
final AgentSpan previous = spanFromContext(span.swap());
116118
if (previous != null) {
117119
previous.finishWithEndToEnd();
118120
}
119-
} else {
120-
activateNext(span);
121121
}
122122
if (queueSpan != null) {
123123
BROKER_DECORATE.beforeFinish(queueSpan);

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public boolean hasPrevious() {
2121
boolean moreMessages = delegate.hasPrevious();
2222
if (!moreMessages) {
2323
// no more messages, use this as a signal to close the last iteration scope
24-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
24+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
25+
closePrevious(true);
26+
} else {
2527
final AgentSpan span = spanFromContext(getRootContext().swap());
2628
if (span != null) {
2729
span.finishWithEndToEnd();
2830
}
29-
} else {
30-
closePrevious(true);
3131
}
3232
}
3333
return moreMessages;

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ class SqsClientV0ContextSwapForkedTest extends SqsClientV0Test {
579579
@Override
580580
protected void configurePreAgent() {
581581
super.configurePreAgent()
582-
injectSysConfig(TraceInstrumentationConfig.MESSAGING_CONTEXT_SWAP_ENABLED, "true")
582+
injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false")
583583
}
584584
}
585585

‎dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/test/groovy/JMS2Test.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,6 @@ class JMS2ContextSwapForkedTest extends JMS2Test {
260260
@Override
261261
protected void configurePreAgent() {
262262
super.configurePreAgent()
263-
injectSysConfig(TraceInstrumentationConfig.MESSAGING_CONTEXT_SWAP_ENABLED, "true")
263+
injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false")
264264
}
265265
}

‎dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ public static MessageConsumerState beforeReceive(@Advice.This final MessageConsu
9393
}
9494

9595
boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
96-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
96+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
97+
closePrevious(finishSpan);
98+
} else {
9799
final AgentSpan span = spanFromContext(getRootContext().swap());
98100
if (span != null) {
99101
CONSUMER_DECORATE.beforeFinish(span);
100102
span.finishWithEndToEnd();
101103
}
102-
} else {
103-
closePrevious(finishSpan);
104104
}
105105
if (finishSpan) {
106106
consumerState.finishTimeInQueueSpan(false);
@@ -174,14 +174,14 @@ public static void afterReceive(
174174

175175
CONSUMER_DECORATE.onError(span, throwable);
176176

177-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
177+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
178+
activateNext(span); // scope is left open until next message or it times out
179+
} else {
178180
final AgentSpan previous = spanFromContext(span.swap());
179181
if (previous != null) {
180182
CONSUMER_DECORATE.beforeFinish(previous);
181183
previous.finishWithEndToEnd();
182184
}
183-
} else {
184-
activateNext(span); // scope is left open until next message or it times out
185185
}
186186
JMSLogger.logIterationSpan(span);
187187

@@ -206,14 +206,14 @@ public static void beforeClose(@Advice.This final MessageConsumer consumer) {
206206
.get(consumer);
207207
if (null != consumerState) {
208208
boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
209-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
209+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
210+
closePrevious(finishSpan);
211+
} else {
210212
final AgentSpan span = spanFromContext(getRootContext().swap());
211213
if (span != null) {
212214
CONSUMER_DECORATE.beforeFinish(span);
213215
span.finishWithEndToEnd();
214216
}
215-
} else {
216-
closePrevious(finishSpan);
217217
}
218218
if (finishSpan) {
219219
consumerState.finishTimeInQueueSpan(true);

‎dd-java-agent/instrumentation/jms/javax-jms-1.1/src/test/groovy/JMS1Test.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import static datadog.trace.api.config.TraceInstrumentationConfig.MESSAGING_CONTEXT_SWAP_ENABLED
1+
import static datadog.trace.api.config.TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED
22
import static org.junit.jupiter.api.Assumptions.assumeTrue
33

44
import datadog.trace.agent.test.asserts.ListWriterAssert
@@ -1056,7 +1056,7 @@ class JMS1V0Test extends JMS1Test {
10561056
class JMSContextSwapForkedTest extends JMS1V0Test {
10571057
@Override
10581058
protected void configurePreAgent() {
1059-
injectSysConfig(MESSAGING_CONTEXT_SWAP_ENABLED, "true")
1059+
injectSysConfig(LEGACY_CONTEXT_MANAGER_ENABLED, "false")
10601060
}
10611061
10621062
@Override

‎dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ public boolean hasNext() {
6868
boolean moreRecords = delegateIterator.hasNext();
6969
if (!moreRecords) {
7070
// no more records, use this as a signal to close the last iteration scope
71-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
71+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
72+
closePrevious(true);
73+
} else {
7274
final AgentSpan span = spanFromContext(getRootContext().swap());
7375
if (span != null) {
7476
span.finishWithEndToEnd();
7577
}
76-
} else {
77-
closePrevious(true);
7878
}
7979
}
8080
return moreRecords;
@@ -89,13 +89,13 @@ public boolean hasNext() {
8989

9090
protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
9191
try {
92-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
92+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
93+
closePrevious(true);
94+
} else {
9395
final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
9496
if (prevSpan != null) {
9597
prevSpan.finishWithEndToEnd();
9698
}
97-
} else {
98-
closePrevious(true);
9999
}
100100
AgentSpan span, queueSpan = null;
101101
if (val != null) {
@@ -143,13 +143,13 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
143143
}
144144
decorator.afterStart(span);
145145
decorator.onConsume(span, val, group, bootstrapServers);
146-
if (InstrumenterConfig.get().isMessagingContextSwapEnabled()) {
146+
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
147+
activateNext(span);
148+
} else {
147149
final AgentSpan previous = spanFromContext(span.swap());
148150
if (previous != null) {
149151
previous.finishWithEndToEnd();
150152
}
151-
} else {
152-
activateNext(span);
153153
}
154154
if (null != queueSpan) {
155155
queueSpan.finish();

0 commit comments

Comments
 (0)