From 95f5808142f70558dce1dd2697744d171141adf9 Mon Sep 17 00:00:00 2001
From: Douglas Q Hawkins <douglas.hawkins@datadoghq.com>
Date: Wed, 10 Dec 2025 17:29:14 -0500
Subject: [PATCH 1/2] A bit of clean-up

- Making empty final -- and static even though static is redundant here
- Removing unnecessary package qualification on forEach
---
 internal-api/src/main/java/datadog/trace/api/TagMap.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java
index 1166a2ebcfa..9c85a362a26 100644
--- a/internal-api/src/main/java/datadog/trace/api/TagMap.java
+++ b/internal-api/src/main/java/datadog/trace/api/TagMap.java
@@ -45,7 +45,7 @@
  */
 public interface TagMap extends Map<String, Object>, Iterable<TagMap.Entry> {
   /** Immutable empty TagMap - similar to {@link Collections#emptyMap()} */
-  TagMap EMPTY = TagMapFactory.INSTANCE.empty();
+  static final TagMap EMPTY = TagMapFactory.INSTANCE.empty();
 
   /** Creates a new mutable TagMap that contains the contents of <code>map</code> */
   static TagMap fromMap(Map<String, ?> map) {
@@ -2688,7 +2688,7 @@ public void fillStringMap(Map<? super String, ? super String> stringMap) {
   }
 
   @Override
-  public void forEach(Consumer<? super datadog.trace.api.TagMap.Entry> consumer) {
+  public void forEach(Consumer<? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(TagMap.Entry.newAnyEntry(entry));
     }
@@ -2696,7 +2696,7 @@ public void forEach(Consumer<? super datadog.trace.api.TagMap.Entry> consumer) {
 
   @Override
   public <T> void forEach(
-      T thisObj, BiConsumer<T, ? super datadog.trace.api.TagMap.Entry> consumer) {
+      T thisObj, BiConsumer<T, ? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(thisObj, TagMap.Entry.newAnyEntry(entry));
     }
@@ -2704,7 +2704,7 @@ public <T> void forEach(
 
   @Override
   public <T, U> void forEach(
-      T thisObj, U otherObj, TriConsumer<T, U, ? super datadog.trace.api.TagMap.Entry> consumer) {
+      T thisObj, U otherObj, TriConsumer<T, U, ? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(thisObj, otherObj, TagMap.Entry.newAnyEntry(entry));
     }

From 79092b09bc346dee1e234a9747384a5acb27b5ff Mon Sep 17 00:00:00 2001
From: Douglas Q Hawkins <douglas.hawkins@datadoghq.com>
Date: Thu, 11 Dec 2025 08:27:05 -0500
Subject: [PATCH 2/2] spotless

---
 internal-api/src/main/java/datadog/trace/api/TagMap.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java
index 9c85a362a26..c10904f6b3b 100644
--- a/internal-api/src/main/java/datadog/trace/api/TagMap.java
+++ b/internal-api/src/main/java/datadog/trace/api/TagMap.java
@@ -2695,8 +2695,7 @@ public void forEach(Consumer<? super TagMap.Entry> consumer) {
   }
 
   @Override
-  public <T> void forEach(
-      T thisObj, BiConsumer<T, ? super TagMap.Entry> consumer) {
+  public <T> void forEach(T thisObj, BiConsumer<T, ? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(thisObj, TagMap.Entry.newAnyEntry(entry));
     }