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..a36848a52d4 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,6 +1,7 @@ package datadog.trace.bootstrap.instrumentation.jdbc; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class DBInfo { public static final DBInfo DEFAULT = new Builder().type("database").build(); @@ -256,7 +257,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( + return HashingUtils.hash( type, subtype, fullPropagationSupport, diff --git a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java index cb89b846eb7..25e2081dafa 100644 --- a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java +++ b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/FailSafeRawMatcher.java @@ -1,13 +1,13 @@ package datadog.trace.agent.tooling.bytebuddy.matcher; import java.security.ProtectionDomain; -import java.util.Objects; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; import net.bytebuddy.utility.JavaModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import datadog.trace.util.HashingUtils; /** {@link AgentBuilder.RawMatcher} that logs and swallows exceptions while matching. */ public class FailSafeRawMatcher implements AgentBuilder.RawMatcher { @@ -73,6 +73,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(typeMatcher, classLoaderMatcher); + return HashingUtils.hash(typeMatcher, classLoaderMatcher); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java index a6319a014c5..2a338b71269 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java @@ -4,6 +4,7 @@ import datadog.trace.util.Strings; import java.util.Objects; import javax.annotation.Nonnull; +import datadog.trace.util.HashingUtils; public class PullRequestInfo { @@ -101,7 +102,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(baseBranch, baseBranchSha, headCommit, pullRequestNumber); + return HashingUtils.hash(baseBranch, baseBranchSha, headCommit, pullRequestNumber); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java index 05aeca8a8d5..af4c845a172 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java @@ -5,6 +5,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; public class CiVisibilitySettings { @@ -137,7 +138,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( + return HashingUtils.hash( itrEnabled, codeCoverage, testsSkipping, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java index b11e0a4cb53..ac2e10fb5c0 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; +import datadog.trace.util.HashingUtils; public class EarlyFlakeDetectionSettings { @@ -56,7 +57,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(enabled, executionsByDuration, faultySessionThreshold); + return HashingUtils.hash(enabled, executionsByDuration, faultySessionThreshold); } public static final class Serializer { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java index ba312cf8fa4..76f63c450ea 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java @@ -15,6 +15,7 @@ import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; /** Settings and tests data received from the backend. */ public class ExecutionSettings { @@ -277,7 +278,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( + return HashingUtils.hash( itrEnabled, codeCoverageEnabled, testSkippingEnabled, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java index 46c0a7ab28f..195c1319762 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionsByDuration.java @@ -1,7 +1,7 @@ package datadog.trace.civisibility.config; import java.nio.ByteBuffer; -import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class ExecutionsByDuration { public final long durationMillis; @@ -34,7 +34,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(durationMillis, executions); + return HashingUtils.hash(durationMillis, executions); } public static class Serializer { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java index 919a53df2ed..5fa407075e1 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java @@ -5,6 +5,7 @@ import datadog.trace.civisibility.ipc.serialization.Serializer; import java.nio.ByteBuffer; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class JvmInfo { @@ -58,7 +59,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(name, version, vendor); + return HashingUtils.hash(name, version, vendor); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java index fe4f82fd445..3f9bf734a9d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Objects; +import datadog.trace.util.HashingUtils; public class TestManagementSettings { @@ -46,7 +46,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(enabled, attemptToFixRetries); + return HashingUtils.hash(enabled, attemptToFixRetries); } public static final class Serializer { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java index 648a98a1f12..ce2692694c6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java @@ -1,6 +1,6 @@ package datadog.trace.civisibility.events; -import java.util.Objects; +import datadog.trace.util.HashingUtils; public class BuildTaskDescriptor { @@ -26,6 +26,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(sessionKey, taskName); + return HashingUtils.hash(sessionKey, taskName); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java index 8f63a088b28..75ae9a5160e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java @@ -33,6 +33,7 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import datadog.trace.util.HashingUtils; public class ShellGitClient implements GitClient { @@ -838,7 +839,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(branch, behind, ahead); + return HashingUtils.hash(branch, behind, ahead); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java index 778e0b8c341..70293a64fb5 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsRequest.java @@ -4,6 +4,7 @@ import datadog.trace.civisibility.ipc.serialization.Serializer; import java.nio.ByteBuffer; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class ExecutionSettingsRequest implements Signal { @@ -47,7 +48,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(moduleName, jvmInfo); + return HashingUtils.hash(moduleName, jvmInfo); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java index 292e9b632fe..04996db747d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ExecutionSettingsResponse.java @@ -3,6 +3,7 @@ import datadog.trace.civisibility.config.ExecutionSettings; import java.nio.ByteBuffer; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class ExecutionSettingsResponse implements SignalResponse { @@ -40,7 +41,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(settings); + return HashingUtils.hash(settings); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java index 5e0da399514..8eb54db58ca 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleCoverageDataJacoco.java @@ -4,8 +4,8 @@ import datadog.trace.civisibility.ipc.serialization.Serializer; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.Objects; import javax.annotation.Nonnull; +import datadog.trace.util.HashingUtils; public class ModuleCoverageDataJacoco extends ModuleSignal { @@ -39,7 +39,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(sessionId, moduleId, Arrays.hashCode(coverageData)); + return HashingUtils.hash(sessionId, moduleId, Arrays.hashCode(coverageData)); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java index 2f3508c366f..76bba3abf9b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/ModuleExecutionResult.java @@ -5,6 +5,7 @@ import java.nio.ByteBuffer; import java.util.Collection; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class ModuleExecutionResult extends ModuleSignal { @@ -99,7 +100,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( + return HashingUtils.hash( sessionId, moduleId, coverageEnabled, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java index 3402c8227eb..561a78bf10e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java @@ -3,6 +3,7 @@ import datadog.trace.civisibility.ipc.serialization.Serializer; import java.nio.ByteBuffer; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class TestFramework implements Comparable { private final String name; @@ -35,7 +36,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(name, version); + return HashingUtils.hash(name, version); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java index 25999afc891..55fbea7014a 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java @@ -1,8 +1,8 @@ package datadog.trace.civisibility.source; import java.lang.reflect.Method; -import java.util.Objects; import javax.annotation.Nonnull; +import datadog.trace.util.HashingUtils; public interface LinesResolver { @@ -49,7 +49,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(startLineNumber, endLineNumber); + return HashingUtils.hash(startLineNumber, endLineNumber); } } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java index 60a6b969e54..36eb6f240f3 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java @@ -21,6 +21,7 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import datadog.trace.util.HashingUtils; public class RepoIndex { @@ -194,7 +195,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(relativePath, language); + return HashingUtils.hash(relativePath, language); } } } diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java index cd339934782..a1cdce55f62 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/CrashLog.java @@ -6,6 +6,7 @@ import datadog.trace.util.RandomUtils; import java.io.IOException; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class CrashLog { private static final int VERSION = 0; @@ -90,7 +91,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( + return HashingUtils.hash( uuid, timestamp, incomplete, diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java index 5e94a500e6f..32585391677 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java @@ -2,6 +2,7 @@ import com.squareup.moshi.Json; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class ErrorData { @Json(name = "is_crash") @@ -39,6 +40,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(isCrash, kind, message, sourceType, stack); + return HashingUtils.hash(isCrash, kind, message, sourceType, stack); } } diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java index a1f5e98626e..7695d035f43 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Metadata.java @@ -3,6 +3,7 @@ import com.squareup.moshi.Json; import java.util.Arrays; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class Metadata { @Json(name = "library_name") @@ -38,6 +39,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(libraryName, libraryVersion, family, Arrays.hashCode(tags)); + return HashingUtils.hash(libraryName, libraryVersion, family, Arrays.hashCode(tags)); } } diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java index 237f6c38990..949dd5a1e62 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/OSInfo.java @@ -3,6 +3,7 @@ import com.squareup.moshi.Json; import datadog.environment.SystemProperties; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class OSInfo { public final String architecture; @@ -37,7 +38,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(architecture, bitness, osType, version); + return HashingUtils.hash(architecture, bitness, osType, version); } public static OSInfo current() { diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SemanticVersion.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SemanticVersion.java index 2ac34dc2ecc..0ca0f5b22bf 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SemanticVersion.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SemanticVersion.java @@ -5,10 +5,10 @@ import com.squareup.moshi.JsonWriter; import com.squareup.moshi.ToJson; import java.io.IOException; -import java.util.Objects; import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import datadog.trace.util.HashingUtils; public final class SemanticVersion { private static final Pattern NUMERIC_SPLITTER = Pattern.compile("[^0-9]+"); @@ -91,7 +91,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(major, minor, patch); + return HashingUtils.hash(major, minor, patch); } @Override diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java index f95167e6ef5..6bb19556eda 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/SigInfo.java @@ -2,6 +2,7 @@ import com.squareup.moshi.Json; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class SigInfo { @Json(name = "si_signo") @@ -40,6 +41,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(number, name, address, code, action); + return HashingUtils.hash(number, name, address, code, action); } } diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java index fbe6be3abfd..3e3abcfea45 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackFrame.java @@ -3,6 +3,7 @@ import com.squareup.moshi.Json; import datadog.crashtracking.buildid.BuildInfo; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class StackFrame { @@ -59,6 +60,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(path, line, function, buildId, buildIdType, fileType, relativeAddress); + return HashingUtils.hash(path, line, function, buildId, buildIdType, fileType, relativeAddress); } } diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java index 9467e01fcba..37aefeed3cd 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class StackTrace { private static final JsonAdapter ADAPTER = @@ -33,7 +34,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(format, Arrays.hashCode(frames)); + return HashingUtils.hash(format, Arrays.hashCode(frames)); } public void writeAsJson(final JsonWriter writer) throws IOException { diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java index f758b39fdcb..98812404cee 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java @@ -1,7 +1,6 @@ package datadog.trace.bootstrap.debugger; -import static datadog.trace.bootstrap.debugger.util.Redaction.REDACTED_VALUE; - +import datadog.trace.util.HashingUtils; import datadog.trace.bootstrap.debugger.el.ReflectiveFieldValueResolver; import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.ValueReferences; @@ -19,6 +18,8 @@ import java.util.Objects; import java.util.function.Function; +import static datadog.trace.bootstrap.debugger.util.Redaction.REDACTED_VALUE; + /** Stores different kind of data (arguments, locals, fields, exception) for a specific location */ public class CapturedContext implements ValueReferenceResolver { public static final CapturedContext EMPTY_CONTEXT = new CapturedContext(null); @@ -373,7 +374,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(arguments, locals, throwable, staticFields); + return HashingUtils.hash(arguments, locals, throwable, staticFields); } @Override @@ -628,7 +629,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(name, declaredType, value, fields, notCapturedReason); + return HashingUtils.hash(name, declaredType, value, fields, notCapturedReason); } @Override @@ -723,7 +724,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(type, message, stacktrace); + return HashingUtils.hash(type, message, stacktrace); } @Override diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java index df2ca17a1df..2c847352eb0 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedStackFrame.java @@ -1,5 +1,7 @@ package datadog.trace.bootstrap.debugger; +import datadog.trace.util.HashingUtils; + /** Stores information of a stacktrace's frame */ public class CapturedStackFrame { private final String fileName; @@ -49,7 +51,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return java.util.Objects.hash(fileName, function, lineNumber); + return HashingUtils.hash(fileName, function, lineNumber); } @Override diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java index 92117b86b3a..5cfc27bb515 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeLocation.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** Probe location information used in ProbeDetails class */ public class ProbeLocation { @@ -50,7 +51,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(type, method, file, lines); + return HashingUtils.hash(type, method, file, lines); } @Override diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java index 6d5c8d2fca1..558d87a9891 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java @@ -4,6 +4,7 @@ import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** Represents any literal/constant in expression language */ public class Literal @@ -51,6 +52,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(value); + return HashingUtils.hash(value); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java index bcc940e1d5d..d4b54b852e7 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java @@ -15,6 +15,7 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import datadog.trace.util.HashingUtils; /** Implements expression language for capturing values for metric probes */ public class ValueScript implements DebuggerScript> { @@ -51,7 +52,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(expr, dsl); + return HashingUtils.hash(expr, dsl); } @Override diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java index 45609979894..4f61b266261 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java @@ -10,6 +10,7 @@ import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.util.Redaction; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class GetMemberExpression implements ValueExpression> { private final ValueExpression target; @@ -56,7 +57,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(target, memberName); + return HashingUtils.hash(target, memberName); } @Generated diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java index fa36ef9f15f..b384c12d2e8 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java @@ -1,7 +1,6 @@ package com.datadog.debugger.el.expressions; -import static datadog.trace.bootstrap.debugger.util.Redaction.REDACTED_VALUE; - +import datadog.trace.util.HashingUtils; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Generated; import com.datadog.debugger.el.PrettyPrintVisitor; @@ -13,6 +12,8 @@ import datadog.trace.bootstrap.debugger.util.Redaction; import java.util.Objects; +import static datadog.trace.bootstrap.debugger.util.Redaction.REDACTED_VALUE; + /** An expression taking a reference path and resolving to {@linkplain Value} */ public final class ValueRefExpression implements ValueExpression> { private final String symbolName; @@ -51,7 +52,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(symbolName); + return HashingUtils.hash(symbolName); } @Generated diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java index d0c3dcffc63..b3ab7851121 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import datadog.trace.util.HashingUtils; /** * A list-like {@linkplain Value}.
@@ -243,7 +244,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(listHolder, arrayHolder, arrayType); + return HashingUtils.hash(listHolder, arrayHolder, arrayType); } @Override diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java index d0676ef35d6..315e686d02c 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java @@ -13,6 +13,7 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; +import datadog.trace.util.HashingUtils; /** * Stores debugger configuration for a service with: - Probe definitions - filters (allow/deny) - @@ -57,7 +58,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(packagePrefixes, classes); + return HashingUtils.hash(packagePrefixes, classes); } } @@ -188,7 +189,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(service, probes, allowList, denyList, sampling); + return HashingUtils.hash(service, probes, allowList, denyList, sampling); } public static Configuration.Builder builder() { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java index 667c4a21564..8bae11bcc93 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ProbeStatus.java @@ -19,6 +19,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import datadog.trace.util.HashingUtils; /** Stores status information of probes for a service */ public class ProbeStatus { @@ -88,7 +89,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(ddSource, service, message, diagnostics); + return HashingUtils.hash(ddSource, service, message, diagnostics); } @Generated @@ -167,7 +168,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(probeId, probeVersion, runtimeId, status, exception); + return HashingUtils.hash(probeId, probeVersion, runtimeId, status, exception); } @Override @@ -227,7 +228,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(type, message, stacktrace); + return HashingUtils.hash(type, message, stacktrace); } @Generated diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java index ec22df6b8bb..ad0f0af14f4 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java @@ -3,6 +3,7 @@ import com.datadog.debugger.agent.Generated; import java.time.Instant; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** Stores status information of a probe and instrumentation result */ public final class DiagnosticMessage { @@ -79,6 +80,6 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(timestamp, kind, message, throwable); + return HashingUtils.hash(timestamp, kind, message, throwable); } } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java index aff199ae418..b09d5fd9f82 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java @@ -1,9 +1,6 @@ package com.datadog.debugger.probe; -import static datadog.trace.api.DDTags.*; -import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; - +import datadog.trace.util.HashingUtils; import com.datadog.debugger.agent.Generated; import com.datadog.debugger.instrumentation.CodeOriginInstrumenter; import com.datadog.debugger.instrumentation.DiagnosticMessage; @@ -22,6 +19,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static datadog.trace.api.DDTags.*; +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; + public class CodeOriginProbe extends ProbeDefinition { private static final Logger LOGGER = LoggerFactory.getLogger(CodeOriginProbe.class); @@ -112,7 +113,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - int result = Objects.hash(language, id, version, tagMap, where, evaluateAt, entrySpanProbe); + int result = HashingUtils.hash(language, id, version, tagMap, where, evaluateAt, entrySpanProbe); result = 31 * result + Arrays.hashCode(tags); return result; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java index 1b394c3a1d8..201c05c5597 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java @@ -1,8 +1,6 @@ package com.datadog.debugger.probe; -import static com.datadog.debugger.probe.LogProbe.Capture.toLimits; -import static java.lang.String.format; - +import datadog.trace.util.HashingUtils; import com.datadog.debugger.agent.DebuggerAgent; import com.datadog.debugger.agent.Generated; import com.datadog.debugger.agent.StringTemplateBuilder; @@ -55,6 +53,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static com.datadog.debugger.probe.LogProbe.Capture.toLimits; +import static java.lang.String.format; + /** Stores definition of a log probe */ public class LogProbe extends ProbeDefinition implements Sampled, CapturedContextProbe { private static final Logger LOGGER = LoggerFactory.getLogger(LogProbe.class); @@ -103,7 +104,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(str, parsedExpr); + return HashingUtils.hash(str, parsedExpr); } @Generated @@ -203,7 +204,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount); + return HashingUtils.hash(maxReferenceDepth, maxCollectionSize, maxLength, maxFieldCount); } @Generated @@ -262,7 +263,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(snapshotsPerSecond); + return HashingUtils.hash(snapshotsPerSecond); } @Generated @@ -1026,7 +1027,7 @@ public boolean equals(Object o) { @Override public int hashCode() { int result = - Objects.hash( + HashingUtils.hash( language, id, version, diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java index a410b5d2a8a..df3564df5e4 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/MetricProbe.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Objects; import org.objectweb.asm.Type; +import datadog.trace.util.HashingUtils; /** Stores definition of a metric probe */ public class MetricProbe extends ProbeDefinition { @@ -192,7 +193,7 @@ public boolean equals(Object o) { @Override public int hashCode() { int result = - Objects.hash(language, id, version, tagMap, where, evaluateAt, kind, metricName, value); + HashingUtils.hash(language, id, version, tagMap, where, evaluateAt, kind, metricName, value); result = 31 * result + Arrays.hashCode(tags); return result; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java index 707ea9ee0de..ae93880fef6 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** Generic class storing common probe definition */ public abstract class ProbeDefinition implements ProbeImplementation { @@ -321,7 +322,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(key, value); + return HashingUtils.hash(key, value); } } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java index 058da4fbb02..9a7ba032976 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Sampling.java @@ -1,6 +1,7 @@ package com.datadog.debugger.probe; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** Stores sampling configuration */ public class Sampling { @@ -65,7 +66,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(coolDownInSeconds, eventsPerSecond); + return HashingUtils.hash(coolDownInSeconds, eventsPerSecond); } @Override diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java index 3961bf5f9c0..65a13df9ed5 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java @@ -29,6 +29,7 @@ import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import datadog.trace.util.HashingUtils; public class SpanDecorationProbe extends ProbeDefinition implements CapturedContextProbe { private static final Logger LOGGER = LoggerFactory.getLogger(SpanDecorationProbe.class); @@ -113,7 +114,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(name, value); + return HashingUtils.hash(name, value); } } @@ -151,7 +152,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(when, tags); + return HashingUtils.hash(when, tags); } } @@ -321,7 +322,7 @@ public List getDecorations() { @Override public int hashCode() { int result = - Objects.hash(language, id, version, tagMap, where, evaluateAt, targetSpan, decorations); + HashingUtils.hash(language, id, version, tagMap, where, evaluateAt, targetSpan, decorations); result = 31 * result + Arrays.hashCode(tags); return result; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java index e8a4e2cbf96..a994ddf8408 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanProbe.java @@ -10,6 +10,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class SpanProbe extends ProbeDefinition { // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing @@ -31,7 +32,7 @@ public InstrumentationResult.Status instrument( @Generated @Override public int hashCode() { - int result = Objects.hash(language, id, version, tagMap, where, evaluateAt); + int result = HashingUtils.hash(language, id, version, tagMap, where, evaluateAt); result = 31 * result + Arrays.hashCode(tags); return result; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java index 4b7972de6aa..e0dfe3d7db2 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java @@ -1,7 +1,6 @@ package com.datadog.debugger.probe; -import static java.lang.String.format; - +import datadog.trace.util.HashingUtils; import com.datadog.debugger.agent.DebuggerAgent; import com.datadog.debugger.agent.Generated; import com.datadog.debugger.el.ProbeCondition; @@ -23,6 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.lang.String.format; + public class TriggerProbe extends ProbeDefinition implements Sampled, CapturedContextProbe { private static final Logger LOGGER = LoggerFactory.getLogger(TriggerProbe.class); @@ -165,7 +166,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - int result = Objects.hash(language, id, version, where, evaluateAt); + int result = HashingUtils.hash(language, id, version, where, evaluateAt); result = 31 * result + Arrays.hashCode(tags); return result; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java index 72787c61e6e..d76d6d70125 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java @@ -15,6 +15,7 @@ import java.util.regex.Pattern; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.MethodNode; +import datadog.trace.util.HashingUtils; /** Stores probe location definition */ public class Where { @@ -279,7 +280,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - int result = Objects.hash(typeName, methodName, sourceFile, signature); + int result = HashingUtils.hash(typeName, methodName, sourceFile, signature); result = 31 * result + Arrays.hashCode(lines); return result; } @@ -341,7 +342,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(from, till); + return HashingUtils.hash(from, till); } } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java index 7d5639a06b7..3a42d833ca8 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** Data class representing all data collected at a probe location */ public class Snapshot { @@ -277,7 +278,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(entry, lines, _return, caughtExceptions); + return HashingUtils.hash(entry, lines, _return, caughtExceptions); } @Generated @@ -329,7 +330,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(id, name); + return HashingUtils.hash(id, name); } @Generated diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java index 78599d993d1..0ea92eafed3 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/LanguageSpecifics.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.Objects; +import datadog.trace.util.HashingUtils; public class LanguageSpecifics { @Json(name = "access_modifiers") @@ -70,7 +71,7 @@ public boolean equals(Object o) { @Generated @Override public int hashCode() { - return Objects.hash(accessModifiers, annotations, superClass, interfaces, returnType); + return HashingUtils.hash(accessModifiers, annotations, superClass, interfaces, returnType); } @Generated diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java index ab6d91ecbb4..9112266c650 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Evidence.java @@ -6,6 +6,7 @@ import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; public final class Evidence { @@ -57,7 +58,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - int result = Objects.hash(value); + int result = HashingUtils.hash(value); result = 31 * result + Arrays.hashCode(ranges); return result; } diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java index 25b0dbab667..2f9d89a86d3 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Range.java @@ -1,7 +1,6 @@ package com.datadog.iast.model; -import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED; - +import datadog.trace.util.HashingUtils; import com.datadog.iast.model.json.SourceIndex; import com.datadog.iast.util.Ranged; import java.util.HashSet; @@ -12,6 +11,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED; + public final class Range implements Ranged { private final @Nonnegative int start; @@ -68,7 +69,7 @@ public String toString() { @Override public int hashCode() { - return Objects.hash(start, length, source); + return HashingUtils.hash(start, length, source); } public boolean isValid() { diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java index 854c38b9234..52bd729d2b1 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/Source.java @@ -1,7 +1,6 @@ package com.datadog.iast.model; -import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; - +import datadog.trace.util.HashingUtils; import com.datadog.iast.model.json.SourceTypeString; import datadog.trace.api.iast.SourceTypes; import datadog.trace.api.iast.Taintable; @@ -13,6 +12,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; + public final class Source implements Taintable.Source { private static final Logger LOGGER = LoggerFactory.getLogger(Source.class); @@ -113,7 +114,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(origin, getName(), getValue()); + return HashingUtils.hash(origin, getName(), getValue()); } public Source attachValue(final Object newValue) { diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java index d2a1d1e81e7..061cc0998e8 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java @@ -1,7 +1,6 @@ package com.datadog.profiling.controller; -import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; - +import datadog.trace.util.HashingUtils; import datadog.environment.JavaVirtualMachine; import datadog.environment.OperatingSystem; import datadog.trace.api.Config; @@ -17,11 +16,12 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Objects; import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; + /** Capture the profiler config first and allow emitting the setting events per each recording. */ public abstract class ProfilerSettingsSupport { private static final Logger logger = LoggerFactory.getLogger(ProfilerSettingsSupport.class); @@ -52,7 +52,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(enablement, ssiMechanism); + return HashingUtils.hash(enablement, ssiMechanism); } @Override diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java index c0082e8fd22..e1a07c9f4a7 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java @@ -2,6 +2,7 @@ import java.util.Map; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class Configurations { private final String osPlatform; @@ -93,7 +94,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( + return HashingUtils.hash( osPlatform, osArchitecture, osVersion, diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java index 9534f4e6db1..fac3d58e2a0 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java @@ -1,6 +1,7 @@ package datadog.trace.api.civisibility.config; import java.util.Objects; +import datadog.trace.util.HashingUtils; /** * Fully Qualified Name: uniquely identifies a test case within a module by name. Multiple @@ -37,7 +38,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(suite, name); + return HashingUtils.hash(suite, name); } @Override diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java index 012cbeb886b..2f45609ae3a 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java @@ -2,6 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; /** Uniquely identifies a test case with FQN and parameters. */ public class TestIdentifier { @@ -55,7 +56,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(fqn, parameters); + return HashingUtils.hash(fqn, parameters); } @Override diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java index 96fb08545f2..2e55910ce38 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java @@ -3,6 +3,7 @@ import java.lang.reflect.Method; import java.util.Objects; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; /** Data needed to identify test definition source. */ public class TestSourceData { @@ -67,7 +68,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(testClass, testMethod, testMethodName); + return HashingUtils.hash(testClass, testMethod, testMethodName); } @Override diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java index 99f15fa544d..47615eaea4b 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java @@ -2,6 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; public final class TestDescriptor { private final String testSuiteName; @@ -46,7 +47,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(testSuiteName, testClass, testName, testParameters, testQualifier); + return HashingUtils.hash(testSuiteName, testClass, testName, testParameters, testQualifier); } @Override diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java index f972f9e4c87..f8c3d6ecd2b 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java @@ -1,6 +1,7 @@ package datadog.trace.api.civisibility.events; import java.util.Objects; +import datadog.trace.util.HashingUtils; public final class TestSuiteDescriptor { private final String testSuiteName; @@ -26,7 +27,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(testSuiteName, testClass); + return HashingUtils.hash(testSuiteName, testClass); } @Override diff --git a/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java b/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java index 5dc94e713bc..17de8f90b2a 100644 --- a/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java +++ b/internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java @@ -18,11 +18,11 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import javax.annotation.Nullable; +import datadog.trace.util.HashingUtils; public class GitInfoProvider { @@ -144,7 +144,7 @@ public boolean equals(Object obj) { @Override public int hashCode() { - return Objects.hash(expectedGitProvider, discrepantGitProvider, discrepancyType); + return HashingUtils.hash(expectedGitProvider, discrepantGitProvider, discrepancyType); } } diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java index 4ecd730e4f2..a0bfe00a138 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java @@ -13,6 +13,7 @@ import javax.annotation.Nullable; import org.slf4j.Marker; import org.slf4j.MarkerFactory; +import datadog.trace.util.HashingUtils; public class LogCollector { public static final Marker SEND_TELEMETRY = MarkerFactory.getMarker("SEND_TELEMETRY"); @@ -121,7 +122,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(logLevel, message, throwable == null ? null : throwable.getClass()); + return HashingUtils.hash(logLevel, message, throwable == null ? null : throwable.getClass()); } } } diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java index 7261c52eab6..96a881fda6a 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/MetricCollector.java @@ -1,15 +1,16 @@ package datadog.trace.api.telemetry; -import static datadog.trace.api.telemetry.MetricCollector.Metric; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; - +import datadog.trace.util.HashingUtils; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Objects; +import static datadog.trace.api.telemetry.MetricCollector.Metric; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; + public interface MetricCollector { int RAW_QUEUE_SIZE = 1024; @@ -89,7 +90,7 @@ public boolean equals(final Object o) { @Override public int hashCode() { - return Objects.hash(metricName, common, namespace, tags); + return HashingUtils.hash(metricName, common, namespace, tags); } @Override @@ -145,7 +146,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(metricName, common, namespace, tags); + return HashingUtils.hash(metricName, common, namespace, tags); } @Override diff --git a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java index 4554471d357..886d035fc99 100644 --- a/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java +++ b/remote-config/remote-config-core/src/main/java/datadog/remoteconfig/state/ParsedConfigKey.java @@ -6,6 +6,7 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import datadog.trace.util.HashingUtils; public class ParsedConfigKey implements ConfigKey { @@ -90,6 +91,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(originalKey); + return HashingUtils.hash(originalKey); } }