Merge remote-tracking branch 'origin/main' into stephen/http2_metrics

Author: StephenWakely

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v57244455-5b0a495d
+      - image: gcr.io/datadoghq/agent-circleci-runner:v58028397-44fec785
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent
@@ -61,15 +61,15 @@ jobs:
       - run:
           name: check go version
           command: |
-            inv -e check-go-version
+            dda inv -e check-go-version
       - run:
           name: grab go deps
           command: |
-            inv -e deps
+            dda inv -e deps
       - run:
           name: install go tooling
           command: |
-            inv -e install-tools
+            dda inv -e install-tools
       - save_cache:
           <<: *save_deps
           paths:
@@ -87,7 +87,7 @@ jobs:
       - setup_remote_docker
       - run:
           name: run integration tests
-          command: inv -e integration-tests --race --remote-docker
+          command: dda inv -e integration-tests --race --remote-docker
 
   docker_tests:
     <<: *job_template
@@ -97,7 +97,7 @@ jobs:
       - setup_remote_docker
       - run:
           name: run docker image tests
-          command: inv -e docker.test
+          command: dda inv -e docker.test
 
 workflows:
   version: 2

.copyright-overrides.yml

@@ -295,7 +295,7 @@ go.opentelemetry.io/otel/semconv/internal: Copyright The OpenTelemetry Authors
 go.opentelemetry.io/otel/semconv/v1.12.0: Copyright The OpenTelemetry Authors
 golang.org/x/crypto/chacha20poly1305: Copyright (c) 2009 The Go Authors. All rights reserved
 
-# Not added by inv generate-licenses but spotted by inv-e lint-licenses
+# Not added by `dda inv generate-licenses` but spotted by `dda inv -e lint-licenses`
 github.com/AdaLogics/go-fuzz-headers: AdamKorcz <[email protected]>|AdamKorcz <[email protected]>|Sebastiaan van Stijn <[email protected]>|AdaLogics <[email protected]>|Kazuyoshi Kato <[email protected]>
 github.com/AdamKorcz/go-118-fuzz-build/testing: AdamKorcz <[email protected]>|AdamKorcz <[email protected]>|John Howard <[email protected]>|Kazuyoshi Kato <[email protected]>|Khaled Yakdan <[email protected]>|AdamKorcz <[email protected]>|Sebastiaan van Stijn <[email protected]>
 github.com/Microsoft/go-winio/pkg/bindfilter: Copyright (c) 2015 Microsoft
