Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't duplicate agent builds for OTEL collector #34304

Open
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

chouquette
Copy link
Contributor

What does this PR do?

Builds the OTEL enabled agent from the regular agent builds & a dedicated otel-agent build

Motivation

Cut the build durations in half, and restore the ability to profile our agent, regardless of OTEL status, since the BuildID for all binaries will be consistent with the debug symbols we ship.

Describe how you validated your changes

Manual verification of the version-manifest.{json,txt} files

Possible Drawbacks / Trade-offs

Additional Notes

@chouquette chouquette added changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation team/agent-delivery labels Feb 21, 2025
@chouquette chouquette requested review from a team as code owners February 21, 2025 13:37
@github-actions github-actions bot added the medium review PR review might take time label Feb 21, 2025
@chouquette chouquette requested a review from a team as a code owner February 21, 2025 13:58
@chouquette
Copy link
Contributor Author

Continuation from #33962

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 21, 2025

[Fast Unit Tests Report]

On pipeline 57002489 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_deb-arm64-py3
  • tests_deb-x64-py3
  • tests_flavor_dogstatsd_deb-x64
  • tests_flavor_heroku_deb-x64
  • tests_flavor_iot_deb-x64
  • tests_rpm-arm64-py3
  • tests_rpm-x64-py3
  • tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 21, 2025

Gitlab CI Configuration Changes

Modified Jobs

.docker_build_artifact
  .docker_build_artifact:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
docker_build_agent7
  docker_build_agent7:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-x64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:amd64
    timeout: 30m
    variables:
      ARCH: amd64
      BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-agent-7*-amd64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7
docker_build_agent7_arm64
  docker_build_agent7_arm64:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-arm64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:arm64
    timeout: 30m
    variables:
      ARCH: arm64
      BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-agent-7*-arm64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7
docker_build_agent7_jmx
  docker_build_agent7_jmx:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-x64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:amd64
    timeout: 30m
    variables:
      ARCH: amd64
      BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-agent-7*-amd64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-jmx
docker_build_agent7_jmx_arm64
  docker_build_agent7_jmx_arm64:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-arm64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:arm64
    timeout: 30m
    variables:
      ARCH: arm64
      BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-agent-7*-arm64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-jmx
docker_build_fips_agent7
  docker_build_fips_agent7:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-x64-fips
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:amd64
    timeout: 30m
    variables:
      ARCH: amd64
      BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-amd64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-fips
docker_build_fips_agent7_arm64
  docker_build_fips_agent7_arm64:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-arm64-fips
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:arm64
    timeout: 30m
    variables:
      ARCH: arm64
      BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-arm64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-fips
docker_build_fips_agent7_arm64_jmx
  docker_build_fips_agent7_arm64_jmx:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-arm64-fips
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:arm64
    timeout: 30m
    variables:
      ARCH: arm64
      BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg WITH_JMX_FIPS=true
        --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-arm64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-fips-jmx
docker_build_fips_agent7_jmx
  docker_build_fips_agent7_jmx:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - job: datadog-agent-7-x64-fips
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:amd64
    timeout: 30m
    variables:
      ARCH: amd64
      BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg WITH_JMX_FIPS=true
        --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-amd64.tar.xz
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-fips-jmx
docker_build_ot_agent7
  docker_build_ot_agent7:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
-   - job: datadog-ot-agent-7-x64
?                  ---
+   - job: datadog-agent-7-x64
+   - job: datadog-otel-agent-x64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:amd64
    timeout: 30m
    variables:
      ARCH: amd64
-     BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-ot-agent-7*-amd64.tar.xz
?                                                                    ^^^^^^^^
+     BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-*-7*-amd64.tar.xz
?                                                                    ^
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-ot-beta
docker_build_ot_agent7_arm64
  docker_build_ot_agent7_arm64:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
-   - job: datadog-ot-agent-7-arm64
?                  ---
+   - job: datadog-agent-7-arm64
+   - job: datadog-otel-agent-arm64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:arm64
    timeout: 30m
    variables:
      ARCH: arm64
