Skip to content

Commit c2124fa

Browse files
mhliddmhlidd
authored
Merge branch 'master' into mhlidd/migrate_tomcat_okhttp
2 parents 9cb9f80 + 0ebd52b commit c2124fa

File tree

88 files changed

+375
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+375
-182
lines changed

‎.circleci/config.continue.yml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ build_test_jobs: &build_test_jobs
10231023
requires:
10241024
- ok_to_test
10251025
name: check_base
1026-
resourceClass: large
1026+
resourceClass: xlarge
10271027
gradleTarget: ":baseCheck"
10281028
cacheType: base
10291029

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ muzzle-dep-report:
377377
needs: [ build_tests ]
378378
stage: tests
379379
variables:
380-
KUBERNETES_MEMORY_REQUEST: 16Gi
381-
KUBERNETES_MEMORY_LIMIT: 16Gi
380+
KUBERNETES_MEMORY_REQUEST: 17Gi
381+
KUBERNETES_MEMORY_LIMIT: 17Gi
382382
KUBERNETES_CPU_REQUEST: 10
383383
GRADLE_WORKERS: 4
384384
GRADLE_MEM: 3G
@@ -402,7 +402,7 @@ muzzle-dep-report:
402402
export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
403403
fi
404404
- *prepare_test_env
405-
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=768M -Ddatadog.forkedMinHeapSize=128M"
405+
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
406406
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
407407
after_script:
408408
- *restore_pretest_env

‎.gitlab/exploration-tests.yml‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,62 @@ build-exploration-tests-image:
4545
- "*_surefire-reports.tar.gz"
4646
- "*_debugger-dumps.tar.gz"
4747

48-
exploration-tests-jsoup:
48+
exploration-tests-method-jsoup:
4949
needs: [ build ]
5050
dependencies:
5151
- build
5252
<<: *common-exploration-tests
5353
variables:
5454
PROJECT: jsoup
5555
script:
56-
- ./run-exploration-tests.sh "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
56+
- ./run-exploration-tests.sh "method" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
5757

58-
exploration-tests-jackson-core:
58+
exploration-tests-line-jsoup:
59+
needs: [ build ]
60+
dependencies:
61+
- build
62+
<<: *common-exploration-tests
63+
variables:
64+
PROJECT: jsoup
65+
script:
66+
- ./run-exploration-tests.sh "line" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
67+
68+
exploration-tests-method-jackson-core:
69+
needs: [ build ]
70+
dependencies:
71+
- build
72+
<<: *common-exploration-tests
73+
variables:
74+
PROJECT: jackson-core
75+
script:
76+
- ./run-exploration-tests.sh "method" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
77+
78+
exploration-tests-line-jackson-core:
5979
needs: [ build ]
6080
dependencies:
6181
- build
6282
<<: *common-exploration-tests
6383
variables:
6484
PROJECT: jackson-core
6585
script:
66-
- ./run-exploration-tests.sh "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
86+
- ./run-exploration-tests.sh "line" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
87+
88+
exploration-tests-method-jackson-databind:
89+
needs: [ build ]
90+
dependencies:
91+
- build
92+
<<: *common-exploration-tests
93+
variables:
94+
PROJECT: jackson-databind
95+
script:
96+
- ./run-exploration-tests.sh "method" "$PROJECT" "./mvnw verify" "include_${PROJECT}.txt" "exclude_$PROJECT.txt"
6797

