Skip to content

Commit b58d8f9

Browse files
authored
Merge branch 'master' into andrea.marziali/akka-swap
2 parents d371790 + 10d731c commit b58d8f9

14 files changed

Lines changed: 790 additions & 516 deletions

File tree

.claude/skills/migrate-groovy-to-java/SKILL.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ When converting Groovy code to Java code, make sure that:
2121
- Do not wrap checked exceptions and throw a Runtime exception; prefer adding a throws clause at method declaration
2222
- Do not mark local variables `final`
2323
- Ensure variables are human-readable; avoid single-letter names and pre-define variables that are referenced multiple times
24+
- When translating Spock `Mock(...)` usage, use `libs.bundles.mockito` instead of writing manual recording/stub implementations

.github/g2j-migrated-modules.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77

88
buildSrc/call-site-instrumentation-plugin
99
components/json
10+
dd-trace-api

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.bootstrap.instrumentation.jdbc;
22

3+
import datadog.trace.util.HashingUtils;
34
import java.util.Objects;
45

56
public final class DBInfo {
@@ -256,17 +257,18 @@ public boolean equals(Object o) {
256257

257258
@Override
258259
public int hashCode() {
259-
return Objects.hash(
260-
type,
261-
subtype,
262-
fullPropagationSupport,
263-
url,
264-
user,
265-
instance,
266-
db,
267-
host,
268-
port,
269-
warehouse,
270-
schema);
260+
int hash = 0;
261+
hash = HashingUtils.addToHash(hash, type);
262+
hash = HashingUtils.addToHash(hash, subtype);
263+
hash = HashingUtils.addToHash(hash, fullPropagationSupport);
264+
hash = HashingUtils.addToHash(hash, url);
265+
hash = HashingUtils.addToHash(hash, user);
266+
hash = HashingUtils.addToHash(hash, instance);
267+
hash = HashingUtils.addToHash(hash, db);
268+
hash = HashingUtils.addToHash(hash, host);
269+
hash = HashingUtils.addToHash(hash, port);
270+
hash = HashingUtils.addToHash(hash, warehouse);
271+
hash = HashingUtils.addToHash(hash, schema);
272+
return hash;
271273
}
272274
}

dd-trace-api/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,6 @@ description = "dd-trace-api"
7474
dependencies {
7575
api(libs.slf4j)
7676
testImplementation(libs.guava)
77+
testImplementation(libs.bundles.mockito)
7778
testImplementation(project(":utils:test-utils"))
7879
}

dd-trace-api/src/test/groovy/datadog/trace/api/aiguard/AIGuardTest.groovy

Lines changed: 0 additions & 151 deletions
This file was deleted.

dd-trace-api/src/test/groovy/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.groovy

Lines changed: 0 additions & 20 deletions
This file was deleted.

dd-trace-api/src/test/groovy/datadog/trace/api/internal/util/HexStringUtilsTest.groovy

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)