Merge branch 'main' of github.com:DataDog/datadog-agent into pgimalac…

…/update-go-extended-libs

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v30370116-6cfed421
+      - image: gcr.io/datadoghq/agent-circleci-runner:v31694071-c6e811e7
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

.github/CODEOWNERS

@@ -194,6 +194,7 @@
 /cmd/systray/                           @DataDog/windows-agent
 /cmd/security-agent/                    @DataDog/agent-security
 /cmd/updater/                           @DataDog/fleet
+/cmd/installer/                         @DataDog/fleet
 
 /dev/                                   @DataDog/agent-developer-tools
 /devenv/                                @DataDog/agent-developer-tools
@@ -243,7 +244,7 @@
 /comp/collector @DataDog/agent-metrics-logs
 /comp/core @DataDog/agent-shared-components
 /comp/dogstatsd @DataDog/agent-metrics-logs
-/comp/forwarder @DataDog/agent-shared-components
+/comp/forwarder @DataDog/agent-processing-and-routing
 /comp/languagedetection @DataDog/container-integrations
 /comp/logs @DataDog/agent-metrics-logs
 /comp/metadata @DataDog/agent-shared-components
@@ -265,13 +266,10 @@
 /comp/core/sysprobeconfig @DataDog/ebpf-platform
 /comp/core/tagger @DataDog/container-integrations
 /comp/core/workloadmeta @DataDog/container-integrations
-/comp/forwarder/eventplatform @DataDog/agent-metrics-logs
-/comp/forwarder/eventplatformreceiver @DataDog/agent-metrics-logs
-/comp/forwarder/orchestrator @DataDog/agent-metrics-logs
-/comp/forwarder/orchestrator/orchestratorinterface @DataDog/agent-metrics-logs
 /comp/metadata/packagesigning @DataDog/agent-build-and-releases
 /comp/trace/etwtracer @DataDog/windows-agent
 /comp/etw @DataDog/windows-agent
+/comp/serializer/compression @DataDog/agent-metrics-logs
 # END COMPONENTS
 
 # pkg
@@ -284,12 +282,12 @@
 /pkg/cli/subcommands/clusterchecks      @DataDog/container-integrations
 /pkg/dogstatsd/                         @DataDog/agent-metrics-logs
 /pkg/errors/                            @DataDog/agent-shared-components
-/pkg/forwarder/                         @DataDog/agent-metrics-logs @DataDog/agent-shared-components
+/pkg/forwarder/                         @DataDog/agent-processing-and-routing
 /pkg/gohai                              @DataDog/agent-shared-components
 /pkg/jmxfetch/                          @DataDog/agent-metrics-logs
 /pkg/metadata/                          @DataDog/agent-shared-components
 /pkg/metrics/                           @DataDog/agent-metrics-logs
-/pkg/serializer/                        @DataDog/agent-metrics-logs
+/pkg/serializer/                        @DataDog/agent-processing-and-routing
 /pkg/serverless/                        @DataDog/serverless
 /pkg/serverless/appsec/                 @DataDog/asm-go
 /pkg/status/                            @DataDog/agent-shared-components
@@ -366,7 +364,7 @@
 /pkg/diagnose/connectivity/             @DataDog/agent-shared-components
 /pkg/eventmonitor/                      @DataDog/ebpf-platform @DataDog/agent-security
 /pkg/dynamicinstrumentation/            @DataDog/debugger
