From 1ea1be0bce3c061cdc7829369714618a84d51244 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Fri, 6 Jun 2025 16:15:46 -0400 Subject: [PATCH 1/5] publish artifacts to S3 --- .gitlab-ci.yml | 31 +++++++++++++++++++++++++++++++ .gitlab/benchmarks.yml | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a5a6492368..217ee51ec24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -218,6 +218,37 @@ populate_dep_cache: # - GRADLE_TARGET: ":smokeTest" # CACHE_TYPE: "smoke" +publish-artifacts-to-s3: + image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29 + stage: publish + needs: [ build ] + script: + - source upstream.env + - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-agent.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-api-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-api.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-agent-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-api.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-ot.jar + - | + cat << EOF > links.json + { + "S3 Links": [ + { + "external_link": { + "label": "Public Link to dd-java-agent.jar" + "url": "https://s3.us-east-1.amazonaws.com/dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar" + } + } + ] + } + EOF + artifacts: + reports: + annotations: + - links.json + + spotless: extends: .gradle_build stage: tests diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml index 4ac6cfb7f7c..05a5adfcbb4 100644 --- a/.gitlab/benchmarks.yml +++ b/.gitlab/benchmarks.yml @@ -4,7 +4,7 @@ timeout: 1h tags: ["runner:apm-k8s-tweaked-metal"] image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-java-benchmarks - needs: [ "build" ] + needs: [ "build", "publish-artifacts-to-s3" ] rules: - if: '$POPULATE_CACHE' when: never @@ -85,7 +85,7 @@ benchmarks-post-results: interruptible: true timeout: 1h image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:java-dsm-kafka - needs: [ "build" ] + needs: [ "build", "publish-artifacts-to-s3"] script: - git clone --branch java/kafka-dsm-overhead https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform.git platform && cd platform - ./steps/run-benchmarks.sh @@ -129,7 +129,7 @@ debugger-benchmarks: interruptible: true timeout: 1h image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:java-debugger - needs: ["build"] + needs: ["build", "publish-artifacts-to-s3"] script: - export ARTIFACTS_DIR="$(pwd)/reports" && mkdir -p "${ARTIFACTS_DIR}" - git clone --branch java/debugger-benchmarks https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform.git /platform && cd /platform From 153b6211a593fe99089fcff716614862b41ce927 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Fri, 6 Jun 2025 16:40:51 -0400 Subject: [PATCH 2/5] fix path --- .gitlab-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 217ee51ec24..6abd07f5191 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -224,12 +224,13 @@ publish-artifacts-to-s3: needs: [ build ] script: - source upstream.env - - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-agent.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-api-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-api.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-agent-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-api.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${UPSTREAM_TRACER_VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-ot.jar + - export VERSION="${UPSTREAM_TRACER_VERSION%~*}" # remove ~githash from the end of version + - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-agent.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-api.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-api.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-ot.jar - | cat << EOF > links.json { From a600febd3fb328225a4bb2b3bf3e11690a2c15cd Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Fri, 6 Jun 2025 16:53:25 -0400 Subject: [PATCH 3/5] fix c/p errors --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6abd07f5191..e347bae6ba8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -226,11 +226,11 @@ publish-artifacts-to-s3: - source upstream.env - export VERSION="${UPSTREAM_TRACER_VERSION%~*}" # remove ~githash from the end of version - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-agent.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-api.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-api.jar - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-api.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-ot.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-api.jar + - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-ot.jar - | cat << EOF > links.json { From 4f1239f55e910b0f91e4c7ef4ec94ad56173f384 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Fri, 6 Jun 2025 17:09:50 -0400 Subject: [PATCH 4/5] more c/p errors --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e347bae6ba8..4acfa0d201e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -226,11 +226,11 @@ publish-artifacts-to-s3: - source upstream.env - export VERSION="${UPSTREAM_TRACER_VERSION%~*}" # remove ~githash from the end of version - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-agent.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-api.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar + - aws s3 cp workspace/dd-trace-api/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-api.jar + - aws s3 cp workspace/dd-trace-ot/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar - aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-api.jar - - aws s3 cp workspace/dd-java-agent/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-ot.jar + - aws s3 cp workspace/dd-trace-api/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-api.jar + - aws s3 cp workspace/dd-trace-ot/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-ot.jar - | cat << EOF > links.json { From 4fda2044eb9fc0b870bf8f558c670067f30d6468 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Fri, 6 Jun 2025 17:24:08 -0400 Subject: [PATCH 5/5] missing comma in json --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4acfa0d201e..3859fb47404 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,7 +237,7 @@ publish-artifacts-to-s3: "S3 Links": [ { "external_link": { - "label": "Public Link to dd-java-agent.jar" + "label": "Public Link to dd-java-agent.jar", "url": "https://s3.us-east-1.amazonaws.com/dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar" } }