Skip to content

Commit 31b101c

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
authored
Merge branch 'master' into alexeyk/increased-limits-to-prevent-not-needed-dumps
2 parents 6720e38 + 4313a72 commit 31b101c

28 files changed

Lines changed: 196 additions & 141 deletions

File tree

‎.gitlab/macrobenchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ notify-slo-breaches:
142142
when: never
143143
- when: always
144144
variables:
145-
CHANNEL: "apm-release-platform"
145+
CHANNEL: "apm-java"

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
api group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
99
api group: 'org.freemarker', name: 'freemarker', version: '2.3.31'
1010
api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
11-
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
11+
api libs.jackson.databind
1212
api group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
1313
api group: 'org.xmlunit', name: 'xmlunit-core', version: '2.10.3'
1414
}

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ package datadog.trace.civisibility
22

33
import com.fasterxml.jackson.databind.ObjectMapper
44
import com.fasterxml.jackson.databind.SerializationFeature
5-
import com.jayway.jsonpath.*
5+
import com.jayway.jsonpath.Configuration
6+
import com.jayway.jsonpath.JsonPath
7+
import com.jayway.jsonpath.Option
8+
import com.jayway.jsonpath.ReadContext
9+
import com.jayway.jsonpath.WriteContext
610
import datadog.trace.api.DDSpanTypes
711
import datadog.trace.api.civisibility.config.LibraryCapability
812
import datadog.trace.api.civisibility.config.TestFQN

‎dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/impacted/no_remote/git/config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
logallrefupdates = true
66
ignorecase = true
77
precomposeunicode = true
8+
sshCommand = ssh -o ConnectTimeout=2
89
[remote "origin"]
910
url = [email protected]:datadog/non_existing_repo.git
1011
fetch = +refs/heads/*:refs/remotes/origin/*

‎dd-java-agent/agent-crashtracking/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323

2424
testImplementation libs.bundles.junit5
2525
testImplementation libs.bundles.mockito
26+
testImplementation libs.jackson.databind
2627
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
27-
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
2828
}
2929

‎dd-java-agent/agent-profiling/profiling-uploader/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ dependencies {
3333
implementation libs.lz4
3434
implementation libs.aircompressor
3535

36-
testImplementation libs.bundles.junit5
3736
testImplementation project(':dd-java-agent:agent-profiling:profiling-testing')
37+
testImplementation project(':utils:test-utils')
38+
testImplementation libs.bundles.junit5
3839
testImplementation libs.bundles.mockito
40+
testImplementation libs.jackson.databind
3941
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
40-
41-
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
4242
}
4343

‎dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void setup() throws IOException {
188188
}
189189

190190
@AfterEach
191-
public void tearDown() throws IOException {
191+
public void tearDown() {
192192
uploader.shutdown();
193193
try {
194194
server.shutdown();
@@ -511,7 +511,7 @@ public void testRequestWithProxyDefaultPassword() throws Exception {
511511
}
512512

513513
@Test
514-
void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() throws Exception {
514+
void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
515515
when(config.getFinalProfilingUrl()).thenReturn("http://example.com");
516516

517517
uploader = new ProfileUploader(config, configProvider);
@@ -522,7 +522,7 @@ void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() throws Exception {
522522
}
523523

524524
@Test
525-
void testOkHttpClientUsesDefaultConnspecsOverTLS() throws Exception {
525+
void testOkHttpClientUsesDefaultConnspecsOverTLS() {
526526
when(config.getFinalProfilingUrl()).thenReturn("https://example.com");
527527

528528
uploader = new ProfileUploader(config, configProvider);

‎dd-java-agent/appsec/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
2424
testImplementation group: 'com.flipkart.zjsonpatch', name: 'zjsonpatch', version: '0.4.11'
2525
testImplementation libs.logback.classic
26-
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
26+
testImplementation libs.jackson.databind
2727
}
2828

2929
shadowJar {

‎dd-java-agent/instrumentation/finatra-2.9/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@ dependencies {
2727
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
2828

2929
testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
30-
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
3130
// Required for older versions of finatra on JDKs >= 11
3231
testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
3332

3433
latestPre207TestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '[,20.7.0)'
3534

3635
latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
37-
latestDepTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0'
3836
}
3937

4038
tasks.named("compileLatestDepTestGroovy").configure {

‎dd-java-agent/instrumentation/jose-jwt/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ addTestSuiteForDir('latestDepTest', 'test')
1212
dependencies {
1313
testImplementation group: 'com.auth0', name: 'java-jwt', version: '4.0.0-beta.0'
1414
testImplementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.24.4'
15-
testImplementation group: 'com.fasterxml.jackson.core', name:'jackson-databind', version:'2.13.2.2'
1615
}

0 commit comments

Comments
 (0)