Address remaining merge conflicts

Author: sarahchen6

.gitlab-ci.yml

@@ -94,15 +94,12 @@ default:
   - 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"
-<<<<<<< HEAD
 
 .cgroup_info: &cgroup_info
   - source .gitlab/gitlab-utils.sh
   - gitlab_section_start "cgroup-info" "cgroup info"
   - .gitlab/cgroup-info.sh
   - gitlab_section_end "cgroup-info"
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
 
 .gradle_build: &gradle_build
   image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
@@ -149,11 +146,8 @@ default:
     - mv .gradle-copy .gradle
     - ls -la
     - gitlab_section_end "gradle-dance"
-<<<<<<< HEAD
   after_script:
     - *cgroup_info
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
 
 build:
   extends: .gradle_build
@@ -230,7 +224,6 @@ populate_dep_cache:
 #        CACHE_TYPE: "latestdep"
 #      - GRADLE_TARGET: ":smokeTest"
 #        CACHE_TYPE: "smoke"
-<<<<<<< HEAD
 
 publish-artifacts-to-s3:
   image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
@@ -263,8 +256,6 @@ publish-artifacts-to-s3:
       annotations:
         - links.json
 
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
 
 spotless:
   extends: .gradle_build
@@ -292,10 +283,7 @@ test_published_artifacts:
     - 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:
-<<<<<<< HEAD
     - *cgroup_info
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
     - source .gitlab/gitlab-utils.sh
     - gitlab_section_start "collect-reports" "Collecting reports"
     - .circleci/collect_reports.sh
@@ -314,10 +302,7 @@ test_published_artifacts:
   script:
     - ./gradlew $GRADLE_TARGET -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
   after_script:
-<<<<<<< HEAD
     - *cgroup_info
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
     - source .gitlab/gitlab-utils.sh
     - gitlab_section_start "collect-reports" "Collecting reports"
     - .circleci/collect_reports.sh --destination ./check_reports --move
@@ -378,10 +363,7 @@ 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:
-<<<<<<< HEAD
     - *cgroup_info
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
     - source .gitlab/gitlab-utils.sh
     - gitlab_section_start "collect-reports" "Collecting reports"
     - .circleci/collect_reports.sh
@@ -427,22 +409,13 @@ muzzle-dep-report:
 
 .test_job:
   extends: .gradle_build
-<<<<<<< HEAD
   image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
-=======
-  image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
   tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
   needs: [ build_tests ]
   stage: tests
   variables:
-<<<<<<< HEAD
     KUBERNETES_MEMORY_REQUEST: 17Gi
     KUBERNETES_MEMORY_LIMIT: 17Gi
-=======
-    KUBERNETES_MEMORY_REQUEST: 16Gi
-    KUBERNETES_MEMORY_LIMIT: 16Gi
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
     KUBERNETES_CPU_REQUEST: 10
     GRADLE_WORKERS: 4
     GRADLE_MEM: 3G
@@ -466,33 +439,21 @@ muzzle-dep-report:
       export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
       fi
     - *prepare_test_env
-<<<<<<< HEAD
     - 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"
-=======
-    - 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"
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
     - ./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
-<<<<<<< HEAD
     - *cgroup_info
-=======
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
     - 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
-<<<<<<< HEAD
     - .circleci/upload_ciapp.sh $CACHE_TYPE $testJvm
     - gitlab_section_end "collect-reports"
     - URL_ENCODED_JOB_NAME=$(jq -rn --arg x "$CI_JOB_NAME" '$x|@uri')
     - echo -e "${TEXT_BOLD}${TEXT_YELLOW}See test results in Datadog:${TEXT_CLEAR} https://app.datadoghq.com/ci/test/runs?query=test_level%3Atest%20%40test.service%3Add-trace-java%20%40ci.pipeline.id%3A${CI_PIPELINE_ID}%20%40ci.job.name%3A%22${URL_ENCODED_JOB_NAME}%22"
-=======
-    - .circleci/upload_ciapp.sh tests $testJvm
-    - gitlab_section_end "collect-reports"
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
   artifacts:
     when: always
     paths:
@@ -636,11 +597,7 @@ test_smoke:
     GRADLE_PARAMS: "-PskipFlakyTests"
     CACHE_TYPE: "smoke"
   parallel:
-<<<<<<< HEAD
     matrix: *test_matrix_4
-=======
-    matrix: *test_matrix_2
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
 
 test_ssi_smoke:
   extends: .test_job
@@ -651,11 +608,7 @@ test_ssi_smoke:
     DD_INJECT_FORCE: "true"
     DD_INJECTION_ENABLED: "tracer"
   parallel:
-<<<<<<< HEAD
     matrix: *test_matrix_4
-=======
-    matrix: *test_matrix_2
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
 
 test_smoke_graalvm:
   extends: .test_job
@@ -677,31 +630,6 @@ test_smoke_semeru8_debugger:
     CACHE_TYPE: "smoke"
     NON_DEFAULT_JVMS: "true"
     testJvm: "semeru8"
-<<<<<<< HEAD
-=======
-
-required:
-  extends: .fan_in
-  needs:
-    - job: spotless
-      optional: true
-    - job: muzzle
-      optional: true
-    - job: test_published_artifacts
-      optional: true
-    - job: agent_integration_tests
-      optional: true
-    - job: check_base
-      optional: true
-    - job: check_inst
-      optional: true
-    - job: check_smoke
-      optional: true
-    - job: check_profiling
-      optional: true
-    - job: check_debugger
-      optional: true
->>>>>>> f494c33b01 (Run tests in Gitlab (#8656))
 
 deploy_to_profiling_backend:
   stage: publish