68-
exploration-tests-jackson-databind:
98+
exploration-tests-line-jackson-databind:
6999
needs: [ build ]
70100
dependencies:
71101
- build
72102
<<: *common-exploration-tests
73103
variables:
74104
PROJECT: jackson-databind
75105
script:
76-
- ./run-exploration-tests.sh "$PROJECT" "./mvnw verify" "exclude_$PROJECT.txt"
106+
- ./run-exploration-tests.sh "line" "$PROJECT" "./mvnw verify" "include_${PROJECT}.txt" "exclude_line_$PROJECT.txt"

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTests
344344
new TestManagementDto(
345345
tracerEnvironment.getRepositoryUrl(),
346346
tracerEnvironment.getCommitMessage(),
347-
tracerEnvironment.getConfigurations().getTestBundle())));
347+
tracerEnvironment.getConfigurations().getTestBundle(),
348+
tracerEnvironment.getSha())));
348349
String json = testManagementRequestAdapter.toJson(request);
349350
RequestBody requestBody = RequestBody.create(JSON, json);
350351
TestManagementTestsDto testManagementTestsDto =
@@ -542,11 +543,14 @@ private static final class TestManagementDto {
542543
private final String commitMessage;
543544

544545
private final String module;
546+
private final String sha;
545547

546-
private TestManagementDto(String repositoryUrl, String commitMessage, String module) {
548+
private TestManagementDto(
549+
String repositoryUrl, String commitMessage, String module, String sha) {
547550
this.repositoryUrl = repositoryUrl;
548551
this.commitMessage = commitMessage;
549552
this.module = module;
553+
this.sha = sha;
550554
}
551555
}
552556

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,12 @@ public void onTestFinish(
262262

263263
if (testExecutionHistory.hasFailedAllRetries()) {
264264
test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true);
265-
} else if (testExecutionHistory.hasSucceededAllRetries()
266-
&& testModule.isAttemptToFix(thisTest)) {
267-
test.setTag(Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, true);
265+
}
266+
267+
if (testExecutionHistory.wasLastExecution() && testModule.isAttemptToFix(thisTest)) {
268+
test.setTag(
269+
Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
270+
testExecutionHistory.hasSucceededAllRetries());
268271
}
269272
}
270273

‎dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"id" : "${uid}",
55
"attributes": {
66
"repository_url" : "${tracerEnvironment.repositoryUrl}",
7-
"commit_message" : "${tracerEnvironment.commitMessage}"
7+
"commit_message" : "${tracerEnvironment.commitMessage}",
8+
"sha" : "${tracerEnvironment.sha}"
89
}
910
}
1011
}

‎dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ import datadog.trace.api.civisibility.config.TestFQN
44
import spock.lang.Specification
55

66
abstract class CiVisibilitySmokeTest extends Specification {
7+
static final List<String> SMOKE_IGNORED_TAGS = ["content.meta.['_dd.integration']"]
78

89
protected verifyEventsAndCoverages(String projectName, String toolchain, String toolchainVersion, List<Map<String, Object>> events, List<Map<String, Object>> coverages) {
910
def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"]
1011

1112
if (System.getenv().get("GENERATE_TEST_FIXTURES") != null) {
1213
def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources')
13-
CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements)
14+
CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS)
1415
} else {
15-
CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements,["content.meta.['_dd.integration']"])
16+
CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS)
1617
}
1718
}
1819

‎dd-java-agent/agent-debugger/exploration-tests/Dockerfile.exploration-tests‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ COPY jackson-core_exploration-tests.patch .
2929
RUN cd jackson-core && git apply /exploration-tests/jackson-core_exploration-tests.patch
3030
RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && cd jackson-core && mvn verify -DskipTests=true"
3131
RUN git clone -b 2.16 https://github.com/FasterXML/jackson-databind.git
32+
COPY jackson-databind_exploration-tests.patch .
33+
# fix tests that are failing because too deep recrursion
34+
RUN cd jackson-databind && git apply /exploration-tests/jackson-databind_exploration-tests.patch
3235
RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && cd jackson-databind && mvn verify -DskipTests=true"
3336

3437
# Netty

‎dd-java-agent/agent-debugger/exploration-tests/exclude_jackson-databind.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# issues with powermock
12
com/fasterxml/jackson/databind/BaseTest
3+
com/fasterxml/jackson/databind/BaseMapTest*
24
com/fasterxml/jackson/databind/type/TypeFactory
5+
com/fasterxml/jackson/databind/deser/lazy/LazyIgnoralForNumbers3730Test::<init>
36

‎dd-java-agent/agent-debugger/exploration-tests/exclude_line_jackson-databind.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
com/fasterxml/jackson/databind/BaseTest
2+
com/fasterxml/jackson/databind/BaseMapTest*
3+
com/fasterxml/jackson/databind/type/TypeFactory

0 commit comments

Comments
 (0)