diff --git a/.circleci/collect_reports.sh b/.circleci/collect_reports.sh index 9e085003c62..ce66a61358e 100755 --- a/.circleci/collect_reports.sh +++ b/.circleci/collect_reports.sh @@ -35,12 +35,12 @@ done mkdir -p $REPORTS_DIR >/dev/null 2>&1 -cp /tmp/hs_err_pid*.log $REPORTS_DIR || true -cp /tmp/java_pid*.hprof $REPORTS_DIR || true -cp /tmp/javacore.* $REPORTS_DIR || true -cp /tmp/*.trc $REPORTS_DIR || true -cp /tmp/*.dmp $REPORTS_DIR || true -cp /tmp/dd-profiler/*.jfr $REPORTS_DIR || true +cp /tmp/hs_err_pid*.log $REPORTS_DIR 2>/dev/null || true +cp /tmp/java_pid*.hprof $REPORTS_DIR 2>/dev/null || true +cp /tmp/javacore.* $REPORTS_DIR 2>/dev/null || true +cp /tmp/*.trc $REPORTS_DIR 2>/dev/null || true +cp /tmp/*.dmp $REPORTS_DIR 2>/dev/null || true +cp /tmp/dd-profiler/*.jfr $REPORTS_DIR 2>/dev/null || true function process_reports () { project_to_save=$1 @@ -59,9 +59,9 @@ function process_reports () { else echo "copying reports for $project_to_save" mkdir -p $report_path - cp -r workspace/$project_to_save/build/reports/* $report_path/ || true - cp workspace/$project_to_save/build/hs_err_pid*.log $report_path/ || true - cp workspace/$project_to_save/build/javacore*.txt $report_path/ || true + cp -r workspace/$project_to_save/build/reports/* $report_path/ 2>/dev/null || true + cp workspace/$project_to_save/build/hs_err_pid*.log $report_path/ 2>/dev/null || true + cp workspace/$project_to_save/build/javacore*.txt $report_path/ 2>/dev/null || true fi } @@ -73,4 +73,4 @@ for report_path in workspace/**/build/reports; do process_reports $report_path done -tar -cvzf reports.tar $REPORTS_DIR +tar -czf reports.tar $REPORTS_DIR diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a0ec785ec6..a7c1e528a11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,9 +27,57 @@ variables: GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/" JAVA_BUILD_IMAGE_VERSION: "v25.01" REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" + DEFAULT_TEST_JVMS: /^(8|11|17|21)$/ PROFILE_TESTS: description: "Enable profiling of tests" value: "false" + NON_DEFAULT_JVMS: + description: "Enable tests on JVMs that are not the default" + value: "false" + RUN_FLAKY_TESTS: + description: "Enable flaky tests" + value: "false" + +.test_matrix: &test_matrix + - testJvm: &test_jvms + - "8" + - "11" + - "17" + - "21" + - "semeru11" + - "oracle8" + - "ubuntu17" + - "zulu8" + - "semeru8" + - "ibm8" + - "zulu11" + - "semeru17" + +# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time +# These blocks emulate "parallel" by including it in the matrix +.test_matrix_2: &test_matrix_2 + - testJvm: *test_jvms + CI_SPLIT: ["1/2", "2/2"] + +.test_matrix_4: &test_matrix_4 + - testJvm: *test_jvms + CI_SPLIT: ["1/4", "2/4", "3/4", "4/4"] + +.test_matrix_6: &test_matrix_6 + - testJvm: *test_jvms + CI_SPLIT: ["1/6", "2/6", "3/6", "4/6", "5/6", "6/6"] + +.test_matrix_8: &test_matrix_8 + - testJvm: *test_jvms + CI_SPLIT: ["1/8", "2/8", "3/8", "4/8", "5/8", "6/8", "7/8", "8/8"] + +.test_matrix_12: &test_matrix_12 + - testJvm: *test_jvms + CI_SPLIT: [ "1/12", "2/12", "3/12", "4/12", "5/12", "6/12", "7/12", "8/12", "9/12", "10/12", "11/12", "12/12" ] + +.master_only: &master_only + - if: $CI_COMMIT_BRANCH == "master" + when: on_success default: tags: [ "arch:amd64" ] @@ -45,52 +93,64 @@ default: # CI_NODE_INDEX and CI_NODE_TOTAL are 1-indexed and not always set. These steps normalize the numbers for jobs .normalize_node_index: &normalize_node_index - - echo "CI_NODE_TOTAL=$CI_NODE_TOTAL , CI_NODE_INDEX=$CI_NODE_INDEX" + - if [ "$CI_NO_SPLIT" == "true" ] ; then CI_NODE_INDEX=1; CI_NODE_TOTAL=1; fi # A job uses parallel but doesn't intend to split by index + - if [ -n "$CI_SPLIT" ]; then CI_NODE_INDEX="${CI_SPLIT%%/*}"; CI_NODE_TOTAL="${CI_SPLIT##*/}"; fi + - echo "CI_NODE_TOTAL=${CI_NODE_TOTAL}, CI_NODE_INDEX=$CI_NODE_INDEX" - export NORMALIZED_NODE_TOTAL=${CI_NODE_TOTAL:-1} - ONE_INDEXED_NODE_INDEX=${CI_NODE_INDEX:-1}; export NORMALIZED_NODE_INDEX=$((ONE_INDEXED_NODE_INDEX - 1)) - - echo "NORMALIZED_NODE_TOTAL=$NORMALIZED_NODE_TOTAL , NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX" + - echo "NORMALIZED_NODE_TOTAL=${NORMALIZED_NODE_TOTAL}, NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX" .gradle_build: &gradle_build image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-base stage: build variables: - GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx2560M -Xms2560M -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" MAVEN_OPTS: "-Xms64M -Xmx512M" GRADLE_WORKERS: 2 + GRADLE_MEM: 2560M KUBERNETES_CPU_REQUEST: 8 - KUBERNETES_MEMORY_REQUEST: 6Gi + KUBERNETES_MEMORY_REQUEST: 8Gi + KUBERNETES_MEMORY_LIMIT: 8Gi + CACHE_TYPE: lib #default + RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE: 4 # Runtime.getRuntime().availableProcessors() returns incorrect or very high values in Kubernetes cache: - - key: '$CI_SERVER_VERSION-v2' # Dependencies cache. Reset the cache every time gitlab is upgraded. ~Every couple months + - key: '$CI_SERVER_VERSION-$CACHE_TYPE' # Dependencies cache. Reset the cache every time gitlab is upgraded. ~Every couple months paths: # Cached dependencies and wrappers for gradle - .gradle/wrapper - .gradle/caches - .gradle/notifications policy: $DEPENDENCY_CACHE_POLICY - - key: $CI_PIPELINE_ID-$BUILD_CACHE_TYPE # Incremental build cache. Shared by all jobs in the pipeline of the same type + fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache + - '$CI_SERVER_VERSION-base' + - '$CI_SERVER_VERSION-lib' + - key: $CI_PIPELINE_ID-$CACHE_TYPE # Incremental build cache. Shared by all jobs in the pipeline of the same type paths: - .gradle/caches/$GRADLE_VERSION - .gradle/$GRADLE_VERSION/executionHistory - workspace policy: $BUILD_CACHE_POLICY before_script: + - source .gitlab/gitlab-utils.sh - export GRADLE_USER_HOME=`pwd`/.gradle + - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx$GRADLE_MEM -Xms$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY -PgradlePluginProxy=$GRADLE_PLUGIN_PROXY" - *normalize_node_index # for weird reasons, gradle will always "chmod 700" the .gradle folder # with Gitlab caching, .gradle is always owned by root and thus gradle's chmod invocation fails # This dance is a hack to have .gradle owned by the Gitlab runner user + - gitlab_section_start "gradle-dance" "Fix .gradle directory permissions" - mkdir -p .gradle - cp -r .gradle .gradle-copy - rm -rf .gradle - mv .gradle-copy .gradle - ls -la + - gitlab_section_end "gradle-dance" build: extends: .gradle_build variables: BUILD_CACHE_POLICY: push - BUILD_CACHE_TYPE: lib + CACHE_TYPE: lib DEPENDENCY_CACHE_POLICY: pull script: - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks; fi @@ -109,16 +169,58 @@ build: reports: dotenv: build.env -build_and_populate_dep_cache: - extends: build +build_tests: + extends: .gradle_build variables: BUILD_CACHE_POLICY: push + DEPENDENCY_CACHE_POLICY: pull + GRADLE_MEM: 4G + GRADLE_WORKERS: 3 + KUBERNETES_MEMORY_REQUEST: 18Gi + KUBERNETES_MEMORY_LIMIT: 18Gi + parallel: + matrix: + - GRADLE_TARGET: ":baseTest" + CACHE_TYPE: "base" + - GRADLE_TARGET: ":profilingTest" + CACHE_TYPE: "profiling" + - GRADLE_TARGET: ":instrumentationTest" + CACHE_TYPE: "inst" + - GRADLE_TARGET: ":instrumentationLatestDepTest" + CACHE_TYPE: "latestdep" + - GRADLE_TARGET: ":smokeTest" + CACHE_TYPE: "smoke" + MAVEN_OPTS: "-Xms64M -Xmx512M -Dorg.slf4j.simpleLogger.defaultLogLevel=debug" # FIXME: Build :smokeTest build fails unless mvn debug logging is on + + script: + - ./gradlew clean $GRADLE_TARGET -PskipTests $GRADLE_ARGS + +populate_dep_cache: + extends: build_tests + variables: + BUILD_CACHE_POLICY: pull DEPENDENCY_CACHE_POLICY: push rules: - if: '$POPULATE_CACHE' when: on_success - when: manual allow_failure: true + parallel: + matrix: + - GRADLE_TARGET: ":dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar" + CACHE_TYPE: "lib" + - GRADLE_TARGET: ":baseTest" + CACHE_TYPE: "base" + - GRADLE_TARGET: ":profilingTest" + CACHE_TYPE: "profiling" +# FIXME: Gitlab doesn't support s3 based caches >5GB. Fixed in Gitlab 17.5 +# See: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26921#note_2132307223 +# - GRADLE_TARGET: ":instrumentationTest" +# CACHE_TYPE: "inst" +# - GRADLE_TARGET: ":instrumentationLatestDepTest" +# CACHE_TYPE: "latestdep" +# - GRADLE_TARGET: ":smokeTest" +# CACHE_TYPE: "smoke" spotless: extends: .gradle_build @@ -134,7 +236,7 @@ test_published_artifacts: stage: tests needs: [ build ] variables: - BUILD_CACHE_TYPE: lib + CACHE_TYPE: lib script: - mvn_local_repo=$(./mvnw help:evaluate -Dexpression=settings.localRepository -q -DforceStdout) - rm -rf "${mvn_local_repo}/com/datadoghq" @@ -143,10 +245,13 @@ test_published_artifacts: - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - ./gradlew publishToMavenLocal $GRADLE_ARGS - cd test-published-dependencies - - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx512M -Xms512M -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" + - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms1G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - ./gradlew check --info $GRADLE_ARGS after_script: + - source .gitlab/gitlab-utils.sh + - gitlab_section_start "collect-reports" "Collecting reports" - .circleci/collect_reports.sh + - gitlab_section_end "collect-reports" artifacts: when: always paths: @@ -157,16 +262,28 @@ test_published_artifacts: needs: [ build ] stage: tests variables: - BUILD_CACHE_TYPE: lib + CACHE_TYPE: lib script: - ./gradlew $GRADLE_TARGET -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS after_script: + - source .gitlab/gitlab-utils.sh + - gitlab_section_start "collect-reports" "Collecting reports" - .circleci/collect_reports.sh --destination ./check_reports --move + - gitlab_section_end "collect-reports" artifacts: when: always paths: - ./check_reports - '.gradle/daemon/*/*.out.log' + retry: + max: 2 + when: + - unknown_failure + - stuck_or_timeout_failure + - runner_system_failure + - unmet_prerequisites + - scheduler_failure + - data_integrity_failure check_base: extends: .check_job @@ -197,11 +314,11 @@ check_debugger: muzzle: extends: .gradle_build - needs: [ build ] + needs: [ build_tests ] stage: tests parallel: 8 variables: - BUILD_CACHE_TYPE: lib + CACHE_TYPE: inst script: - export SKIP_BUILDSCAN="true" - ./gradlew writeMuzzleTasksToFile $GRADLE_ARGS @@ -209,7 +326,10 @@ muzzle: - split --number=l/$NORMALIZED_NODE_TOTAL --suffix-length=1 --numeric-suffixes sortedMuzzleTasks muzzleSplit - ./gradlew `cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs` $GRADLE_ARGS after_script: + - source .gitlab/gitlab-utils.sh + - gitlab_section_start "collect-reports" "Collecting reports" - .circleci/collect_reports.sh + - gitlab_section_end "collect-reports" artifacts: when: always paths: @@ -218,10 +338,10 @@ muzzle: muzzle-dep-report: extends: .gradle_build - needs: [ build ] + needs: [ build_tests ] stage: tests variables: - BUILD_CACHE_TYPE: test + CACHE_TYPE: inst script: - export SKIP_BUILDSCAN="true" - ./gradlew generateMuzzleReport muzzleInstrumentationReport $GRADLE_ARGS @@ -251,12 +371,28 @@ muzzle-dep-report: .test_job: extends: .gradle_build image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm - needs: [ build ] + tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers + needs: [ build_tests ] stage: tests variables: - BUILD_CACHE_TYPE: lib - GRADLE_PARAMS: "" + KUBERNETES_MEMORY_REQUEST: 16Gi + KUBERNETES_MEMORY_LIMIT: 16Gi + KUBERNETES_CPU_REQUEST: 10 + GRADLE_WORKERS: 4 + GRADLE_MEM: 3G + GRADLE_PARAMS: "-PskipFlakyTests" CONTINUE_ON_FAILURE: "false" + TESTCONTAINERS_CHECKS_DISABLE: "true" + TESTCONTAINERS_RYUK_DISABLED: "true" + TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ddbuild.io/images/mirror/" + JETTY_AVAILABLE_PROCESSORS: 4 # Jetty incorrectly calculates processor count in containers + rules: + - if: $testJvm =~ $DEFAULT_TEST_JVMS + when: on_success + - if: $NON_DEFAULT_JVMS == "true" + when: on_success + - if: $CI_COMMIT_BRANCH == "master" + when: on_success script: - > if [ "$PROFILE_TESTS" == "true" ] && [ "$testJvm" != "ibm8" ] && [ "$testJvm" != "oracle8" ]; @@ -264,16 +400,18 @@ muzzle-dep-report: export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true"; fi - *prepare_test_env - - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms2G -Xmx2G $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=768M -Ddatadog.forkedMinHeapSize=128M" - - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE + - 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" + - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE after_script: - *restore_pretest_env - *set_datadog_api_keys + - source .gitlab/gitlab-utils.sh + - gitlab_section_start "collect-reports" "Collecting reports" - .circleci/collect_reports.sh - if [ "$PROFILE_TESTS" == "true" ]; then .circleci/collect_profiles.sh; fi - .circleci/collect_results.sh - .circleci/upload_ciapp.sh tests $testJvm -# TODO Get APM Test Agent Trace Check Results + - gitlab_section_end "collect-reports" artifacts: when: always paths: @@ -281,13 +419,45 @@ muzzle-dep-report: - ./profiles.tar - ./results - '.gradle/daemon/*/*.out.log' + reports: + junit: results/*.xml + retry: + max: 2 + when: + - unknown_failure + - stuck_or_timeout_failure + - runner_system_failure + - unmet_prerequisites + - scheduler_failure + - data_integrity_failure + +.test_job_with_test_agent: + extends: .test_job + variables: + CI_USE_TEST_AGENT: "true" + CI_AGENT_HOST: local-agent + services: + - name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.11.0 + alias: local-agent + variables: + LOG_LEVEL: "DEBUG" + TRACE_LANGUAGE: "java" + DD_SUPPRESS_TRACE_PARSE_ERRORS: "true" + DD_POOL_TRACE_CHECK_FAILURES: "true" + DD_DISABLE_ERROR_RESPONSES: "true" + ENABLED_CHECKS: "trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service" + script: + - !reference [.test_job, script] + - .gitlab/check_test_agent_results.sh agent_integration_tests: extends: .test_job + tags: [ "arch:amd64" ] variables: testJvm: "8" CI_AGENT_HOST: local-agent GRADLE_TARGET: "traceAgentTest" + CACHE_TYPE: "base" services: - name: datadog/agent:7.34.0 alias: local-agent @@ -296,6 +466,129 @@ agent_integration_tests: DD_BIND_HOST: "0.0.0.0" DD_API_KEY: "invalid_key_but_this_is_fine" +test_base: + extends: .test_job + variables: + GRADLE_TARGET: ":baseTest" + CACHE_TYPE: "base" + parallel: + matrix: *test_matrix_4 + script: + - if [ "$testJvm" == "8" ]; then export GRADLE_PARAMS="-PskipFlakyTests -PcheckCoverage"; fi + - !reference [.test_job, script] + +test_inst: + extends: .test_job_with_test_agent + variables: + GRADLE_TARGET: ":instrumentationTest" + CACHE_TYPE: "inst" + parallel: + matrix: *test_matrix_6 + +test_inst_latest: + extends: .test_job_with_test_agent + variables: + GRADLE_TARGET: ":instrumentationLatestDepTest" + CACHE_TYPE: "latestDep" + parallel: + matrix: + - testJvm: ["8", "17", "21" ] + # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time + # This emulates "parallel" by including it in the matrix + CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"] + +test_flaky: + extends: .test_job_with_test_agent + variables: + GRADLE_PARAMS: "-PrunFlakyTests" + CACHE_TYPE: "base" + testJvm: "8" + CONTINUE_ON_FAILURE: "true" + rules: + - *master_only + - if: $RUN_FLAKY_TESTS == "true" + when: on_success + parallel: + matrix: + - GRADLE_TARGET: [":baseTest", ":smokeTest", ":debuggerTest"] + # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time + # This emulates "parallel" by including it in the matrix + CI_SPLIT: [ "1/4", "2/4", "3/4", "4/4" ] + +test_flaky_inst: + extends: .test_job + variables: + GRADLE_TARGET: ":instrumentationTest" + GRADLE_PARAMS: "-PrunFlakyTests" + CACHE_TYPE: "inst" + testJvm: "8" + CONTINUE_ON_FAILURE: "true" + rules: + - *master_only + - if: $RUN_FLAKY_TESTS == "true" + when: on_success + parallel: 6 + +test_profiling: + extends: .test_job + variables: + GRADLE_TARGET: ":profilingTest" + CACHE_TYPE: "profiling" + parallel: + matrix: *test_matrix + +# specific jvms list for debugger project because J9-based JVMs have issues with local vars +# so need to test at least against one J9-based JVM +test_debugger: + extends: .test_job + variables: + GRADLE_TARGET: ":debuggerTest" + CACHE_TYPE: "base" + DEFAULT_TEST_JVMS: /^(8|11|17|21|semeru8)$/ + parallel: + matrix: *test_matrix + +test_smoke: + extends: .test_job + variables: + GRADLE_TARGET: "stageMainDist :smokeTest" + GRADLE_PARAMS: "-PskipFlakyTests" + CACHE_TYPE: "smoke" + parallel: + matrix: *test_matrix_2 + +test_ssi_smoke: + extends: .test_job + rules: *master_only + variables: + GRADLE_TARGET: "stageMainDist :smokeTest" + CACHE_TYPE: "smoke" + DD_INJECT_FORCE: "true" + DD_INJECTION_ENABLED: "tracer" + parallel: + matrix: *test_matrix_2 + +test_smoke_graalvm: + extends: .test_job + tags: [ "arch:amd64" ] + variables: + GRADLE_TARGET: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test" + CACHE_TYPE: "smoke" + CI_NO_SPLIT: "true" + NON_DEFAULT_JVMS: "true" + parallel: + matrix: + - testJvm: ["graalvm17", "graalvm21"] + +test_smoke_semeru8_debugger: + extends: .test_job + tags: [ "arch:amd64" ] + variables: + GRADLE_TARGET: "stageMainDist dd-smoke-tests:debugger-integration-tests:test" + CACHE_TYPE: "smoke" + NON_DEFAULT_JVMS: "true" + testJvm: "semeru8" + required: extends: .fan_in needs: @@ -394,7 +687,7 @@ deploy_to_sonatype: stage: publish needs: [ build ] variables: - BUILD_CACHE_TYPE: lib + CACHE_TYPE: lib rules: - if: '$POPULATE_CACHE' when: never diff --git a/.gitlab/check_test_agent_results.sh b/.gitlab/check_test_agent_results.sh new file mode 100755 index 00000000000..cfbc8f098be --- /dev/null +++ b/.gitlab/check_test_agent_results.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set +e # Disable exiting from testagent response failure +SUMMARY_RESPONSE=$(curl -s -w "\n%{http_code}" -o summary_response.txt "http://${CI_AGENT_HOST}:8126/test/trace_check/summary") +set -e +SUMMARY_RESPONSE_CODE=$(echo "$SUMMARY_RESPONSE" | awk 'END {print $NF}') + +if [[ SUMMARY_RESPONSE_CODE -eq 200 ]]; then + echo "APM Test Agent is running. (HTTP 200)" +else + echo "APM Test Agent is not running and was not used for testing. No checks failed." + exit 0 +fi + +RESPONSE=$(curl -s -w "\n%{http_code}" -o response.txt "http://${CI_AGENT_HOST}:8126/test/trace_check/failures") +RESPONSE_CODE=$(echo "$RESPONSE" | awk 'END {print $NF}') + +if [[ $RESPONSE_CODE -eq 200 ]]; then + echo "All APM Test Agent Check Traces returned successful! (HTTP 200)" + echo "APM Test Agent Check Traces Summary Results:" + cat summary_response.txt | jq '.' +elif [[ $RESPONSE_CODE -eq 404 ]]; then + echo "Real APM Agent running in place of TestAgent, no checks to validate!" +else + echo "APM Test Agent Check Traces failed with response code: $RESPONSE_CODE" + echo "Failures:" + cat response.txt + echo "APM Test Agent Check Traces Summary Results:" + cat summary_response.txt | jq '.' + exit 1 +fi diff --git a/.gitlab/gitlab-utils.sh b/.gitlab/gitlab-utils.sh new file mode 100755 index 00000000000..6a668fe2250 --- /dev/null +++ b/.gitlab/gitlab-utils.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# From https://docs.gitlab.com/ci/jobs/job_logs/#use-a-script-to-improve-display-of-collapsible-sections +# function for starting the section +function gitlab_section_start () { + local section_title="${1}" + local section_description="${2:-$section_title}" + + echo -e "section_start:`date +%s`:${section_title}[collapsed=true]\r\e[0K${section_description}" +} + +# Function for ending the section +function gitlab_section_end () { + local section_title="${1}" + + echo -e "section_end:`date +%s`:${section_title}\r\e[0K" +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java index 402ef4ecccf..92103b75fd4 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java @@ -161,7 +161,11 @@ private T executeCommand( throw new TimeoutException( "Timeout while waiting for '" + String.join(" ", command) - + "'; " + + "'; in " + + executionFolder + + "\n StdOut: \n" + + IOUtils.readFully(inputStreamConsumer.read(), Charset.defaultCharset()) + + "\n StdErr: \n " + IOUtils.readFully(errorStreamConsumer.read(), Charset.defaultCharset())); } } catch (InterruptedException e) { diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config index 67fc9ed5f57..f145b18c5c0 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config +++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config @@ -6,7 +6,7 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = git@github.com:Netflix/zuul.git + url = https://github.com/Netflix/zuul.git fetch = +refs/heads/master:refs/remotes/origin/master [branch "master"] remote = origin diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy b/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy index 60ca0ad91f9..e42b2a4da5b 100644 --- a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy @@ -29,7 +29,7 @@ import spock.lang.Shared import java.time.Duration class DynamoDbClientTest extends AgentTestRunner { - static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack")) + static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(4566) .withEnv("SERVICES", "dynamodb") .withReuse(true) diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy index 60b2d63ecb6..4a4c445964e 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy @@ -21,7 +21,7 @@ import java.time.Duration import java.util.concurrent.CompletableFuture class EventBridgeClientTest extends AgentTestRunner { - static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack")) + static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(4566) .withEnv("SERVICES", "sns,sqs,events") .withReuse(true) diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy b/dd-java-agent/instrumentation/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy index f5e2c2f9352..b852b75c94d 100644 --- a/dd-java-agent/instrumentation/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy @@ -18,7 +18,7 @@ import spock.lang.Shared import java.time.Duration class S3ClientTest extends AgentTestRunner { - static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack")) + static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(4566) .withEnv("SERVICES", "s3") .withReuse(true) @@ -92,8 +92,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "PUT" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$key") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$key") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } @@ -151,8 +151,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "PUT" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$sourceKey") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$sourceKey") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } @@ -185,8 +185,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "PUT" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$destKey") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$destKey") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } @@ -276,8 +276,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "POST" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$key") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$key") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } @@ -303,8 +303,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "PUT" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$key") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$key") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } @@ -330,8 +330,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "PUT" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$key") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$key") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } @@ -365,8 +365,8 @@ class S3ClientTest extends AgentTestRunner { tag "bucketname", bucketName tag "http.method", "POST" tag "http.status_code", 200 - tag "http.url", { it.startsWith("http://localhost") && it.contains("/$key") } - tag "peer.hostname", "localhost" + tag "http.url", { it.startsWith("http://" + LOCALSTACK.getHost()) && it.contains("/$key") } + tag "peer.hostname", LOCALSTACK.getHost() tag "peer.port", { it instanceof Integer } tag "span.kind", "client" tag "aws.requestId", { it != null } diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy index 146d0085709..b321fb276ec 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy @@ -26,7 +26,7 @@ abstract class AbstractPayloadTaggingTest extends AgentTestRunner { static final Object NA = {} static final int DEFAULT_PORT = 4566 - static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack")) + static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(DEFAULT_PORT) .withEnv("SERVICES", "apigateway,events,s3,sns,sqs,kinesis") .withReuse(true) diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy index 3298ff48ee9..b90c4b4b131 100644 --- a/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy @@ -25,7 +25,7 @@ abstract class SfnClientTest extends VersionedNamingTestBase { @Shared Object endPoint def setupSpec() { - localStack = new GenericContainer(DockerImageName.parse("localstack/localstack")) + localStack = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(4566) .withEnv("SERVICES", "stepfunctions") .withReuse(true) diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy index d008f7626f8..1653ecfa586 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy @@ -27,7 +27,7 @@ import java.time.Duration abstract class SnsClientTest extends VersionedNamingTestBase { - static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack")) + static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(4566) // Default LocalStack port .withEnv("SERVICES", "sns,sqs") // Enable SNS and SQS service .withReuse(true) diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy index c0066e3595e..3e40aa138dc 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy @@ -24,7 +24,7 @@ import java.time.Duration import static datadog.trace.agent.test.utils.TraceUtils.basicSpan abstract class SnsClientTest extends VersionedNamingTestBase { - static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack")) + static final LOCALSTACK = new GenericContainer(DockerImageName.parse("localstack/localstack:4.2.0")) .withExposedPorts(4566) // Default LocalStack port .withEnv("SERVICES", "sns,sqs") // Enable SNS and SQS service .withReuse(true) diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy index 1c76f2a6cba..e37cda84896 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy @@ -358,7 +358,7 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase { it.tag(DDTags.ERROR_TYPE, ex.class.name) it.tag(DDTags.ERROR_STACK, String) } - "$InstrumentationTags.COUCHBASE_SEED_NODES" { it =="localhost" || it == "127.0.0.1" } + "$InstrumentationTags.COUCHBASE_SEED_NODES" { it =="localhost" || it == "127.0.0.1" || it == couchbase.getHost() } if (isLatestDepTest && extraTags != null) { tag('db.system','couchbase') diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy index 2a8cd522888..10150d91ef3 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/test/groovy/CouchbaseClient32Test.groovy @@ -422,7 +422,7 @@ abstract class CouchbaseClient32Test extends VersionedNamingTestBase { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" 'couchbase' 'db.system' 'couchbase' - "$InstrumentationTags.COUCHBASE_SEED_NODES" { it =="localhost" || it == "127.0.0.1" } + "$InstrumentationTags.COUCHBASE_SEED_NODES" { it =="localhost" || it == "127.0.0.1" || it == couchbase.getHost() } if (isErrored) { it.tag(DDTags.ERROR_MSG, { exMessage.length() > 0 && ((String) it).startsWith(exMessage) }) it.tag(DDTags.ERROR_TYPE, ex.class.name) diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy index f97bed3a7b2..d4e0ac21065 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy @@ -171,7 +171,7 @@ abstract class CassandraClientTest extends VersionedNamingTestBase { tags { "$Tags.COMPONENT" "java-cassandra" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" container.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" port "$Tags.DB_TYPE" "cassandra" diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy index f97bed3a7b2..d4e0ac21065 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy +++ b/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy @@ -171,7 +171,7 @@ abstract class CassandraClientTest extends VersionedNamingTestBase { tags { "$Tags.COMPONENT" "java-cassandra" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" container.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" port "$Tags.DB_TYPE" "cassandra" diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy index 35eabe01d9e..ba3aadb8773 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy +++ b/dd-java-agent/instrumentation/datastax-cassandra-4/src/test/groovy/CassandraClientTest.groovy @@ -47,7 +47,7 @@ abstract class CassandraClientTest extends VersionedNamingTestBase { container = new CassandraContainer("cassandra:4").withStartupTimeout(Duration.ofSeconds(120)) container.start() port = container.getMappedPort(9042) - address = new InetSocketAddress("127.0.0.1", port) + address = new InetSocketAddress(container.getHost(), port) runUnderTrace("setup") { Session session = sessionBuilder().build() @@ -247,12 +247,12 @@ abstract class CassandraClientTest extends VersionedNamingTestBase { tags { "$Tags.COMPONENT" "java-cassandra" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" container.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" port "$Tags.DB_TYPE" "cassandra" "$Tags.DB_INSTANCE" keyspace - "$InstrumentationTags.CASSANDRA_CONTACT_POINTS" "127.0.0.1:${port}" + "$InstrumentationTags.CASSANDRA_CONTACT_POINTS" "${container.contactPoint.hostString}:${container.contactPoint.port}" if (throwable != null) { errorTags(throwable) diff --git a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy index fe28d715bc1..cf24e0115bc 100644 --- a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy +++ b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy @@ -279,7 +279,7 @@ abstract class PubSubTest extends VersionedNamingTestBase { if ({ isDataStreamsEnabled() }) { "$DDTags.PATHWAY_HASH" { String } } - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" emulator.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" { Integer } peerServiceFrom(Tags.RPC_SERVICE) diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy index 581384efd86..92a7ceb50d7 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy @@ -183,7 +183,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { } def setupSpec() { - postgres = new PostgreSQLContainer("postgres:11.1") + postgres = new PostgreSQLContainer("postgres:11.2") .withDatabaseName(dbName.get(POSTGRESQL)).withUsername(jdbcUserNames.get(POSTGRESQL)).withPassword(jdbcPasswords.get(POSTGRESQL)) postgres.start() PortUtils.waitForPortToOpen(postgres.getHost(), postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT), 5, TimeUnit.SECONDS) diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/src/test/groovy/MongoCore31ClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/src/test/groovy/MongoCore31ClientTest.groovy index df22d41839f..11b8aa8c12b 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/src/test/groovy/MongoCore31ClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/src/test/groovy/MongoCore31ClientTest.groovy @@ -25,7 +25,7 @@ abstract class MongoCore31ClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = new MongoClient(new ServerAddress("localhost", port), + client = new MongoClient(new ServerAddress(mongoDbContainer.getHost(), port), MongoClientOptions.builder() .description("some-description") .addCommandListener(new CommandListener() { @@ -70,7 +70,7 @@ abstract class MongoCore31ClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = new MongoClient("localhost", port).getDatabase(databaseName) + MongoDatabase db = new MongoClient(mongoDbContainer.getHost(), port).getDatabase(databaseName) when: db.createCollection(collectionName) @@ -218,7 +218,7 @@ abstract class MongoCore31ClientTest extends MongoBaseTest { setup: String collectionName = randomCollectionName() def options = MongoClientOptions.builder().serverSelectionTimeout(10).build() - def client = new MongoClient(new ServerAddress("localhost", UNUSABLE_PORT), [], options) + def client = new MongoClient(new ServerAddress(mongoDbContainer.getHost(), UNUSABLE_PORT), [], options) when: MongoDatabase db = client.getDatabase(databaseName) diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy index 4a798cdc1c5..e7eec08b185 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy @@ -25,7 +25,7 @@ abstract class MongoJava31ClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = new MongoClient(new ServerAddress("localhost", port), + client = new MongoClient(new ServerAddress(mongoDbContainer.getHost(), port), MongoClientOptions.builder() .description("some-description") .addCommandListener(new CommandListener() { @@ -72,7 +72,7 @@ abstract class MongoJava31ClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = new MongoClient("localhost", port).getDatabase(databaseName) + MongoDatabase db = new MongoClient(mongoDbContainer.getHost(), port).getDatabase(databaseName) when: db.createCollection(collectionName) @@ -220,7 +220,7 @@ abstract class MongoJava31ClientTest extends MongoBaseTest { setup: String collectionName = randomCollectionName() def options = MongoClientOptions.builder().serverSelectionTimeout(10).build() - def client = new MongoClient(new ServerAddress("localhost", UNUSABLE_PORT), [], options) + def client = new MongoClient(new ServerAddress(mongoDbContainer.getHost(), UNUSABLE_PORT), [], options) when: MongoDatabase db = client.getDatabase(databaseName) diff --git a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/src/test/groovy/MongoSyncClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/src/test/groovy/MongoSyncClientTest.groovy index 74bb354af88..c5ce4bd7806 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/src/test/groovy/MongoSyncClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/src/test/groovy/MongoSyncClientTest.groovy @@ -20,7 +20,7 @@ abstract class MongoSyncClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = MongoClients.create("mongodb://localhost:$port/?appname=some-description") + client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port/?appname=some-description") } def cleanup() throws Exception { @@ -52,7 +52,7 @@ abstract class MongoSyncClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = MongoClients.create("mongodb://localhost:$port").getDatabase(databaseName) + MongoDatabase db = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port").getDatabase(databaseName) when: db.createCollection(collectionName) @@ -205,7 +205,7 @@ abstract class MongoSyncClientTest extends MongoBaseTest { def "test client failure"() { setup: String collectionName = randomCollectionName() - def client = MongoClients.create("mongodb://localhost:$UNUSABLE_PORT/?serverselectiontimeoutms=10") + def client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$UNUSABLE_PORT/?serverselectiontimeoutms=10") when: MongoDatabase db = client.getDatabase(databaseName) diff --git a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/src/test/groovy/MongoAsyncClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/src/test/groovy/MongoAsyncClientTest.groovy index 032365e83b7..c870e9608f9 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/src/test/groovy/MongoAsyncClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/src/test/groovy/MongoAsyncClientTest.groovy @@ -27,7 +27,7 @@ abstract class MongoAsyncClientTest extends MongoBaseTest { .clusterSettings( ClusterSettings.builder() .description("some-description") - .applyConnectionString(new ConnectionString("mongodb://localhost:$port")) + .applyConnectionString(new ConnectionString("mongodb://${mongoDbContainer.getHost()}:$port")) .build()) .build()) } @@ -56,7 +56,7 @@ abstract class MongoAsyncClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = MongoClients.create("mongodb://localhost:$port").getDatabase(databaseName) + MongoDatabase db = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port").getDatabase(databaseName) when: db.createCollection(collectionName, toCallback {}) diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy index 424748dabb0..d9f1b0f7313 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy @@ -25,7 +25,7 @@ abstract class MongoJava34ClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = new MongoClient(new ServerAddress("localhost", port), + client = new MongoClient(new ServerAddress(mongoDbContainer.getHost(), port), MongoClientOptions.builder() .description("some-description") .addCommandListener(new CommandListener() { @@ -70,7 +70,7 @@ abstract class MongoJava34ClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = new MongoClient("localhost", port).getDatabase(databaseName) + MongoDatabase db = new MongoClient(mongoDbContainer.getHost(), port).getDatabase(databaseName) when: db.createCollection(collectionName) @@ -218,7 +218,7 @@ abstract class MongoJava34ClientTest extends MongoBaseTest { setup: String collectionName = randomCollectionName() def options = MongoClientOptions.builder().serverSelectionTimeout(10).build() - def client = new MongoClient(new ServerAddress("localhost", UNUSABLE_PORT), [], options) + def client = new MongoClient(new ServerAddress(mongoDbContainer.getHost(), UNUSABLE_PORT), [], options) when: MongoDatabase db = client.getDatabase(databaseName) diff --git a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/src/test/groovy/MongoCore37ClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/src/test/groovy/MongoCore37ClientTest.groovy index 6d424fca2a4..7066defce6e 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/src/test/groovy/MongoCore37ClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/src/test/groovy/MongoCore37ClientTest.groovy @@ -20,7 +20,7 @@ abstract class MongoCore37ClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = MongoClients.create("mongodb://localhost:$port/?appname=some-instance") + client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port/?appname=some-instance") } def cleanup() throws Exception { @@ -52,7 +52,7 @@ abstract class MongoCore37ClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = MongoClients.create("mongodb://localhost:$port").getDatabase(databaseName) + MongoDatabase db = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port").getDatabase(databaseName) when: db.createCollection(collectionName) @@ -205,7 +205,7 @@ abstract class MongoCore37ClientTest extends MongoBaseTest { def "test client failure"() { setup: String collectionName = randomCollectionName() - def client = MongoClients.create("mongodb://localhost:$UNUSABLE_PORT/?serverselectiontimeoutms=10") + def client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$UNUSABLE_PORT/?serverselectiontimeoutms=10") when: MongoDatabase db = client.getDatabase(databaseName) diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/Mongo4ClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/Mongo4ClientTest.groovy index fa4de78c9a9..1757b1b8235 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/Mongo4ClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/Mongo4ClientTest.groovy @@ -22,7 +22,7 @@ abstract class Mongo4ClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = MongoClients.create("mongodb://localhost:$port/?appname=some-description") + client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port/?appname=some-description") } def cleanup() throws Exception { @@ -64,7 +64,7 @@ abstract class Mongo4ClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = MongoClients.create("mongodb://localhost:$port").getDatabase(databaseName) + MongoDatabase db = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port").getDatabase(databaseName) when: db.createCollection(collectionName) @@ -217,7 +217,7 @@ abstract class Mongo4ClientTest extends MongoBaseTest { def "test client failure"() { setup: String collectionName = randomCollectionName() - def client = MongoClients.create("mongodb://localhost:$UNUSABLE_PORT/?serverselectiontimeoutms=10") + def client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$UNUSABLE_PORT/?serverselectiontimeoutms=10") when: MongoDatabase db = client.getDatabase(databaseName) diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy index d47f350c664..6211c2de1b3 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy @@ -27,7 +27,7 @@ abstract class MongoReactiveClientTest extends MongoBaseTest { MongoClient client def setup() throws Exception { - client = MongoClients.create("mongodb://localhost:$port/?appname=some-description") + client = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port/?appname=some-description") } def cleanup() throws Exception { @@ -117,7 +117,7 @@ abstract class MongoReactiveClientTest extends MongoBaseTest { def "test create collection no description"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = MongoClients.create("mongodb://localhost:$port").getDatabase(databaseName) + MongoDatabase db = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port").getDatabase(databaseName) when: db.createCollection(collectionName).subscribe(toSubscriber {}) @@ -133,7 +133,7 @@ abstract class MongoReactiveClientTest extends MongoBaseTest { def "test create collection no description with parent"() { setup: String collectionName = randomCollectionName() - MongoDatabase db = MongoClients.create("mongodb://localhost:$port").getDatabase(databaseName) + MongoDatabase db = MongoClients.create("mongodb://${mongoDbContainer.getHost()}:$port").getDatabase(databaseName) when: runUnderTrace("parent") { diff --git a/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy b/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy index 2421b63153d..9d6ae857165 100644 --- a/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy +++ b/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy @@ -81,7 +81,7 @@ abstract class MongoBaseTest extends VersionedNamingTestBase { tags { "$Tags.COMPONENT" "java-mongo" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" mongoDbContainer.getHost() "$Tags.PEER_PORT" port "$Tags.DB_TYPE" dbType "$Tags.DB_INSTANCE" instance diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy index abf5d5bb63f..f112598c75e 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy @@ -1,3 +1,5 @@ +import org.testcontainers.utility.DockerImageName + import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE import com.redis.testcontainers.RedisContainer @@ -18,7 +20,7 @@ import spock.lang.Shared abstract class RedissonClientTest extends VersionedNamingTestBase { @Shared - RedisServer redisServer = new RedisContainer(RedisContainer.DEFAULT_IMAGE_NAME).waitingFor(Wait.forListeningPort()) + RedisServer redisServer = new RedisContainer(DockerImageName.parse("redis:6.2.6")).waitingFor(Wait.forListeningPort()) @Shared Config config = new Config() @@ -128,7 +130,7 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "redis-command" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" redisServer.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" redisServer.firstMappedPort peerServiceFrom(Tags.PEER_HOSTNAME) @@ -324,7 +326,7 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "redis-command" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" redisServer.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" redisServer.firstMappedPort peerServiceFrom(Tags.PEER_HOSTNAME) diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/test/groovy/RedissonClientTest.groovy b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/test/groovy/RedissonClientTest.groovy index 2345f6de2cd..80fb3469f9d 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/test/groovy/RedissonClientTest.groovy +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/test/groovy/RedissonClientTest.groovy @@ -1,3 +1,5 @@ +import org.testcontainers.utility.DockerImageName + import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan @@ -17,7 +19,7 @@ import spock.lang.Shared abstract class RedissonClientTest extends VersionedNamingTestBase { @Shared - RedisServer redisServer = new RedisContainer(RedisContainer.DEFAULT_IMAGE_NAME).waitingFor(Wait.forListeningPort()) + RedisServer redisServer = new RedisContainer(DockerImageName.parse("redis:6.2.6")).waitingFor(Wait.forListeningPort()) @Shared Config config = new Config() @@ -127,7 +129,7 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "redis-command" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" redisServer.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" redisServer.firstMappedPort peerServiceFrom(Tags.PEER_HOSTNAME) @@ -323,7 +325,7 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "redis-command" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" redisServer.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" redisServer.firstMappedPort peerServiceFrom(Tags.PEER_HOSTNAME) diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy index e215da16ffb..db253dce65a 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy @@ -1,3 +1,5 @@ +import org.testcontainers.utility.DockerImageName + import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan @@ -17,7 +19,7 @@ import spock.lang.Shared abstract class RedissonClientTest extends VersionedNamingTestBase { @Shared - RedisServer redisServer = new RedisContainer(RedisContainer.DEFAULT_IMAGE_NAME).waitingFor(Wait.forListeningPort()) + RedisServer redisServer = new RedisContainer(DockerImageName.parse("redis:6.2.6")).waitingFor(Wait.forListeningPort()) @Shared Config config = new Config() @@ -120,7 +122,7 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "redis-command" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" redisServer.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" redisServer.firstMappedPort peerServiceFrom(Tags.PEER_HOSTNAME) @@ -316,7 +318,7 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "redis-command" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - "$Tags.PEER_HOSTNAME" "localhost" + "$Tags.PEER_HOSTNAME" redisServer.getHost() "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_PORT" redisServer.firstMappedPort peerServiceFrom(Tags.PEER_HOSTNAME) diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/latestDepTest/groovy/test/boot/SpringBootServer.groovy b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/latestDepTest/groovy/test/boot/SpringBootServer.groovy index 32793911bbf..ed3e95d7abf 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/latestDepTest/groovy/test/boot/SpringBootServer.groovy +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/latestDepTest/groovy/test/boot/SpringBootServer.groovy @@ -22,7 +22,7 @@ class SpringBootServer implements WebsocketServer { @Override void start() { - app.setDefaultProperties(["server.port": 0, "server.servlet.context-path": "/$servletContext"]) + app.setDefaultProperties(["server.port": 0, "server.servlet.context-path": "/$servletContext", "server.forward-headers-strategy": "NONE"]) context = app.run() as ServletWebServerApplicationContext port = context.getWebServer().getPort() try { diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootServer.groovy b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootServer.groovy index bc875bb70d5..2befeef9e7f 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootServer.groovy +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootServer.groovy @@ -23,7 +23,7 @@ class SpringBootServer implements WebsocketServer { @Override void start() { - app.setDefaultProperties(["server.port": 0, "server.context-path": "/$servletContext"]) + app.setDefaultProperties(["server.port": 0, "server.context-path": "/$servletContext", "server.forward-headers-strategy": "NONE"]) context = app.run() as EmbeddedWebApplicationContext port = context.embeddedServletContainer.port try { diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy index 7700fac82ef..4c97b185c40 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy @@ -72,7 +72,8 @@ class SpringBootBasedTest extends HttpServerTest void start() { app.setDefaultProperties(["server.port": 0, "server.context-path": "/$servletContext", "spring.mvc.throw-exception-if-no-handler-found": false, - "spring.web.resources.add-mappings" : false]) + "spring.web.resources.add-mappings" : false, + "server.forward-headers-strategy": "NONE"]) context = app.run() port = (context as ServletWebServerApplicationContext).webServer.port try { diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy b/dd-java-agent/instrumentation/spymemcached-2.10/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy index 7357a9749fb..e55405e7e47 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy @@ -56,7 +56,7 @@ abstract class SpymemcachedTest extends VersionedNamingTestBase { } def setupSpec() { - memcachedContainer = new GenericContainer('memcached:1.6.14-alpine') + memcachedContainer = new GenericContainer('library/memcached:1.6.14-alpine') .withExposedPorts(defaultMemcachedPort) .withStartupTimeout(Duration.ofSeconds(120)) memcachedContainer.start() diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/test/groovy/VertxRedisTestBase.groovy b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/test/groovy/VertxRedisTestBase.groovy index d4c8151e9ee..97a1c25959f 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/test/groovy/VertxRedisTestBase.groovy +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/src/test/groovy/VertxRedisTestBase.groovy @@ -1,3 +1,5 @@ +import org.testcontainers.utility.DockerImageName + import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan @@ -33,7 +35,7 @@ abstract class VertxRedisTestBase extends VersionedNamingTestBase { @AutoCleanup(value = "stop") @Shared - def redisServer = new RedisContainer(RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)) + def redisServer = new RedisContainer(DockerImageName.parse("redis:6.2.6")) .waitingFor(Wait.forListeningPort()) @Shared @@ -136,7 +138,7 @@ abstract class VertxRedisTestBase extends VersionedNamingTestBase { "$Tags.DB_TYPE" "redis" // FIXME: in some cases the connection is not extracted. Better to skip this test than mark the whole test as flaky "$Tags.PEER_PORT" { it == null || it == port } - "$Tags.PEER_HOSTNAME" { it == null || it == "127.0.0.1" || it == "localhost" } + "$Tags.PEER_HOSTNAME" { it == null || it == "127.0.0.1" || it == "localhost" || it == redisServer.getHost() } if (tag(Tags.PEER_HOSTNAME) != null) { peerServiceFrom(Tags.PEER_HOSTNAME) defaultTags() diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy index 547431d7ace..8c70e25d876 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy @@ -368,8 +368,13 @@ abstract class AgentTestRunner extends DDSpecification implements AgentBuilder.L TEST_WRITER = new ListWriter() if (isTestAgentEnabled()) { + String agentHost = System.getenv("CI_AGENT_HOST") + if (agentHost == null) { + agentHost = DEFAULT_AGENT_HOST + } + // emit traces to the APM Test-Agent for Cross-Tracer Testing Trace Checks - HttpUrl agentUrl = HttpUrl.get("http://" + DEFAULT_AGENT_HOST + ":" + DEFAULT_TRACE_AGENT_PORT) + HttpUrl agentUrl = HttpUrl.get("http://" + agentHost + ":" + DEFAULT_TRACE_AGENT_PORT) OkHttpClient client = buildHttpClient(agentUrl, null, null, TimeUnit.SECONDS.toMillis(DEFAULT_AGENT_TIMEOUT)) DDAgentFeaturesDiscovery featureDiscovery = new DDAgentFeaturesDiscovery(client, Monitoring.DISABLED, agentUrl, Config.get().isTraceAgentV05Enabled(), Config.get().isTracerMetricsEnabled()) TEST_AGENT_API = new DDAgentApi(client, agentUrl, featureDiscovery, Monitoring.DISABLED, Config.get().isTracerMetricsEnabled()) diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy index d13e9cc2544..97c1ef36b83 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy @@ -574,7 +574,10 @@ abstract class HttpServerTest extends WithHttpServer { def responses def request = request(SUCCESS, method, body).build() if (testParallelRequest()) { - def executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()) + // Limit pool size. Too many threads overwhelm the server and starve the host + def availableProcessorsOverride = System.getenv().get("RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE") + def poolSize = availableProcessorsOverride == null ? Runtime.getRuntime().availableProcessors() : Integer.valueOf(availableProcessorsOverride) + def executor = Executors.newFixedThreadPool(poolSize) def completionService = new ExecutorCompletionService(executor) (1..count).each { completionService.submit { @@ -1295,7 +1298,7 @@ abstract class HttpServerTest extends WithHttpServer { def traces = extraSpan ? 2 : 1 def extraTags = [(IG_RESPONSE_STATUS): String.valueOf(endpoint.status)] as Map if (hasPeerInformation()) { - extraTags.put(IG_PEER_ADDRESS, { it == "127.0.0.1" || it == "0.0.0.0" }) + extraTags.put(IG_PEER_ADDRESS, { it == "127.0.0.1" || it == "0.0.0.0" || it == "0:0:0:0:0:0:0:1" }) extraTags.put(IG_PEER_PORT, { Integer.parseInt(it as String) instanceof Integer }) } extraTags.put(IG_RESPONSE_HEADER_TAG, IG_RESPONSE_HEADER_VALUE) @@ -2218,8 +2221,13 @@ abstract class HttpServerTest extends WithHttpServer { if (hasPeerPort) { "$Tags.PEER_PORT" Integer } - "$Tags.PEER_HOST_IPV4" { it == "127.0.0.1" || (endpoint == FORWARDED && it == endpoint.body) } - "$Tags.HTTP_CLIENT_IP" { it == "127.0.0.1" || (endpoint == FORWARDED && it == endpoint.body) } + if(span.getTag(Tags.PEER_HOST_IPV6) != null) { + "$Tags.PEER_HOST_IPV6" { it == "0:0:0:0:0:0:0:1" || (endpoint == FORWARDED && it == endpoint.body) } + "$Tags.HTTP_CLIENT_IP" { it == "0:0:0:0:0:0:0:1" || (endpoint == FORWARDED && it == endpoint.body) } + } else { + "$Tags.PEER_HOST_IPV4" { it == "127.0.0.1" || (endpoint == FORWARDED && it == endpoint.body) } + "$Tags.HTTP_CLIENT_IP" { it == "127.0.0.1" || (endpoint == FORWARDED && it == endpoint.body) } + } } else { "$Tags.HTTP_CLIENT_IP" clientIp } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy index dcb0d6a2292..ea140c777f1 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy @@ -19,6 +19,7 @@ import org.eclipse.jetty.server.SslConnectionFactory import org.eclipse.jetty.server.handler.AbstractHandler import org.eclipse.jetty.server.handler.HandlerList import org.eclipse.jetty.util.ssl.SslContextFactory +import org.eclipse.jetty.util.thread.QueuedThreadPool import javax.net.ssl.HostnameVerifier import javax.net.ssl.SSLContext @@ -82,7 +83,10 @@ class TestHttpServer implements AutoCloseable { } private TestHttpServer() { - internalServer = new Server() + // In some versions, Jetty requires max threads > than some arbitrary calculated value + // The calculated value can be high in CI + // There is no easy way to override the configuration in a version-neutral way + internalServer = new Server(new QueuedThreadPool(400)) TrustManager[] trustManagers = new TrustManager[1] trustManagers[0] = trustManager @@ -124,7 +128,6 @@ class TestHttpServer implements AutoCloseable { internalServer.addConnector(https) customizer.call(internalServer) - internalServer.start() // set after starting, otherwise two callbacks get added. internalServer.stopAtShutdown = true diff --git a/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java b/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java index 65b3305345e..5e8be98ea6d 100644 --- a/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java +++ b/dd-smoke-tests/crashtracking/src/main/java/datadog/smoketest/crashtracking/CrashtrackingTestApplication.java @@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception { while (size < 1024) { buffer.add(new byte[size * 1024 * 1024]); System.out.println("Allocated " + size + "MB"); - if (size < 256) { + if (size < 512) { size *= 2; } } diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java index 54d9290941c..e3d8b38659a 100644 --- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java +++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java @@ -217,6 +217,8 @@ void testOomeTracking() throws Exception { Arrays.asList( javaPath(), "-javaagent:" + agentShadowJar(), + "-Xmx96m", + "-Xms96m", "-XX:OnOutOfMemoryError=" + onErrorValue, "-XX:ErrorFile=" + errorFile, "-XX:+CrashOnOutOfMemoryError", // Use OOME to trigger crash @@ -248,6 +250,8 @@ void testCombineTracking() throws Exception { Arrays.asList( javaPath(), "-javaagent:" + agentShadowJar(), + "-Xmx96m", + "-Xms96m", "-XX:OnOutOfMemoryError=" + onOomeValue, "-XX:OnError=" + onErrorValue, "-XX:ErrorFile=" + errorFile, diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy index 094c46f5206..0fe155ab45e 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy @@ -9,7 +9,7 @@ import datadog.trace.civisibility.utils.ShellCommandExecutor */ class GradleLauncherSmokeTest extends AbstractGradleTest { - private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 60_000 + private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 90_000 private static final String AGENT_JAR = System.getProperty("datadog.smoketest.agent.shadowJar.path") diff --git a/dd-smoke-tests/log-injection/src/test/resources/SpockConfig.groovy b/dd-smoke-tests/log-injection/src/test/resources/SpockConfig.groovy index cfa0ebc2632..9e4c7f1f6e9 100644 --- a/dd-smoke-tests/log-injection/src/test/resources/SpockConfig.groovy +++ b/dd-smoke-tests/log-injection/src/test/resources/SpockConfig.groovy @@ -1,5 +1,11 @@ runner { parallel { enabled true + + // Runtime.getRuntime().availableProcessors() is used to scale the parallelism by default + // but it returns weird values in Gitlab/kubernetes so fix the parallelism to a specific value + if (System.getenv("RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE") != null) { + fixed(Integer.valueOf(System.getenv("RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE"))) + } } } diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle index 992fa0eaa6f..26f88cf0a49 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle @@ -40,6 +40,7 @@ if (hasProperty('agentPath')) { buildArgs.add("-J-Ddd.profiling.enabled=true") } buildArgs.add("--enable-monitoring=jmxserver") + jvmArgs.add("-Xmx3072M") } } } diff --git a/dd-smoke-tests/spring-boot-3.0-native/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/build.gradle index ed37cbb264c..167af79baa2 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/build.gradle @@ -31,7 +31,7 @@ if (version >= 17) { tasks.register('springNativeBuild', Exec) { workingDir "$appDir" environment += [ - 'GRADLE_OPTS': "-Dorg.gradle.jvmargs='-Xmx512M'", + 'GRADLE_OPTS': "-Dorg.gradle.jvmargs='-Xmx1024M'", 'JAVA_HOME': javaHome, 'GRAALVM_HOME': testJvmHome, 'DD_TRACE_METHODS' : 'datadog.smoketest.springboot.controller.WebController[sayHello]', diff --git a/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy b/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy index 972419cbbba..48be4c9647a 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy +++ b/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy @@ -8,6 +8,7 @@ import spock.lang.Shared import spock.lang.TempDir import org.openjdk.jmc.flightrecorder.JfrLoaderToolkit +import spock.util.concurrent.PollingConditions import java.nio.file.FileVisitResult import java.nio.file.Files @@ -19,7 +20,6 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.locks.LockSupport class SpringBootNativeInstrumentationTest extends AbstractServerSmokeTest { @Shared @@ -90,24 +90,20 @@ class SpringBootNativeInstrumentationTest extends AbstractServerSmokeTest { CompletableFuture udpMessage = receiveUdpMessage(statsdPort, 1000) String url = "http://localhost:${httpPort}/hello" + def conditions = new PollingConditions(initialDelay: 2, timeout: 6) when: def response = client.newCall(new Request.Builder().url(url).get().build()).execute() then: - def ts = System.nanoTime() def responseBodyStr = response.body().string() responseBodyStr != null responseBodyStr.contains("Hello world") waitForTraceCount(1) - // sanity test for profiler generating JFR files - // the recording is collected after 1 second of execution - // make sure the app has been up and running for at least 1.5 seconds - while (System.nanoTime() - ts < 1_500_000_000L) { - LockSupport.parkNanos(1_000_000) + conditions.eventually { + assert countJfrs() > 0 } - countJfrs() > 0 udpMessage.get(1, TimeUnit.SECONDS) contains "service:smoke-test-java-app,version:99,env:smoketest" } diff --git a/dd-smoke-tests/springboot-mongo/src/test/groovy/datadog/smoketest/SpringBootMongoIntegrationTest.groovy b/dd-smoke-tests/springboot-mongo/src/test/groovy/datadog/smoketest/SpringBootMongoIntegrationTest.groovy index 72b33709b1d..f9d9c4d8930 100644 --- a/dd-smoke-tests/springboot-mongo/src/test/groovy/datadog/smoketest/SpringBootMongoIntegrationTest.groovy +++ b/dd-smoke-tests/springboot-mongo/src/test/groovy/datadog/smoketest/SpringBootMongoIntegrationTest.groovy @@ -23,7 +23,7 @@ class SpringBootMongoIntegrationTest extends AbstractServerSmokeTest { @Override void beforeProcessBuilders() { - mongoDbContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10")) + mongoDbContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.4.29")) mongoDbContainer.start() mongoDbUri = mongoDbContainer.replicaSetUrl } diff --git a/dd-smoke-tests/springboot-openliberty-20/application/pom.xml b/dd-smoke-tests/springboot-openliberty-20/application/pom.xml index d9e341675ae..85b6859c514 100644 --- a/dd-smoke-tests/springboot-openliberty-20/application/pom.xml +++ b/dd-smoke-tests/springboot-openliberty-20/application/pom.xml @@ -107,5 +107,25 @@ ${target.dir} + + maven-proxy-profile + + + env.MAVEN_REPOSITORY_PROXY + + + + + maven-proxy-repo + ${env.MAVEN_REPOSITORY_PROXY} + + + + + maven-plugin-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + + diff --git a/dd-smoke-tests/springboot-openliberty-23/application/pom.xml b/dd-smoke-tests/springboot-openliberty-23/application/pom.xml index a6b66b8083a..5a8fb308d78 100644 --- a/dd-smoke-tests/springboot-openliberty-23/application/pom.xml +++ b/dd-smoke-tests/springboot-openliberty-23/application/pom.xml @@ -107,5 +107,25 @@ ${target.dir} + + maven-proxy-profile + + + env.MAVEN_REPOSITORY_PROXY + + + + + maven-proxy-repo + ${env.MAVEN_REPOSITORY_PROXY} + + + + + maven-plugin-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + + diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy index 8fa819362d9..498a4b4a0af 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy @@ -23,7 +23,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { static final int HTTP_OK = 200 @Shared - long reportingInterval = 10 + long reportingInterval = 1 @Shared int queueSize = 256 @@ -106,9 +106,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { CountDownLatch latch = new CountDownLatch(1) aggregator.publish([new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 100, HTTP_OK)]) aggregator.report() - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: + latchTriggered 1 * writer.startBucket(1, _, _) 1 * writer.add(new MetricKey("resource", "service", "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> value.getHitCount() == 1 && value.getTopLevelCount() == 1 && value.getDuration() == 100 @@ -135,9 +136,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { new SimpleSpan("service", "operation", "resource", "type", measured, topLevel, false, 0, 100, HTTP_OK) ]) aggregator.report() - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: + latchTriggered 1 * writer.startBucket(1, _, _) 1 * writer.add(new MetricKey("resource", "service", "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> value.getHitCount() == 1 && value.getTopLevelCount() == topLevelCount && value.getDuration() == 100 @@ -177,9 +179,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { aggregator.publish(trace) } aggregator.report() - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: "metrics should be conflated" + latchTriggered 1 * writer.finishBucket() >> { latch.countDown() } 1 * writer.startBucket(2, _, SECONDS.toNanos(reportingInterval)) 1 * writer.add(new MetricKey("resource", "service", "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> @@ -216,9 +219,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { ]) } aggregator.report() - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: "the first aggregate should be dropped but the rest reported" + latchTriggered 1 * writer.startBucket(10, _, SECONDS.toNanos(reportingInterval)) for (int i = 1; i < 11; ++i) { 1 * writer.add(new MetricKey("resource", "service" + i, "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> @@ -252,9 +256,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { ]) } aggregator.report() - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: "all aggregates should be reported" + latchTriggered 1 * writer.startBucket(5, _, SECONDS.toNanos(reportingInterval)) for (int i = 0; i < 5; ++i) { 1 * writer.add(new MetricKey("resource", "service" + i, "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> @@ -271,9 +276,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { ]) } aggregator.report() - latch.await(2, SECONDS) + latchTriggered = latch.await(2, SECONDS) then: "aggregate not updated in cycle is not reported" + latchTriggered 1 * writer.startBucket(4, _, SECONDS.toNanos(reportingInterval)) for (int i = 1; i < 5; ++i) { 1 * writer.add(new MetricKey("resource", "service" + i, "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> @@ -307,16 +313,17 @@ class ConflatingMetricAggregatorTest extends DDSpecification { ]) } aggregator.report() - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: "all aggregates should be reported" + latchTriggered 1 * writer.startBucket(5, _, SECONDS.toNanos(reportingInterval)) for (int i = 0; i < 5; ++i) { 1 * writer.add(new MetricKey("resource", "service" + i, "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> value.getHitCount() == 1 && value.getDuration() == duration } } - 1 * writer.finishBucket() + 1 * writer.finishBucket() >> { latch.countDown() } when: reportAndWaitUntilEmpty(aggregator) @@ -349,9 +356,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { new SimpleSpan("service" + i, "operation", "resource", "type", false, true, false, 0, duration, HTTP_OK) ]) } - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: "all aggregates should be reported" + latchTriggered 1 * writer.startBucket(5, _, SECONDS.toNanos(1)) for (int i = 0; i < 5; ++i) { 1 * writer.add(new MetricKey("resource", "service" + i, "operation", "type", HTTP_OK, false), _) >> { MetricKey key, AggregateMetric value -> @@ -421,9 +429,10 @@ class ConflatingMetricAggregatorTest extends DDSpecification { new SimpleSpan("service" + i, "operation", "resource", "type", false, true, false, 0, duration, HTTP_OK) ]) } - latch.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: "writer should be reset if reporting fails" + latchTriggered 1 * writer.startBucket(_, _, _) >> { throw new IllegalArgumentException("something went wrong") } @@ -449,6 +458,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification { then: notThrown(TimeoutException) !flushed + + cleanup: + aggregator.close() } def "force flush should wait for aggregator to start"() { @@ -480,6 +492,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification { then: notThrown(TimeoutException) flushed + + cleanup: + aggregator.close() } def reportAndWaitUntilEmpty(ConflatingMetricsAggregator aggregator) { diff --git a/gradle/configure_tests.gradle b/gradle/configure_tests.gradle index 60280fa3144..945a9e9665b 100644 --- a/gradle/configure_tests.gradle +++ b/gradle/configure_tests.gradle @@ -20,7 +20,7 @@ def isTestingInstrumentation(Project project) { } def forkedTestLimit = gradle.sharedServices.registerIfAbsent("forkedTestLimit", BuildService) { - maxParallelUsages = 2 + maxParallelUsages = 3 } // Force timeout after 9 minutes (CircleCI defaults will fail after 10 minutes without output) @@ -69,7 +69,6 @@ tasks.withType(Test).configureEach { if (name.startsWith("forkedTest") || name.endsWith("ForkedTest")) { setExcludes([]) setIncludes(["**/*ForkedTest*"]) - jvmArgs += ["-Xms256M", "-Xmx256M"] forkEvery 1 // Limit the number of concurrent forked tests usesService(forkedTestLimit)