-     BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-ot-agent-7*-arm64.tar.xz
?                                                                    ^^^^^^^^
+     BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-*-7*-arm64.tar.xz
?                                                                    ^
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-ot-beta
docker_build_ot_agent7_jmx
  docker_build_ot_agent7_jmx:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
-   - job: datadog-ot-agent-7-x64
?                  ---
+   - job: datadog-agent-7-x64
+   - job: datadog-otel-agent-x64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:amd64
    timeout: 30m
    variables:
      ARCH: amd64
-     BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-ot-agent-7*-amd64.tar.xz
?                                                                                              ^^^^^^^^
+     BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-*-7*-amd64.tar.xz
?                                                                                              ^
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-ot-beta-jmx
docker_build_ot_agent7_jmx_arm64
  docker_build_ot_agent7_jmx_arm64:
    before_script:
-   - mv $OMNIBUS_PACKAGE_DIR/*.xz $BUILD_CONTEXT
+   - ls $OMNIBUS_PACKAGE_DIR/*.xz | grep -v -- -dbg- | xargs -I '{}' mv '{}' $BUILD_CONTEXT/
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
-   - job: datadog-ot-agent-7-arm64
?                  ---
+   - job: datadog-agent-7-arm64
+   - job: datadog-otel-agent-arm64
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - TAG_SUFFIX=${TAG_SUFFIX:-}
    - BUILD_ARG=${BUILD_ARG:-}
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMAGE\" =~ \"ci/datadog-agent/agent\"\
      \ || \"$IMAGE\" =~ \"ci/datadog-agent/cluster-agent\" || \"$IMAGE\" =~ \"ci/datadog-agent/cws-instrumentation\"\
      \ ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"-nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=${CI_COMMIT_TAG+-release}\n\
      fi\n"
    - TARGET_TAG=${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}$TAG_SUFFIX-$ARCH
    - DOCKER_LOGIN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO user)
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DOCKER_REGISTRY_RO token | docker login
      --username "$DOCKER_LOGIN" --password-stdin "$DOCKER_REGISTRY_URL"
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - docker buildx build --no-cache --push --pull --platform linux/$ARCH --build-arg
      CIBUILD=true --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      $BUILD_ARG --build-arg DD_GIT_REPOSITORY_URL=https://github.com/DataDog/datadog-agent
      --build-arg DD_GIT_COMMIT_SHA=${CI_COMMIT_SHA} --file $BUILD_CONTEXT/Dockerfile
      --tag ${TARGET_TAG} --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)"
      --label "org.opencontainers.image.authors=Datadog <[email protected]>" --label
      "org.opencontainers.image.source=https://github.com/DataDog/datadog-agent" --label
      "org.opencontainers.image.version=$(inv agent.version)" --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}"
      --label "org.opencontainers.image.vendor=Datadog, Inc." --label "target=none"
      $BUILD_CONTEXT
    - crane flatten -t ${TARGET_TAG} ${TARGET_TAG}
    stage: container_build
    tags:
    - arch:arm64
    timeout: 30m
    variables:
      ARCH: arm64
-     BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-ot-agent-7*-arm64.tar.xz
?                                                                                              ^^^^^^^^
+     BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-*-7*-arm64.tar.xz
?                                                                                              ^
      BUILD_CONTEXT: Dockerfiles/agent
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-ot-beta-jmx
ot_agent_deb-arm64-a7
  ot_agent_deb-arm64-a7:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $OMNIBUS_PACKAGE_DIR
    cache:
    - key:
        files:
        - omnibus/Gemfile
        - release.json
        prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
      paths:
      - omnibus/vendor/bundle
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
    needs:
-   - datadog-ot-agent-7-arm64
?            ---
+   - datadog-agent-7-arm64
+   - datadog-otel-agent-arm64
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
    - echo "About to package for $RELEASE_VERSION"
    - set +x
    - printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DEB_GPG_KEY)" | gpg --import
      --batch
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - DEB_SIGNING_PASSPHRASE=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DEB_SIGNING_PASSPHRASE)
      || exit $?; export DEB_SIGNING_PASSPHRASE
    - inv -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR
      --skip-deps --target-project ${DD_PROJECT} --flavor ot ${OMNIBUS_EXTRA_ARGS}
    - curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${DD_PKG_ARCH}.tar.gz"
      | tar -xz -C /usr/local/bin dd-pkg
    - find $OMNIBUS_PACKAGE_DIR -iregex '.*\.\(deb\|rpm\)' | xargs dd-pkg lint
    - "if [ -n \"$PACKAGE_REQUIRED_FILES_LIST\" ]; then\n  find $OMNIBUS_PACKAGE_DIR\
      \ \\( -name '*.deb' -or -name '*.rpm' \\) -a -not -name '*-dbg[_-]*' | xargs dd-pkg\
      \ check-files --required-files ${PACKAGE_REQUIRED_FILES_LIST}\nfi\n"
    stage: packaging
    tags:
    - arch:arm64
    variables:
      DD_PKG_ARCH: arm64
      DD_PROJECT: agent
      KUBERNETES_CPU_REQUEST: 16
      KUBERNETES_MEMORY_LIMIT: 32Gi
      KUBERNETES_MEMORY_REQUEST: 32Gi
      OMNIBUS_PACKAGE_ARTIFACT_DIR: $OMNIBUS_PACKAGE_DIR
      PACKAGE_ARCH: arm64
      PACKAGE_REQUIRED_FILES_LIST: test/required_files/agent-deb.txt
      RELEASE_VERSION: $RELEASE_VERSION_7
ot_agent_deb-x64-a7
  ot_agent_deb-x64-a7:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $OMNIBUS_PACKAGE_DIR
    cache:
    - key:
        files:
        - omnibus/Gemfile
        - release.json
        prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
      paths:
      - omnibus/vendor/bundle
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
-   - datadog-ot-agent-7-x64
?             ---
+   - datadog-agent-7-x64
+   - datadog-otel-agent-x64
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
    - echo "About to package for $RELEASE_VERSION"
    - set +x
    - printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DEB_GPG_KEY)" | gpg --import
      --batch
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - DEB_SIGNING_PASSPHRASE=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $DEB_SIGNING_PASSPHRASE)
      || exit $?; export DEB_SIGNING_PASSPHRASE
    - inv -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR
      --skip-deps --target-project ${DD_PROJECT} --flavor ot ${OMNIBUS_EXTRA_ARGS}
    - curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${DD_PKG_ARCH}.tar.gz"
      | tar -xz -C /usr/local/bin dd-pkg
    - find $OMNIBUS_PACKAGE_DIR -iregex '.*\.\(deb\|rpm\)' | xargs dd-pkg lint
    - "if [ -n \"$PACKAGE_REQUIRED_FILES_LIST\" ]; then\n  find $OMNIBUS_PACKAGE_DIR\
      \ \\( -name '*.deb' -or -name '*.rpm' \\) -a -not -name '*-dbg[_-]*' | xargs dd-pkg\
      \ check-files --required-files ${PACKAGE_REQUIRED_FILES_LIST}\nfi\n"
    stage: packaging
    tags:
    - arch:amd64
    variables:
      DD_PKG_ARCH: x86_64
      DD_PROJECT: agent
      KUBERNETES_CPU_REQUEST: 16
      KUBERNETES_MEMORY_LIMIT: 32Gi
      KUBERNETES_MEMORY_REQUEST: 32Gi
      OMNIBUS_PACKAGE_ARTIFACT_DIR: $OMNIBUS_PACKAGE_DIR
      PACKAGE_ARCH: amd64
      PACKAGE_REQUIRED_FILES_LIST: test/required_files/agent-deb.txt
      RELEASE_VERSION: $RELEASE_VERSION_7

Added Jobs

.otel_build_common
.otel_build_common:
  artifacts:
    expire_in: 2 weeks
    paths:
    - $OMNIBUS_PACKAGE_DIR
  cache:
  - key:
      files:
      - omnibus/Gemfile
      - release.json
      prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
    paths:
    - omnibus/vendor/bundle
  needs:
  - go_mod_tidy_check
  - go_deps
  rules:
  - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
    when: never
  - when: on_success
  script:
  - echo "About to build for $RELEASE_VERSION"
  - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
    || exit 101
  - rm -f modcache.tar.xz
  - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
  - rm -rf $OMNIBUS_PACKAGE_DIR/*
  - inv -e omnibus.build --release-version $RELEASE_VERSION_7 --base-dir $OMNIBUS_BASE_DIR
    ${USE_S3_CACHING} --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project
    otel-agent
  - ls -la $OMNIBUS_PACKAGE_DIR
  - $S3_CP_CMD $OMNIBUS_PACKAGE_DIR/version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json
  stage: package_build
  variables:
    KUBERNETES_CPU_REQUEST: 16
    KUBERNETES_MEMORY_LIMIT: 32Gi
    KUBERNETES_MEMORY_REQUEST: 32Gi
datadog-otel-agent-arm64
datadog-otel-agent-arm64:
  artifacts:
    expire_in: 2 weeks
    paths:
    - $OMNIBUS_PACKAGE_DIR
  cache:
  - key:
      files:
      - omnibus/Gemfile
      - release.json
      prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
    paths:
    - omnibus/vendor/bundle
  image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux-glibc-2-23-arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  needs:
  - go_mod_tidy_check
  - go_deps
  rules:
  - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
    when: never
  - when: on_success
  script:
  - echo "About to build for $RELEASE_VERSION"
  - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
    || exit 101
  - rm -f modcache.tar.xz
  - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
  - rm -rf $OMNIBUS_PACKAGE_DIR/*
  - inv -e omnibus.build --release-version $RELEASE_VERSION_7 --base-dir $OMNIBUS_BASE_DIR
    ${USE_S3_CACHING} --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project
    otel-agent
  - ls -la $OMNIBUS_PACKAGE_DIR
  - $S3_CP_CMD $OMNIBUS_PACKAGE_DIR/version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json
  stage: package_build
  tags:
  - arch:arm64
  variables:
    DD_CC: aarch64-unknown-linux-gnu-gcc
    DD_CXX: aarch64-unknown-linux-gnu-g++
    KUBERNETES_CPU_REQUEST: 16
    KUBERNETES_MEMORY_LIMIT: 32Gi
    KUBERNETES_MEMORY_REQUEST: 32Gi
datadog-otel-agent-x64
datadog-otel-agent-x64:
  artifacts:
    expire_in: 2 weeks
    paths:
    - $OMNIBUS_PACKAGE_DIR
  cache:
  - key:
      files:
      - omnibus/Gemfile
      - release.json
      prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
    paths:
    - omnibus/vendor/bundle
  image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux-glibc-2-17-x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  needs:
  - go_mod_tidy_check
  - go_deps
  rules:
  - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
    when: never
  - when: on_success
  script:
  - echo "About to build for $RELEASE_VERSION"
  - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
    || exit 101
  - rm -f modcache.tar.xz
  - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
  - rm -rf $OMNIBUS_PACKAGE_DIR/*
  - inv -e omnibus.build --release-version $RELEASE_VERSION_7 --base-dir $OMNIBUS_BASE_DIR
    ${USE_S3_CACHING} --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project
    otel-agent
  - ls -la $OMNIBUS_PACKAGE_DIR
  - $S3_CP_CMD $OMNIBUS_PACKAGE_DIR/version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json
  stage: package_build
  tags:
  - arch:amd64
  variables:
    DD_CC: x86_64-unknown-linux-gnu-gcc
    DD_CXX: x86_64-unknown-linux-gnu-g++
    KUBERNETES_CPU_REQUEST: 16
    KUBERNETES_MEMORY_LIMIT: 32Gi
    KUBERNETES_MEMORY_REQUEST: 32Gi

Removed Jobs

  • .ot_agent_7_build
  • datadog-ot-agent-7-arm64
  • datadog-ot-agent-7-x64

Changes Summary

Removed Modified Added Renamed
3 15 3 0

ℹ️ Diff available in the job log.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 21, 2025

Uncompressed package size comparison

Comparison with ancestor 224808ef49a4a36b96f0092418d80545584fb83c

Diff per package
package diff status size ancestor threshold
datadog-agent-amd64-deb 0.00MB 840.07MB 840.07MB 0.50MB
datadog-agent-arm64-deb 0.00MB 830.17MB 830.17MB 0.50MB
datadog-agent-x86_64-rpm 0.00MB 849.86MB 849.86MB 0.50MB
datadog-agent-x86_64-suse 0.00MB 849.86MB 849.86MB 0.50MB
datadog-agent-aarch64-rpm 0.00MB 839.94MB 839.94MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 39.42MB 39.42MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 39.50MB 39.50MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 39.50MB 39.50MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 37.96MB 37.96MB 0.50MB
datadog-heroku-agent-amd64-deb 0.00MB 443.27MB 443.27MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 62.02MB 62.02MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 62.09MB 62.09MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 62.09MB 62.09MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 59.26MB 59.26MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 59.33MB 59.33MB 0.50MB

Decision

✅ Passed

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 21, 2025

Static quality checks ✅

Please find below the results from static quality gates

Successful checks

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 812.84MiB 841.59MiB 196.86MiB 210.72MiB
static_quality_gate_agent_deb_arm64 803.51MiB 830.66MiB 178.16MiB 192.1MiB
static_quality_gate_agent_rpm_amd64 812.84MiB 841.52MiB 199.27MiB 214.52MiB
static_quality_gate_agent_rpm_arm64 803.46MiB 830.66MiB 180.85MiB 193.64MiB
static_quality_gate_agent_suse_amd64 812.96MiB 841.52MiB 199.27MiB 214.52MiB
static_quality_gate_agent_suse_arm64 803.44MiB 830.66MiB 180.85MiB 194.03MiB
static_quality_gate_dogstatsd_deb_amd64 37.67MiB 49.7MiB 9.78MiB 20.6MiB
static_quality_gate_dogstatsd_deb_arm64 36.27MiB 48.1MiB 8.49MiB 19.1MiB
static_quality_gate_dogstatsd_rpm_amd64 37.67MiB 49.7MiB 9.79MiB 20.6MiB
static_quality_gate_dogstatsd_suse_amd64 37.67MiB 49.7MiB 9.79MiB 20.6MiB
static_quality_gate_iot_agent_deb_amd64 59.23MiB 69.0MiB 14.88MiB 24.8MiB
static_quality_gate_iot_agent_deb_arm64 56.59MiB 66.4MiB 12.83MiB 22.8MiB
static_quality_gate_iot_agent_rpm_amd64 59.23MiB 69.0MiB 14.9MiB 24.8MiB
static_quality_gate_iot_agent_rpm_arm64 56.59MiB 66.4MiB 12.85MiB 22.8MiB
static_quality_gate_iot_agent_suse_amd64 59.23MiB 69.0MiB 14.9MiB 24.8MiB
static_quality_gate_docker_agent_amd64 897.3MiB 926.0MiB 300.93MiB 317.43MiB
static_quality_gate_docker_agent_arm64 911.12MiB 939.07MiB 286.41MiB 302.43MiB
static_quality_gate_docker_agent_jmx_amd64 1.07GiB 1.1GiB 376.02MiB 392.54MiB
static_quality_gate_docker_agent_jmx_arm64 1.07GiB 1.1GiB 357.52MiB 373.21MiB
static_quality_gate_docker_dogstatsd_amd64 45.81MiB 57.88MiB 17.28MiB 28.29MiB
static_quality_gate_docker_dogstatsd_arm64 44.45MiB 56.27MiB 16.16MiB 27.06MiB
static_quality_gate_docker_cluster_agent_amd64 264.94MiB 274.78MiB 106.34MiB 116.28MiB
static_quality_gate_docker_cluster_agent_arm64 280.92MiB 290.82MiB 101.19MiB 111.12MiB

Copy link

cit-pr-commenter bot commented Feb 21, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: bec4f5ca-22d4-48a1-aa5f-c8d98e2eba01

Baseline: 224808e
Comparison: e22cf46
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.28 [-0.18, +0.74] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.25 [-0.53, +1.04] 1 Logs
quality_gate_idle_all_features memory utilization +0.16 [+0.10, +0.23] 1 Logs bounds checks dashboard
tcp_syslog_to_blackhole ingress throughput +0.16 [+0.10, +0.21] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.02, +0.02] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput -0.00 [-0.80, +0.79] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.01 [-0.81, +0.79] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.01 [-0.30, +0.28] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.01 [-0.64, +0.61] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.02 [-0.74, +0.70] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.03 [-0.82, +0.76] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.03 [-0.85, +0.79] 1 Logs
file_tree memory utilization -0.27 [-0.33, -0.21] 1 Logs
quality_gate_logs % cpu utilization -0.62 [-3.53, +2.28] 1 Logs
quality_gate_idle memory utilization -0.63 [-0.68, -0.58] 1 Logs bounds checks dashboard
uds_dogstatsd_to_api_cpu % cpu utilization -2.28 [-3.14, -1.43] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10
quality_gate_logs lost_bytes 10/10
quality_gate_logs memory_usage 10/10

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.

@chouquette chouquette force-pushed the chouquette/refactor_otel_builds branch from 0c73718 to c65f4ec Compare February 24, 2025 07:38
@chouquette chouquette force-pushed the chouquette/refactor_otel_builds branch from ab02d79 to 1f76ca0 Compare February 25, 2025 09:40
Comment on lines +196 to +210
datadog-otel-agent-x64:
extends: .otel_build_common
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux-glibc-2-17-x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:amd64"]
variables:
DD_CC: "x86_64-unknown-linux-gnu-gcc"
DD_CXX: "x86_64-unknown-linux-gnu-g++"

datadog-otel-agent-arm64:
extends: .otel_build_common
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux-glibc-2-23-arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:arm64"]
variables:
DD_CC: "aarch64-unknown-linux-gnu-gcc"
DD_CXX: "aarch64-unknown-linux-gnu-g++"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit - we could have a matrix to avoid some cpy/paste

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that we have 3 values to modify (the image name, the tag, a the compiler prefix) for a 7 lines job, I'm not sure a matrix would improve the readability/maintainability here

Omnibus::Config.git_cache_dir ENV["OMNIBUS_GIT_CACHE_DIR"]
end

if windows_target? || osx_target?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit - I'd have used unless linux_target

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense, updated

# ------------------------------------
dependency 'datadog-otel-agent'

if linux_target?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We keep the if statement to be future proof for when we'll add windows?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

additional_versions = FFI_Yajl::Parser.parse(File.read(version_manifest_json_path))

versions["software"].merge!(additional_versions["software"])
delete version_manifest_json_path
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember why exactly, but I think FileUtils.rm is preferred over delete in a block

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, something to do with dsl commands being queued up, also I thought it didn't occur in a block, but that's a bit blurry.
Changed to FileUtils.rm so that we don't have to wonder

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Florent is right, using delete in a block will mess up the order of execution in potentially unexpected ways. I see a command and a delete further down inside a block too.

On a tangential note, block's accept an argument such that you can give them a descriptive name over what they're supposed to achieve, like in this example. In case you find it appropriate for these blocks, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocks are now named and shellout! is used instead of command

@github-actions github-actions bot added long review PR is complex, plan time to review it and removed medium review PR review might take time labels Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog long review PR is complex, plan time to review it qa/no-code-change No code change in Agent code requiring validation team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants