diff --git a/.ddqa/config.toml b/.ddqa/config.toml index 25324ad07625f..eac6d757e5282 100644 --- a/.ddqa/config.toml +++ b/.ddqa/config.toml @@ -215,8 +215,8 @@ github_labels = ["team/container-app"] jira_project = "INPLAT" jira_issue_type = "Task" jira_statuses = ["Selected For Development", "In Progress", "Done"] -github_team = "apm-onboarding" -github_labels = ["team/apm-onboarding"] +github_team = "injection-platform" +github_labels = ["team/injection-platform"] [teams."Agent Release Management"] jira_project = "AGNTR" diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3e18927362ac0..cd9cafea971f8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -368,7 +368,7 @@ /pkg/clusteragent/ @DataDog/container-platform /pkg/clusteragent/autoscaling/ @DataDog/container-integrations /pkg/clusteragent/admission/mutate/autoscaling @DataDog/container-integrations -/pkg/clusteragent/admission/mutate/autoinstrumentation/ @DataDog/container-platform @DataDog/apm-onboarding +/pkg/clusteragent/admission/mutate/autoinstrumentation/ @DataDog/container-platform @DataDog/injection-platform /pkg/clusteragent/orchestrator/ @DataDog/container-app /pkg/clusteragent/telemetry/ @DataDog/apm-trace-storage /pkg/collector/ @DataDog/agent-metrics-logs diff --git a/.gitlab/binary_build/system_probe.yml b/.gitlab/binary_build/system_probe.yml index a12defc7cdb53..5d897fb7f5f3e 100644 --- a/.gitlab/binary_build/system_probe.yml +++ b/.gitlab/binary_build/system_probe.yml @@ -12,7 +12,7 @@ - find "$CI_BUILDS_DIR" ! -path '*DataDog/datadog-agent*' -delete || true # Allow failure, we can't remove parent folders of datadog-agent script: - inv check-go-version - - inv -e system-probe.build --strip-object-files --no-bundle + - inv -e system-probe.build --strip-object-files # fail if references to glibc >= 2.18 - objdump -p $CI_PROJECT_DIR/$SYSTEM_PROBE_BINARIES_DIR/system-probe | egrep 'GLIBC_2\.(1[8-9]|[2-9][0-9])' && exit 1 - inv -e system-probe.save-build-outputs $CI_PROJECT_DIR/sysprobe-build-outputs.tar.xz diff --git a/.gitlab/e2e/e2e.yml b/.gitlab/e2e/e2e.yml index ff1de677932f4..d5a5b7a8ce3f6 100644 --- a/.gitlab/e2e/e2e.yml +++ b/.gitlab/e2e/e2e.yml @@ -24,9 +24,10 @@ - ARM_CLIENT_SECRET=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_TESTS_AZURE_CLIENT_SECRET) || exit $?; export ARM_CLIENT_SECRET - ARM_TENANT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_TESTS_AZURE_TENANT_ID) || exit $?; export ARM_TENANT_ID - ARM_SUBSCRIPTION_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_TESTS_AZURE_SUBSCRIPTION_ID) || exit $?; export ARM_SUBSCRIPTION_ID - # Setup GCP credentials. https://www.pulumi.com/registry/packages/gcp/installation-configuration/ + # Setup GCP credentials. https://www.pulumi.com/registry/packages/gcp/service-account/ # The service account is called `agent-e2e-tests` - - GOOGLE_CREDENTIALS=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_TESTS_GCP_CREDENTIALS) || exit $?; export GOOGLE_CREDENTIALS + - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_TESTS_GCP_CREDENTIALS > ~/gcp-credentials.json || exit $? + - export GOOGLE_APPLICATION_CREDENTIALS=~/gcp-credentials.json # Generate external links to CI VISIBILITY, used by artifacts:reports:annotations - inv -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH variables: @@ -656,4 +657,3 @@ new-e2e-eks-cleanup-on-failure: - !reference [.except_mergequeue] - when: always allow_failure: true - diff --git a/.gitlab/integration_test/otel.yml b/.gitlab/integration_test/otel.yml index 27289d54b395f..aecb75afd9917 100644 --- a/.gitlab/integration_test/otel.yml +++ b/.gitlab/integration_test/otel.yml @@ -36,7 +36,7 @@ docker_image_build_otel: - cp test/integration/docker/otel_agent_build_tests.py /tmp/otel-ci/ - wget https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O /usr/bin/yq && chmod +x /usr/bin/yq - - export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.otelcol_version) + - export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.version) - yq w -i /tmp/otel-ci/manifest.yaml "receivers[+] gomod" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver ${OTELCOL_VERSION}" - yq w -i /tmp/otel-ci/manifest.yaml "processors[+] gomod" @@ -58,14 +58,14 @@ docker_image_build_otel: ddflare_extension_ocb_build: stage: integration_test - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES + image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES tags: ["arch:amd64"] needs: ["go_deps"] before_script: - !reference [.retrieve_linux_go_deps] - mkdir -p /tmp/otel-ci - cp test/otel/testdata/* /tmp/otel-ci/ - - wget -O /tmp/otel-ci/ocb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/cmd%2Fbuilder%2Fv0.111.0/ocb_0.111.0_linux_amd64 + - wget -O /tmp/otel-ci/ocb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/cmd%2Fbuilder%2Fv0.113.0/ocb_0.113.0_linux_amd64 - chmod +x /tmp/otel-ci/ocb script: - echo 'Building collector with OCB and test ddflare extension' diff --git a/.run/Build process-agent.run.xml b/.run/Build process-agent.run.xml index 83f150ffea675..86a692091e442 100644 --- a/.run/Build process-agent.run.xml +++ b/.run/Build process-agent.run.xml @@ -12,7 +12,7 @@