-/pkg/epforwarder/                       @DataDog/agent-shared-components @DataDog/agent-metrics-logs
+/pkg/epforwarder/                       @DataDog/agent-processing-and-routing
 /pkg/flare/                             @DataDog/agent-shared-components
 /pkg/flare/*_win.go                     @Datadog/windows-agent
 /pkg/flare/*_windows.go                 @Datadog/windows-agent
@@ -382,9 +380,10 @@
 /pkg/proto/datadog/trace                @DataDog/agent-apm
 /pkg/remoteconfig/                      @DataDog/remote-config
 /pkg/runtime/                           @DataDog/agent-shared-components
-/pkg/serializer/                        @DataDog/agent-metrics-logs
+/pkg/serializer/                        @DataDog/agent-processing-and-routing
 /pkg/tagset/                            @DataDog/agent-shared-components
 /pkg/updater/                           @DataDog/fleet
+/pkg/installer/                         @DataDog/fleet
 /pkg/util/                              @DataDog/agent-shared-components
 /pkg/util/aggregatingqueue              @DataDog/container-integrations
 /pkg/util/cloudproviders/cloudfoundry/  @DataDog/platform-integrations
@@ -414,6 +413,13 @@
 /pkg/logs/launchers/windowsevent        @DataDog/agent-metrics-logs @DataDog/windows-agent
 /pkg/logs/tailers/windowsevent          @DataDog/agent-metrics-logs @DataDog/windows-agent
 /pkg/logs/util/windowsevent             @DataDog/agent-metrics-logs @DataDog/windows-agent
+/pkg/logs/client                        @DataDog/agent-processing-and-routing
+/pkg/logs/diagnostic                    @DataDog/agent-processing-and-routing
+/pkg/logs/message                       @DataDog/agent-processing-and-routing
+/pkg/logs/pipeline                      @DataDog/agent-processing-and-routing
+/pkg/logs/processor                     @DataDog/agent-processing-and-routing
+/pkg/logs/sds                           @DataDog/agent-processing-and-routing
+/pkg/logs/sender                        @DataDog/agent-processing-and-routing
 /pkg/process/                           @DataDog/processes
 /pkg/process/util/address*.go           @DataDog/Networks
 /pkg/process/util/netns*.go             @DataDog/Networks
@@ -498,6 +504,7 @@
 /tasks/                                 @DataDog/agent-developer-tools @DataDog/agent-ci-experience
 /tasks/msi.py                           @DataDog/windows-agent
 /tasks/agent.py                         @DataDog/agent-shared-components
+/tasks/dogstatsd.py                     @DataDog/agent-metrics-logs
 /tasks/update_go.py                     @DataDog/agent-shared-components
 /tasks/unit-tests/update_go_tests.py    @DataDog/agent-shared-components
 /tasks/cluster_agent_cloudfoundry.py    @DataDog/platform-integrations
@@ -508,13 +515,15 @@
 /tasks/kmt.py                           @DataDog/ebpf-platform
 /tasks/kernel_matrix_testing/           @DataDog/ebpf-platform
 /tasks/trace_agent.py                   @DataDog/agent-apm
+/tasks/rtloader.py                      @DataDog/agent-metrics-logs
 /tasks/security_agent.py                @DataDog/agent-security
 /tasks/systray.py                       @DataDog/windows-agent
 /tasks/winbuildscripts/                 @DataDog/windows-agent
 /tasks/windows_resources.py             @DataDog/windows-agent
 /tasks/components.py                    @DataDog/agent-shared-components
 /tasks/components_templates             @DataDog/agent-shared-components
 /tasks/updater.py                       @DataDog/fleet
+/tasks/installer.py                     @DataDog/fleet
 /test/                                  @DataDog/agent-developer-tools
 /test/benchmarks/                       @DataDog/agent-metrics-logs
 /test/benchmarks/kubernetes_state/      @DataDog/container-integrations
@@ -569,6 +578,7 @@
 /test/new-e2e/tests/apm                       @DataDog/agent-apm
 /test/new-e2e/tests/remote-config             @DataDog/remote-config
 /test/new-e2e/tests/updater                   @DataDog/fleet
+/test/new-e2e/tests/installer                 @DataDog/fleet
 /test/system/                                 @DataDog/agent-shared-components
 /test/system/dogstatsd/                       @DataDog/agent-metrics-logs
 /test/benchmarks/apm_scripts/                 @DataDog/agent-apm

.github/workflows/go-update-commenter.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Build full comment
         id: old_versions
         run: |
-          set -euxo pipefail
+          set -euo pipefail
           # build the base of the Github URL to the current commit
           GITHUB_HEAD_URL='${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}'
           {

.github/workflows/serverless-integration.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [amd64, arm64]
-        suite: [metric, appsec, proxy]
+        suite: [metric, trace, appsec, proxy]
     name: ${{ matrix.suite }} on ${{ matrix.architecture }}
     steps:
       - name: Checkout datadog-agent repository

.gitlab-ci.yml

@@ -162,19 +162,19 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_BUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_WINBUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_ARMBUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_NIKOS_BUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_NIKOS_BUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v30370116-6cfed421
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v31694071-c6e811e7
   DATADOG_AGENT_BUILDERS: v28719426-b6a4fd9
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

.gitlab/JOBOWNERS

@@ -47,7 +47,9 @@ agent_dmg*                           @DataDog/agent-build-and-releases
 windows_msi*                         @DataDog/windows-agent
 
 # Packaging
-packaging_oci                        @DataDog/agent-build-and-releases
+agent_oci                            @DataDog/agent-build-and-releases
+updater_deb-*                        @DataDog/agent-build-and-releases
+updater_rpm-*                        @DataDog/agent-build-and-releases
 
 # Testing package deploy
 deploy_deb_testing*                  @DataDog/agent-build-and-releases

.gitlab/common/test_infra_version.yml

@@ -4,4 +4,4 @@ variables:
   # and check the job creating the image to make sure you have the right SHA prefix
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
   # Make sure to update test-infra-definitions version in go.mod as well
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: e9cf37ed9d96
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: e488596ad7f3

.gitlab/deploy_packages/deploy_common.yml

@@ -73,28 +73,3 @@
   variables:
     MAJOR_VERSION: 7
 
-deploy_packages_oci:
-  resource_group: oci_bucket
-  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
-  needs: [ "packaging_oci" ]
-  tags: ["arch:amd64"]
-  stage: deploy_packages
-  before_script:
-    - ls $OMNIBUS_PACKAGE_DIR
-  rules:
-    !reference [.on_deploy]
-  script:
-    - python3 -m pip install -r tasks/libs/requirements-github.txt
-    - set +x
-    - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
-    - export GITHUB_APP_ID=682216
-    - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID --pkey-env=GITHUB_KEY_B64)
-    - export VERSION=$(inv agent.version --url-safe)-1
-    - git config --global credential.helper '!f() { echo username=x-access-token; echo "password=$GH_TOKEN"; };f'
-    - git clone https://github.com/DataDog/datadog-packages /tmp/datadog-packages
-    - cd /tmp/datadog-packages/cmd/datadog-package
-    - go build .
-    - ./datadog-package push registry.ddbuild.io/ci/remote-updates/datadog-agent:${VERSION} ${OMNIBUS_PACKAGE_DIR}/datadog-agent-${MAJOR_VERSION}.*.oci.tar
-  variables:
-    MAJOR_VERSION: 7
-

.gitlab/deploy_packages/include.yml

@@ -8,5 +8,6 @@ include:
   - .gitlab/deploy_packages/cluster_agent_cloudfoundry.yml
   - .gitlab/deploy_packages/deploy_common.yml
   - .gitlab/deploy_packages/nix.yml
+  - .gitlab/deploy_packages/oci.yml
   - .gitlab/deploy_packages/windows.yml
   - .gitlab/deploy_packages/winget.yml

.gitlab/deploy_packages/nix.yml

@@ -218,16 +218,27 @@ deploy_staging_iot_agent:
     - export PACKAGE_VERSION=$(inv agent.version --url-safe --major-version 7)
     - $S3_CP_CMD ./agent $S3_DSD6_URI/linux/iot/agent-$PACKAGE_VERSION --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers full=id=3a6e02b08553fd157ae3fb918945dd1eaae5a1aa818940381ef07a430cf25732
 
-# Remote Updater
-deploy_remote_updater_deb_arm64:
+# Datadog Installer
+deploy_installer_deb_arm64:
   extends: .deploy_packages_deb-7
-  needs: ["updater_deb-arm64"]
+  needs: ["installer_deb-arm64"]
   variables:
     PACKAGE_ARCH: arm64
 
-deploy_remote_updater_deb_amd64:
+deploy_installer_deb_amd64:
   extends: .deploy_packages_deb-7
-  needs: ["updater_deb-amd64"]
+  needs: ["installer_deb-amd64"]
   variables:
     PACKAGE_ARCH: amd64
 
+deploy_installer_rpm_arm64:
+  extends: .deploy_packages_rpm-7
+  needs: ["installer_rpm-arm64"]
+  variables:
+    PACKAGE_ARCH: aarch64
+
+deploy_installer_rpm_amd64:
+  extends: .deploy_packages_rpm-7
+  needs: ["installer_rpm-amd64"]
+  variables:
+    PACKAGE_ARCH: x86_64

.gitlab/deploy_packages/oci.yml

@@ -0,0 +1,37 @@
+---
+
+.deploy_packages_oci:
+  resource_group: oci_bucket
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
+  tags: ["arch:amd64"]
+  stage: deploy_packages
+  rules:
+    !reference [.on_deploy]
+  before_script:
+    - ls $OMNIBUS_PACKAGE_DIR
+  script:
+    - python3 -m pip install -r tasks/libs/requirements-github.txt
+    - set +x
+    - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
+    - export GITHUB_APP_ID=682216
+    - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID --pkey-env=GITHUB_KEY_B64)
+    - export VERSION=$(inv agent.version --url-safe)-1
+    - git config --global credential.helper '!f() { echo username=x-access-token; echo "password=$GH_TOKEN"; };f'
+    - git clone https://github.com/DataDog/datadog-packages /tmp/datadog-packages
+    - cd /tmp/datadog-packages/cmd/datadog-package
+    - go build .
+    - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION} ${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${MAJOR_VERSION}.*.oci.tar
+  variables:
+    MAJOR_VERSION: 7
+
+deploy_agent_oci:
+  extends: ".deploy_packages_oci"
+  needs: [ "agent_oci" ]
+  variables:
+    OCI_PRODUCT: "datadog-agent"
+
+deploy_installer_oci:
+  extends: ".deploy_packages_oci"
+  needs: [ "installer_oci" ]
+  variables:
+    OCI_PRODUCT: "datadog-installer"

.gitlab/e2e/e2e.yml

@@ -287,6 +287,9 @@ new-e2e-updater:
     !reference [.on_updater_or_e2e_changes_or_manual]
   needs:
     - deploy_deb_testing-u7_arm64
+    - deploy_deb_testing-u7_amd64
+    - deploy_rpm_testing-u7_arm64
+    - deploy_rpm_testing-u7_x64
   variables:
     TARGETS: ./tests/updater
     TEAM: fleet

.gitlab/kitchen_deploy/kitchen_deploy.yml

@@ -151,21 +151,38 @@ deploy_deb_testing-a7_arm64:
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-*_7*arm64.deb
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-signing-keys_${DD_PIPELINE_ID}.deb
 
+deploy_deb_testing-u7_amd64:
+  rules:
+    - !reference [.except_no_tests_no_deploy]
+    - !reference [.except_mergequeue]
+    - when: on_success
+  extends:
+    - .deploy_deb_testing-u7
+  needs: ["installer_deb-amd64", "lint_linux-x64"]
+  script:
+    - *setup_apt_signing_key
+    - set +x # make sure we don't output the creds to the build log
+
+    - *setup_signing_keys_package
+
+    - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-x86_64" -m 7 -b $DEB_TESTING_S3_BUCKET -a amd64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-installer*amd64.deb
+    - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-x86_64" -m 7 -b $DEB_TESTING_S3_BUCKET -a amd64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-signing-keys_${DD_PIPELINE_ID}.deb
+
 deploy_deb_testing-u7_arm64:
   rules:
     - !reference [.except_no_tests_no_deploy]
     - !reference [.except_mergequeue]
     - when: on_success
   extends:
     - .deploy_deb_testing-u7
-  needs: ["updater_deb-arm64", "lint_linux-arm64"]
+  needs: ["installer_deb-arm64", "lint_linux-arm64"]
   script:
     - *setup_apt_signing_key
     - set +x # make sure we don't output the creds to the build log
 
     - *setup_signing_keys_package
 
-    - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-updater*arm64.deb
+    - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-installer*arm64.deb
     - echo "$APT_SIGNING_KEY_PASSPHRASE" | deb-s3 upload -c "pipeline-$DD_PIPELINE_ID-arm64" -m 7 -b $DEB_TESTING_S3_BUCKET -a arm64 --sign=$DEB_GPG_KEY_ID --gpg_options="--passphrase-fd 0 --batch --digest-algo SHA512" --preserve_versions --visibility public $OMNIBUS_PACKAGE_DIR/datadog-signing-keys_${DD_PIPELINE_ID}.deb
 
 .deploy_rpm_testing-a6:
@@ -245,6 +262,38 @@ deploy_rpm_testing-a7_arm64:
     - set +x
     - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "testing/pipeline-$DD_PIPELINE_ID/7/aarch64/" -a "aarch64" --sign --metadata-signing-key $RPM_GPG_KEY_ID $OMNIBUS_PACKAGE_DIR/datadog-*-7.*aarch64.rpm
 
+.deploy_rpm_testing-u7:
+  stage: kitchen_deploy
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
+  tags: ["arch:amd64"]
+  rules:
+    - !reference [.except_no_tests_no_deploy]
+    - !reference [.except_mergequeue]
+    - when: on_success
+  variables:
+    DD_PIPELINE_ID: $CI_PIPELINE_ID-u7
+  before_script:
+    - source /root/.bashrc
+    - ls $OMNIBUS_PACKAGE_DIR
+
+deploy_rpm_testing-u7_arm64:
+  extends:
+    - .deploy_rpm_testing-u7
+  needs: ["installer_rpm-arm64", "lint_linux-arm64"]
+  script:
+    - *setup_rpm_signing_key
+    - set +x # make sure we don't output the creds to the build log
+    - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "testing/pipeline-$DD_PIPELINE_ID/7/aarch64/" -a "aarch64" --sign --metadata-signing-key $RPM_GPG_KEY_ID $OMNIBUS_PACKAGE_DIR/datadog-*-7.*aarch64.rpm
+
+deploy_rpm_testing-u7_x64:
+  extends:
+    - .deploy_rpm_testing-u7
+  needs: ["installer_rpm-amd64", "lint_linux-x64"]
+  script:
+    - *setup_rpm_signing_key
+    - set +x # make sure we don't output the creds to the build log
+    - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "testing/pipeline-$DD_PIPELINE_ID/7/x86_64/" -a "x86_64" --sign --metadata-signing-key $RPM_GPG_KEY_ID $OMNIBUS_PACKAGE_DIR/datadog-*-7.*x86_64.rpm
+
 deploy_suse_rpm_testing_x64-a6:
   rules: !reference [.on_kitchen_tests]
   stage: kitchen_deploy

.gitlab/kitchen_testing/new-e2e_testing/windows.yml

@@ -42,6 +42,7 @@
       - E2E_MSI_TEST: TestInstallOpts
       - E2E_MSI_TEST: TestSubServicesOpts/all-subservices
       - E2E_MSI_TEST: TestSubServicesOpts/no-subservices
+      - E2E_MSI_TEST: TestInstallAltDir
 
 # Agent 6
 .new-e2e_windows_a6_x86_64:

.gitlab/package_build/include.yml

@@ -12,7 +12,7 @@
 include:
   - .gitlab/package_build/deb.yml
   - .gitlab/package_build/dmg.yml
-  - .gitlab/package_build/remote_updater.yml
+  - .gitlab/package_build/installer.yml
   - .gitlab/package_build/rpm.yml
   - .gitlab/package_build/suse_rpm.yml
   - .gitlab/package_build/windows.yml