Merge branch 'master' into ci/update-gradle-dependencies-20251210

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 3b8af34f89ad · 2025-12-10T17:49:17.000-05:00
diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java
@@ -290,7 +290,7 @@ public final String tag() {
     }
 
     public final boolean matches(String tag) {
-      return this.tag.equals(tag);
+      return (this.tag == tag) || this.tag.equals(tag);
     }
 
     public abstract boolean isRemoval();

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public final String tag() {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`public final boolean matches(String tag) {`
`293`		`- return this.tag.equals(tag);`
	`293`	`+ return (this.tag == tag) \|\| this.tag.equals(tag);`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`public abstract boolean isRemoval();`