rename

amarziali · amarziali · commit 8bdd039da54d · 2026-03-10T12:56:18.000+01:00
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java
@@ -49,9 +49,9 @@ public boolean hasNext() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
@@ -70,9 +70,9 @@ protected void startNewMessageSpan(Message message) {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
-        if (prevSpan != null) {
-          prevSpan.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
       if (message != null) {
@@ -112,9 +112,9 @@ protected void startNewMessageSpan(Message message) {
         if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
           activateNext(span);
         } else {
-          final AgentSpan previous = spanFromContext(span.swap());
-          if (previous != null) {
-            previous.finishWithEndToEnd();
+          final AgentSpan previousSpan = spanFromContext(span.swap());
+          if (previousSpan != null) {
+            previousSpan.finishWithEndToEnd();
           }
         }
         if (queueSpan != null) {
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java
@@ -24,9 +24,9 @@ public boolean hasPrevious() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java
@@ -51,9 +51,9 @@ public boolean hasNext() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
@@ -72,9 +72,9 @@ protected void startNewMessageSpan(Message message) {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
-        if (prevSpan != null) {
-          prevSpan.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
       if (message != null) {
@@ -114,9 +114,9 @@ protected void startNewMessageSpan(Message message) {
         if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
           activateNext(span);
         } else {
-          final AgentSpan previous = spanFromContext(span.swap());
-          if (previous != null) {
-            previous.finishWithEndToEnd();
+          final AgentSpan previousSpan = spanFromContext(span.swap());
+          if (previousSpan != null) {
+            previousSpan.finishWithEndToEnd();
           }
         }
         if (queueSpan != null) {
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java
@@ -24,9 +24,9 @@ public boolean hasPrevious() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java
@@ -96,10 +96,10 @@ public static MessageConsumerState beforeReceive(@Advice.This final MessageConsu
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(finishSpan);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          CONSUMER_DECORATE.beforeFinish(span);
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          CONSUMER_DECORATE.beforeFinish(previousSpan);
+          previousSpan.finishWithEndToEnd();
         }
       }
       if (finishSpan) {
@@ -177,10 +177,10 @@ public static void afterReceive(
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         activateNext(span); // scope is left open until next message or it times out
       } else {
-        final AgentSpan previous = spanFromContext(span.swap());
-        if (previous != null) {
-          CONSUMER_DECORATE.beforeFinish(previous);
-          previous.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(span.swap());
+        if (previousSpan != null) {
+          CONSUMER_DECORATE.beforeFinish(previousSpan);
+          previousSpan.finishWithEndToEnd();
         }
       }
       JMSLogger.logIterationSpan(span);
@@ -209,10 +209,10 @@ public static void beforeClose(@Advice.This final MessageConsumer consumer) {
         if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
           closePrevious(finishSpan);
         } else {
-          final AgentSpan span = spanFromContext(getRootContext().swap());
-          if (span != null) {
-            CONSUMER_DECORATE.beforeFinish(span);
-            span.finishWithEndToEnd();
+          final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+          if (previousSpan != null) {
+            CONSUMER_DECORATE.beforeFinish(previousSpan);
+            previousSpan.finishWithEndToEnd();
           }
         }
         if (finishSpan) {
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java
@@ -71,9 +71,9 @@ public boolean hasNext() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
@@ -92,9 +92,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
-        if (prevSpan != null) {
-          prevSpan.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
       AgentSpan span, queueSpan = null;
@@ -146,9 +146,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
         if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
           activateNext(span);
         } else {
-          final AgentSpan previous = spanFromContext(span.swap());
-          if (previous != null) {
-            previous.finishWithEndToEnd();
+          final AgentSpan previousSpan = spanFromContext(span.swap());
+          if (previousSpan != null) {
+            previousSpan.finishWithEndToEnd();
           }
         }
         if (null != queueSpan) {
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingListIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingListIterator.java
@@ -33,9 +33,9 @@ public boolean hasPrevious() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java
@@ -67,9 +67,9 @@ public boolean hasNext() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }
@@ -88,9 +88,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan prevSpan = spanFromContext(getRootContext().swap());
-        if (prevSpan != null) {
-          prevSpan.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
       AgentSpan span, queueSpan = null;
@@ -145,9 +145,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
         if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
           activateNext(span);
         } else {
-          final AgentSpan previous = spanFromContext(span.swap());
-          if (previous != null) {
-            previous.finishWithEndToEnd();
+          final AgentSpan previousSpan = spanFromContext(span.swap());
+          if (previousSpan != null) {
+            previousSpan.finishWithEndToEnd();
           }
         }
         if (null != queueSpan) {
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingListIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingListIterator.java
@@ -33,9 +33,9 @@ public boolean hasPrevious() {
       if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
         closePrevious(true);
       } else {
-        final AgentSpan span = spanFromContext(getRootContext().swap());
-        if (span != null) {
-          span.finishWithEndToEnd();
+        final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
+        if (previousSpan != null) {
+          previousSpan.finishWithEndToEnd();
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ public boolean hasNext() {`
`49`	`49`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`50`	`50`	`closePrevious(true);`
`51`	`51`	`} else {`
`52`		`- final AgentSpan span = spanFromContext(getRootContext().swap());`
`53`		`- if (span != null) {`
`54`		`- span.finishWithEndToEnd();`
	`52`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`53`	`+ if (previousSpan != null) {`
	`54`	`+ previousSpan.finishWithEndToEnd();`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -70,9 +70,9 @@ protected void startNewMessageSpan(Message message) {`
`70`	`70`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`71`	`71`	`closePrevious(true);`
`72`	`72`	`} else {`
`73`		`- final AgentSpan prevSpan = spanFromContext(getRootContext().swap());`
`74`		`- if (prevSpan != null) {`
`75`		`- prevSpan.finishWithEndToEnd();`
	`73`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`74`	`+ if (previousSpan != null) {`
	`75`	`+ previousSpan.finishWithEndToEnd();`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`if (message != null) {`
`@@ -112,9 +112,9 @@ protected void startNewMessageSpan(Message message) {`
`112`	`112`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`113`	`113`	`activateNext(span);`
`114`	`114`	`} else {`
`115`		`- final AgentSpan previous = spanFromContext(span.swap());`
`116`		`- if (previous != null) {`
`117`		`- previous.finishWithEndToEnd();`
	`115`	`+ final AgentSpan previousSpan = spanFromContext(span.swap());`
	`116`	`+ if (previousSpan != null) {`
	`117`	`+ previousSpan.finishWithEndToEnd();`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`if (queueSpan != null) {`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ public boolean hasPrevious() {`
`24`	`24`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`25`	`25`	`closePrevious(true);`
`26`	`26`	`} else {`
`27`		`- final AgentSpan span = spanFromContext(getRootContext().swap());`
`28`		`- if (span != null) {`
`29`		`- span.finishWithEndToEnd();`
	`27`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`28`	`+ if (previousSpan != null) {`
	`29`	`+ previousSpan.finishWithEndToEnd();`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ public boolean hasNext() {`
`51`	`51`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`52`	`52`	`closePrevious(true);`
`53`	`53`	`} else {`
`54`		`- final AgentSpan span = spanFromContext(getRootContext().swap());`
`55`		`- if (span != null) {`
`56`		`- span.finishWithEndToEnd();`
	`54`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`55`	`+ if (previousSpan != null) {`
	`56`	`+ previousSpan.finishWithEndToEnd();`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
`@@ -72,9 +72,9 @@ protected void startNewMessageSpan(Message message) {`
`72`	`72`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`73`	`73`	`closePrevious(true);`
`74`	`74`	`} else {`
`75`		`- final AgentSpan prevSpan = spanFromContext(getRootContext().swap());`
`76`		`- if (prevSpan != null) {`
`77`		`- prevSpan.finishWithEndToEnd();`
	`75`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`76`	`+ if (previousSpan != null) {`
	`77`	`+ previousSpan.finishWithEndToEnd();`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`if (message != null) {`
`@@ -114,9 +114,9 @@ protected void startNewMessageSpan(Message message) {`
`114`	`114`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`115`	`115`	`activateNext(span);`
`116`	`116`	`} else {`
`117`		`- final AgentSpan previous = spanFromContext(span.swap());`
`118`		`- if (previous != null) {`
`119`		`- previous.finishWithEndToEnd();`
	`117`	`+ final AgentSpan previousSpan = spanFromContext(span.swap());`
	`118`	`+ if (previousSpan != null) {`
	`119`	`+ previousSpan.finishWithEndToEnd();`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`if (queueSpan != null) {`
Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ public boolean hasNext() {`
`71`	`71`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`72`	`72`	`closePrevious(true);`
`73`	`73`	`} else {`
`74`		`- final AgentSpan span = spanFromContext(getRootContext().swap());`
`75`		`- if (span != null) {`
`76`		`- span.finishWithEndToEnd();`
	`74`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`75`	`+ if (previousSpan != null) {`
	`76`	`+ previousSpan.finishWithEndToEnd();`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
`@@ -92,9 +92,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {`
`92`	`92`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`93`	`93`	`closePrevious(true);`
`94`	`94`	`} else {`
`95`		`- final AgentSpan prevSpan = spanFromContext(getRootContext().swap());`
`96`		`- if (prevSpan != null) {`
`97`		`- prevSpan.finishWithEndToEnd();`
	`95`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`96`	`+ if (previousSpan != null) {`
	`97`	`+ previousSpan.finishWithEndToEnd();`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`AgentSpan span, queueSpan = null;`
`@@ -146,9 +146,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {`
`146`	`146`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`147`	`147`	`activateNext(span);`
`148`	`148`	`} else {`
`149`		`- final AgentSpan previous = spanFromContext(span.swap());`
`150`		`- if (previous != null) {`
`151`		`- previous.finishWithEndToEnd();`
	`149`	`+ final AgentSpan previousSpan = spanFromContext(span.swap());`
	`150`	`+ if (previousSpan != null) {`
	`151`	`+ previousSpan.finishWithEndToEnd();`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`if (null != queueSpan) {`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public boolean hasPrevious() {`
`33`	`33`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`34`	`34`	`closePrevious(true);`
`35`	`35`	`} else {`
`36`		`- final AgentSpan span = spanFromContext(getRootContext().swap());`
`37`		`- if (span != null) {`
`38`		`- span.finishWithEndToEnd();`
	`36`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`37`	`+ if (previousSpan != null) {`
	`38`	`+ previousSpan.finishWithEndToEnd();`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public boolean hasNext() {`
`67`	`67`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`68`	`68`	`closePrevious(true);`
`69`	`69`	`} else {`
`70`		`- final AgentSpan span = spanFromContext(getRootContext().swap());`
`71`		`- if (span != null) {`
`72`		`- span.finishWithEndToEnd();`
	`70`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`71`	`+ if (previousSpan != null) {`
	`72`	`+ previousSpan.finishWithEndToEnd();`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -88,9 +88,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {`
`88`	`88`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`89`	`89`	`closePrevious(true);`
`90`	`90`	`} else {`
`91`		`- final AgentSpan prevSpan = spanFromContext(getRootContext().swap());`
`92`		`- if (prevSpan != null) {`
`93`		`- prevSpan.finishWithEndToEnd();`
	`91`	`+ final AgentSpan previousSpan = spanFromContext(getRootContext().swap());`
	`92`	`+ if (previousSpan != null) {`
	`93`	`+ previousSpan.finishWithEndToEnd();`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`AgentSpan span, queueSpan = null;`
`@@ -145,9 +145,9 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {`
`145`	`145`	`if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {`
`146`	`146`	`activateNext(span);`
`147`	`147`	`} else {`
`148`		`- final AgentSpan previous = spanFromContext(span.swap());`
`149`		`- if (previous != null) {`
`150`		`- previous.finishWithEndToEnd();`
	`148`	`+ final AgentSpan previousSpan = spanFromContext(span.swap());`
	`149`	`+ if (previousSpan != null) {`
	`150`	`+ previousSpan.finishWithEndToEnd();`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`	`if (null != queueSpan) {`