From 015f18ee5ababc71e0e0ad839502895182bdfba4 Mon Sep 17 00:00:00 2001 From: "datadog-prod-us1-5[bot]" <266081015+datadog-prod-us1-5[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 14:35:55 +0000 Subject: [PATCH 1/2] Replace Objects.hash with HashingUtils in DBInfo Co-authored-by: dougqh --- .../instrumentation/jdbc/DBInfo.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java index a508ba2fb1a..194d6f0b4a4 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java @@ -1,5 +1,6 @@ package datadog.trace.bootstrap.instrumentation.jdbc; +import datadog.trace.util.HashingUtils; import java.util.Objects; public final class DBInfo { @@ -256,17 +257,15 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( - type, - subtype, - fullPropagationSupport, - url, - user, - instance, - db, - host, - port, - warehouse, - schema); + int hash = HashingUtils.hash(type, subtype); + hash = HashingUtils.addToHash(hash, fullPropagationSupport); + hash = HashingUtils.addToHash(hash, url); + hash = HashingUtils.addToHash(hash, user); + hash = HashingUtils.addToHash(hash, instance); + hash = HashingUtils.addToHash(hash, db); + hash = HashingUtils.addToHash(hash, host); + hash = HashingUtils.addToHash(hash, port); + hash = HashingUtils.addToHash(hash, warehouse); + return HashingUtils.addToHash(hash, schema); } } From c0582106f0e9dc223936526e4c88c168a8c20346 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 10 Mar 2026 10:48:38 -0400 Subject: [PATCH 2/2] A bit of code clean-up --- .../trace/bootstrap/instrumentation/jdbc/DBInfo.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java index 194d6f0b4a4..03f5928078d 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java @@ -257,7 +257,9 @@ public boolean equals(Object o) { @Override public int hashCode() { - int hash = HashingUtils.hash(type, subtype); + int hash = 0; + hash = HashingUtils.addToHash(hash, type); + hash = HashingUtils.addToHash(hash, subtype); hash = HashingUtils.addToHash(hash, fullPropagationSupport); hash = HashingUtils.addToHash(hash, url); hash = HashingUtils.addToHash(hash, user); @@ -266,6 +268,7 @@ public int hashCode() { hash = HashingUtils.addToHash(hash, host); hash = HashingUtils.addToHash(hash, port); hash = HashingUtils.addToHash(hash, warehouse); - return HashingUtils.addToHash(hash, schema); + hash = HashingUtils.addToHash(hash, schema); + return hash; } }