@@ -395,4 +395,7 @@ github.com/jaegertracing/jaeger-idl/model/v1: ["Copyright (c) 2019 The Jaeger Au
 github.com/jaegertracing/jaeger-idl/proto-gen/api_v2: ["Copyright (c) 2019 The Jaeger Authors.", "Copyright (c) 2017 Uber Technologies, Inc."]
 github.com/jaegertracing/jaeger-idl/thrift-gen/agent: ["Copyright (c) 2019 The Jaeger Authors.", "Copyright (c) 2017 Uber Technologies, Inc."]
 github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger: ["Copyright (c) 2019 The Jaeger Authors.", "Copyright (c) 2017 Uber Technologies, Inc."]
-github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore: ["Copyright (c) 2019 The Jaeger Authors.", "Copyright (c) 2017 Uber Technologies, Inc."]
+github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore: ["Copyright (c) 2019 The Jaeger Authors.", "Copyright (c) 2017 Uber Technologies, Inc."]
+
+# https://github.com/bhmj/xpression/blob/master/LICENCE
+github.com/bhmj/xpression: Copyright 2021-2022 Michael Gurov (github.com/bhmj)

.dda/version

@@ -0,0 +1 @@
+0.5.0

.github/CODEOWNERS

@@ -62,7 +62,7 @@
 /.github/workflows/go-update-commenter.yml           @DataDog/agent-runtimes
 /.github/workflows/update_dependencies.yml           @DataDog/agent-runtimes
 /.github/workflows/buildimages-update.yml            @DataDog/agent-delivery @DataDog/agent-runtimes
-/.github/workflows/collector-generate-and-update.yml @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/.github/workflows/collector-generate-and-update.yml @DataDog/opentelemetry-agent
 
 /.run                                                @DataDog/agent-devx-loops
 /.run/docker/                                        @DataDog/container-integrations @DataDog/container-platform
@@ -102,7 +102,7 @@
 /.gitlab/integration_test/dogstatsd.yml              @DataDog/agent-devx-infra @DataDog/agent-metric-pipelines
 /.gitlab/integration_test/include.yml                @DataDog/agent-devx-infra
 /.gitlab/integration_test/linux.yml                  @DataDog/agent-devx-infra
-/.gitlab/integration_test/otel.yml                   @DataDog/agent-devx-infra @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/.gitlab/integration_test/otel.yml                   @DataDog/agent-devx-infra @DataDog/opentelemetry-agent
 /.gitlab/internal_image_deploy/internal_image_deploy.yml            @DataDog/agent-delivery
 /.gitlab/internal_kubernetes_deploy/include.yml                     @DataDog/agent-devx-infra
 /.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml  @DataDog/agent-delivery
@@ -119,7 +119,7 @@
 /.gitlab/binary_build/cluster_agent_cloudfoundry.yml @DataDog/agent-integrations @DataDog/agent-delivery
 /.gitlab/binary_build/cluster_agent.yml              @DataDog/container-integrations @DataDog/agent-delivery
 /.gitlab/binary_build/fakeintake.yml                 @DataDog/agent-devx-loops
-/.gitlab/binary_build/otel_agent.yml                 @DataDog/opentelemetry @DataDog/opentelemetry-agent @DataDog/agent-delivery
+/.gitlab/binary_build/otel_agent.yml                 @DataDog/opentelemetry-agent @DataDog/agent-delivery
 /.gitlab/binary_build/serverless.yml                 @DataDog/serverless @Datadog/serverless-aws @DataDog/agent-delivery
 /.gitlab/binary_build/system_probe.yml               @DataDog/ebpf-platform @DataDog/agent-delivery
 /.gitlab/binary_build/windows.yml                    @DataDog/agent-delivery @DataDog/windows-agent
@@ -226,7 +226,7 @@
 /cmd/cluster-agent/api/v1/cloudfoundry_metadata.go        @DataDog/agent-integrations
 /cmd/cws-instrumentation/               @DataDog/agent-security
 /cmd/dogstatsd/                         @DataDog/agent-metric-pipelines
-/cmd/otel-agent/                        @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/cmd/otel-agent/                        @DataDog/opentelemetry-agent
 /cmd/process-agent/                     @DataDog/container-intake
 /cmd/serverless/                        @DataDog/serverless @Datadog/serverless-aws
 /cmd/serverless-init/                   @DataDog/serverless
@@ -248,6 +248,7 @@
 /cmd/system-probe/main_windows*.go      @DataDog/windows-kernel-integrations
 /cmd/system-probe/api/client/client_windows.go    @DataDog/windows-kernel-integrations
 /cmd/system-probe/api/server/listener_windows.go    @DataDog/windows-kernel-integrations
+/cmd/system-probe/subcommands/runtime/  @DataDog/agent-security
 /cmd/systray/                           @DataDog/windows-agent
 /cmd/security-agent/                    @DataDog/agent-security
 /cmd/installer/                         @DataDog/fleet @DataDog/windows-agent
@@ -259,7 +260,7 @@
 /Dockerfiles/agent/entrypoint.d.windows/ @DataDog/container-integrations @DataDog/windows-agent
 /Dockerfiles/agent/entrypoint.ps1        @DataDog/container-integrations @DataDog/windows-agent
 /Dockerfiles/agent/windows/              @DataDog/container-integrations @DataDog/windows-agent
-/Dockerfiles/agent-ot                    @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/Dockerfiles/agent-ot                    @DataDog/opentelemetry-agent
 /Dockerfiles/agent/bouncycastle-fips     @DataDog/agent-metric-pipelines
 
 /docs/                                  @DataDog/agent-devx-loops
@@ -283,16 +284,21 @@
 /Makefile.trace                         @DataDog/agent-apm
 
 /omnibus/                               @DataDog/agent-delivery
-/omnibus/python-scripts/                @DataDog/agent-runtimes @DataDog/windows-agent
+/omnibus/package-scripts/agent-rpm/     @DataDog/agent-delivery @DataDog/fleet
+/omnibus/package-scripts/agent-deb/     @DataDog/agent-delivery @DataDog/fleet
+/omnibus/package-scripts/installer-deb/ @DataDog/agent-delivery @DataDog/fleet
+/omnibus/package-scripts/installer-rpm/ @DataDog/agent-delivery @DataDog/fleet
+/omnibus/python-scripts/                @DataDog/agent-integrations @DataDog/windows-agent
 /omnibus/config/patches/openscap/                         @DataDog/agent-cspm
 /omnibus/config/software/datadog-agent-integrations-*.rb  @DataDog/agent-integrations
 /omnibus/config/software/datadog-security-agent*.rb       @Datadog/agent-security @DataDog/agent-delivery
 /omnibus/config/software/openscap.rb                      @DataDog/agent-cspm
 /omnibus/config/software/sds.rb                           @DataDog/agent-log-pipelines
 /omnibus/config/software/snmp-traps.rb                    @DataDog/ndm-core
+/omnibus/config/templates/init-scripts-agent/             @DataDog/agent-delivery @DataDog/fleet
 /omnibus/resources/*/msi/                                 @DataDog/windows-agent
 
-# The following is managed by `inv lint-components` -- DO NOT EDIT
+# The following is managed by `dda inv lint-components` -- DO NOT EDIT
 # BEGIN COMPONENTS
 /comp @DataDog/agent-runtimes
 /comp/agent @DataDog/agent-runtimes
@@ -308,7 +314,7 @@
 /comp/ndmtmp @DataDog/ndm-core
 /comp/netflow @DataDog/ndm-integrations
 /comp/networkpath @DataDog/Networks
-/comp/otelcol @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/comp/otelcol @DataDog/opentelemetry-agent
 /comp/process @DataDog/container-intake
 /comp/remote-config @DataDog/remote-config
 /comp/snmptraps @DataDog/ndm-core
@@ -336,7 +342,6 @@
 /comp/forwarder/eventplatform @DataDog/agent-log-pipelines
 /comp/forwarder/eventplatformreceiver @DataDog/agent-log-pipelines
 /comp/forwarder/orchestrator @DataDog/agent-log-pipelines
-/comp/logs/auditor @DataDog/agent-metrics-logs
 /comp/metadata/haagent @DataDog/ndm-core
 /comp/metadata/hostgpu @DataDog/ebpf-platform
 /comp/metadata/packagesigning @DataDog/agent-delivery
@@ -380,17 +385,20 @@
 /pkg/serverless/                        @DataDog/serverless @Datadog/serverless-aws
 /pkg/serverless/appsec/                 @DataDog/asm-go
 /pkg/status/                            @DataDog/agent-configuration
+/pkg/status/health                      @DataDog/agent-runtimes
+/pkg/status/collector                   @DataDog/agent-metric-pipelines
+/pkg/status/clusteragent                @DataDog/container-platform
 /pkg/telemetry/                         @DataDog/agent-runtimes
 /pkg/telemetry/stat_gauge_wrapper.go    @DataDog/ebpf-platform
 /pkg/telemetry/stat_counter_wrapper.go  @DataDog/ebpf-platform
 /pkg/version/                           @DataDog/agent-runtimes
 /pkg/obfuscate/                         @DataDog/agent-apm
 /pkg/trace/                             @DataDog/agent-apm
-/pkg/trace/api/otlp*.go                 @DataDog/opentelemetry @DataDog/opentelemetry-agent
-/pkg/trace/traceutil/otel*.go           @DataDog/opentelemetry @DataDog/opentelemetry-agent
-/pkg/trace/stats/                       @DataDog/agent-apm @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/pkg/trace/api/otlp*.go                 @DataDog/opentelemetry-agent
+/pkg/trace/traceutil/otel*.go           @DataDog/opentelemetry-agent
+/pkg/trace/stats/                       @DataDog/agent-apm @DataDog/opentelemetry-agent
 /pkg/trace/telemetry/                   @DataDog/apm-trace-storage
-/pkg/trace/transform/                   @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/pkg/trace/transform/                   @DataDog/opentelemetry-agent
 /comp/core/autodiscovery/listeners/           @DataDog/container-platform
 /comp/core/autodiscovery/listeners/cloudfoundry*.go  @DataDog/agent-integrations
 /comp/core/autodiscovery/listeners/snmp*.go   @DataDog/ndm-core
@@ -612,7 +620,7 @@
 /tasks/winbuildscripts/                 @DataDog/windows-agent
 /tasks/winbuild.py                      @DataDog/windows-agent
 /tasks/windows_resources.py             @DataDog/windows-agent
-/tasks/collector.py                     @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/tasks/collector.py                     @DataDog/opentelemetry-agent
 /tasks/components.py                    @DataDog/agent-runtimes
 /tasks/components_templates             @DataDog/agent-runtimes
 /tasks/libs/ciproviders/                @DataDog/agent-devx-infra
@@ -627,7 +635,7 @@
 /test/benchmarks/                       @DataDog/agent-metric-pipelines
 /test/benchmarks/kubernetes_state/      @DataDog/container-integrations
 /test/integration/                      @DataDog/container-integrations
-/test/integration/docker/otel_agent_build_tests.py @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/test/integration/docker/otel_agent_build_tests.py @DataDog/opentelemetry-agent
 /test/integration/serverless            @DataDog/serverless @Datadog/serverless-aws
 /test/integration/serverless_perf       @DataDog/serverless @Datadog/serverless-aws
 /test/fakeintake/                             @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
@@ -657,7 +665,7 @@
 /test/new-e2e/tests/npm                       @DataDog/Networks
 /test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-kernel-integrations
 /test/new-e2e/tests/orchestrator              @DataDog/container-app
-/test/new-e2e/tests/otel                      @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/test/new-e2e/tests/otel                      @DataDog/opentelemetry-agent
 /test/new-e2e/tests/process                   @DataDog/container-intake
 /test/new-e2e/tests/sysprobe-functional     @DataDog/windows-kernel-integrations
 /test/new-e2e/tests/security-agent-functional     @DataDog/windows-kernel-integrations @DataDog/agent-security
@@ -669,7 +677,7 @@
 /test/new-e2e/tests/installer                 @DataDog/fleet @DataDog/windows-agent
 /test/new-e2e/tests/installer/script          @DataDog/fleet @DataDog/data-jobs-monitoring
 /test/new-e2e/tests/gpu                       @Datadog/ebpf-platform
-/test/otel/                                   @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/test/otel/                                   @DataDog/opentelemetry-agent
 /test/static/                                 @DataDog/agent-delivery
 /test/system/                                 @DataDog/agent-runtimes
 /test/system/dogstatsd/                       @DataDog/agent-metric-pipelines

.github/actions/install-dda/action.yml

@@ -0,0 +1,25 @@
+name: Install dda
+description: Installs the defined version of dda
+inputs:
+  version:
+    description: The version of dda to install
+    required: false
+    default: ""
+  features:
+    description: A space-separated list of features to install
+    required: false
+    default: ""
+
+runs:
+  using: composite
+  steps:
+  - name: Set version
+    id: set-version
+    run: echo "version=$(cat .dda/version)" >> $GITHUB_OUTPUT
+    shell: bash
+
+  - name: Install dda
+    uses: DataDog/datadog-agent-dev@11330223ee0cf7aa176261596945c071e1d9fbb7
+    with:
+      version: ${{ inputs.version || steps.set-version.outputs.version }}
+      features: ${{ inputs.features }}

.github/dependabot.yaml

@@ -18,7 +18,7 @@ updates:
       - dependency-name: github.com/DataDog/datadog-agent/*
       # Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
       - dependency-name: golang.org/x/*
-      # OpenTelemetry collector packages need to be updated with inv rather than dependabot
+      # OpenTelemetry collector packages need to be updated with `dda inv` rather than dependabot
       - dependency-name: go.opentelemetry.io/collector/*
       - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/*
     schedule:
@@ -53,7 +53,7 @@ updates:
       - dependency-name: github.com/mailru/easyjson
       # Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
       - dependency-name: golang.org/x/*
-      # OpenTelemetry collector packages need to be updated with inv rather than dependabot
+      # OpenTelemetry collector packages need to be updated with `dda inv` rather than dependabot
       - dependency-name: go.opentelemetry.io/collector/*
       - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/*
     schedule:
@@ -218,3 +218,7 @@ updates:
       - changelog/no-changelog
     schedule:
       interval: weekly
+    ignore:
+      - dependency-name: org.bouncycaslte:*
+        # Ignore preview versions
+        versions: [ "[2.1,)" ]

.github/workflows/add_dependabot_pr_to_mq.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       # Use a token as only the github App can push to the merge queue
-      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+      - uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
         id: app-token
         with:
           app-id: ${{ vars.DD_GITHUB_TOKEN_GENERATOR_APP_ID }}

.github/workflows/add_milestone.yml

@@ -29,21 +29,13 @@ jobs:
       - name: Get repo current milestone
         id: current-milestone
         run: |
-          if [[ ${GITHUB_REF##*/} =~ ^7\.[0-9]+\.[0-9]+$ ]]; then
-            # If we're on a release branch, set the milestone to the latest release milestone found.
-            MILESTONE=$(gh release list | grep -o $(echo ${GITHUB_REF##*/} | sed 's/x/[0-9]*/g') | sort -uV | tail -1)
-            if [ -z "$MILESTONE" ]; then
-              echo "Error: Couldn't get the latest release milestone from Github."
-              exit 1
-            fi
-          else
-            # Else use the current_milestone field in the release.json file.
-            MILESTONE=$(cat release.json | jq -r .current_milestone)
-            if [ -z "$MILESTONE" ]; then
-              echo "Error: Couldn't find the current_milestone field in the release.json file."
-              exit 1
-            fi
+          # Use the current_milestone field in the release.json file.
+          MILESTONE=$(cat release.json | jq -r .current_milestone)
+          if [ -z "$MILESTONE" ]; then
+            echo "Error: Couldn't find the current_milestone field in the release.json file."
+            exit 1
           fi
+
           if [[ ! $MILESTONE =~ ^7\.[0-9]+\.[0-9]+$ ]]; then
             echo "Error: Malformed milestone $MILESTONE. It should be of the form '7.x.y'."
             exit 1

.github/workflows/ask_dependabot_pr_review.yml

@@ -27,13 +27,15 @@ jobs:
         with:
           python-version-file: .python-version
           cache: 'pip'
-          cache-dependency-path: '**/requirements*.txt'
+          cache-dependency-path: '.dda/version'
+
+      - name: Install dda
+        uses: ./.github/actions/install-dda
+        with:
+          features: legacy-tasks
 
-      - name: Install dependencies
-        run: pip install -r requirements.txt -r tasks/requirements.txt
-      
       # Use a token so that the ask-review workflow is triggered
-      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+      - uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
         id: app-token
         with:
           app-id: ${{ vars.DD_GITHUB_TOKEN_GENERATOR_APP_ID }}
@@ -43,4 +45,4 @@ jobs:
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: inv -e issue.add-reviewers -p $PR_NUMBER
+        run: dda inv -e issue.add-reviewers -p $PR_NUMBER