Skip to content

Commit f0a9721

Browse files
Merge branch 'main' into jose/disk_feature_parity
2 parents 7728bac + 1cf7a6f commit f0a9721

File tree

687 files changed

+17203
-18152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

687 files changed

+17203
-18152
lines changed

.ddqa/config.toml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ global_config_source = "aHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL0RhdGFEb2cv
22
qa_statuses = ["To Do", "In Progress", "Done"]
33
ignored_labels = ["qa/done", "qa/no-code-change"]
44

5-
[teams."Agent Metrics Logs"]
6-
jira_project = "AMLII"
7-
jira_issue_type = "Task"
8-
jira_statuses = ["To Do", "In Progress", "Done"]
9-
github_team = "agent-metrics-logs"
10-
github_labels = ["team/agent-metrics-logs"]
11-
exclude_members = ["olivielpeau"]
12-
135
[teams."Agent Log Pipelines"]
146
jira_project = "AGNTLOG"
157
jira_issue_type = "Task"
@@ -26,14 +18,6 @@ github_team = "agent-metric-pipelines"
2618
github_labels = ["team/agent-metric-pipelines"]
2719
exclude_members = [""]
2820

29-
[teams."Agent Processing and Routing"]
30-
jira_project = "APR"
31-
jira_issue_type = "Task"
32-
jira_statuses = ["To Do", "In Progress", "Done"]
33-
github_team = "agent-processing-and-routing"
34-
github_labels = ["team/agent-processing-and-routing"]
35-
exclude_members = []
36-
3721
[teams."Agent Runtimes"]
3822
jira_project = "AGENTRUN"
3923
jira_issue_type = "QA"

.github/CODEOWNERS

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
/repository.datadog.yml @DataDog/agent-devx
4343
/generate_tools.go @DataDog/agent-devx
4444
/service.datadog.yaml @DataDog/agent-delivery
45+
/static-analysis.datadog.yml @DataDog/agent-devx
4546

4647
/modules.yml @DataDog/agent-runtimes
4748
# if go.work changes then either .go-version or modules.yml changed too, so ASC might as well own it
@@ -120,6 +121,8 @@
120121
/.gitlab/binary_build/system_probe.yml @DataDog/ebpf-platform @DataDog/agent-delivery
121122
/.gitlab/binary_build/windows.yml @DataDog/agent-delivery @DataDog/windows-agent
122123

124+
/.gitlab/source_test/codeql_scan.yml @DataDog/sdlc-security
125+
123126
/.gitlab/benchmarks/ @DataDog/agent-devx @DataDog/apm-ecosystems-performance @DataDog/agent-apm
124127

125128
/.gitlab/deploy_containers/ @DataDog/container-integrations @DataDog/agent-delivery
@@ -584,8 +587,18 @@
584587
/pkg/snmp/ @DataDog/ndm-core
585588
/pkg/tagger/ @DataDog/container-platform
586589
/pkg/windowsdriver/ @DataDog/windows-kernel-integrations
587-
/comp/core/workloadmeta/collectors/internal/cloudfoundry @DataDog/agent-integrations
588-
/comp/core/workloadmeta/collectors/internal/nvml @DataDog/ebpf-platform
590+
/comp/core/workloadmeta/collectors/internal/cloudfoundry @DataDog/agent-integrations
591+
/comp/core/workloadmeta/collectors/internal/containerd @DataDog/container-platform @DataDog/container-integrations
592+
/comp/core/workloadmeta/collectors/internal/crio @DataDog/container-platform @DataDog/container-integrations
593+
/comp/core/workloadmeta/collectors/internal/docker @DataDog/container-platform @DataDog/container-integrations
594+
/comp/core/workloadmeta/collectors/internal/ecs @DataDog/container-platform @DataDog/container-integrations
595+
/comp/core/workloadmeta/collectors/internal/ecsfargate @DataDog/container-platform @DataDog/container-integrations
596+
/comp/core/workloadmeta/collectors/internal/kubeapiserver @DataDog/container-platform @DataDog/container-integrations
597+
/comp/core/workloadmeta/collectors/internal/kubelet @DataDog/container-platform @DataDog/container-integrations
598+
/comp/core/workloadmeta/collectors/internal/kubemetadata @DataDog/container-platform @DataDog/container-integrations
599+
/comp/core/workloadmeta/collectors/internal/nvml @DataDog/ebpf-platform
600+
/comp/core/workloadmeta/collectors/internal/podman @DataDog/container-platform @DataDog/container-integrations
601+
/comp/core/tagger/collectors @DataDog/container-platform @DataDog/container-integrations
589602
/pkg/sbom/ @DataDog/agent-security @DataDog/container-integrations
590603
/pkg/networkpath/ @DataDog/Networks
591604
/pkg/collector/corechecks/networkpath/ @DataDog/Networks
@@ -693,6 +706,7 @@
693706
/test/system/dogstatsd/ @DataDog/agent-metric-pipelines
694707
/test/benchmarks/apm_scripts/ @DataDog/agent-apm
695708
/test/regression/ @DataDog/single-machine-performance
709+
/test/regression/cases/docker_containers* @DataDog/single-machine-performance @DataDog/container-integrations
696710

697711
/tools/ @DataDog/agent-devx
698712
/tools/ci @DataDog/agent-devx

.gitlab-ci.yml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -169,45 +169,45 @@ variables:
169169
# To use images from datadog-agent-buildimages dev branches, set the corresponding
170170
# SUFFIX variable to _test_only
171171
DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
172-
DATADOG_AGENT_BUILDIMAGES: v62029117-1ba50f31
172+
DATADOG_AGENT_BUILDIMAGES: v62994096-9c8f38f2
173173
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
174-
DATADOG_AGENT_WINBUILDIMAGES: v62029117-1ba50f31
174+
DATADOG_AGENT_WINBUILDIMAGES: v62994096-9c8f38f2
175175
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
176-
DATADOG_AGENT_ARMBUILDIMAGES: v62029117-1ba50f31
176+
DATADOG_AGENT_ARMBUILDIMAGES: v62994096-9c8f38f2
177177
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
178-
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v62029117-1ba50f31
178+
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v62994096-9c8f38f2
179179
# New images to enable different version per image - not used yet
180-
CI_IMAGE_BTF_GEN: v62029117-1ba50f31
180+
CI_IMAGE_BTF_GEN: v62994096-9c8f38f2
181181
CI_IMAGE_BTF_GEN_SUFFIX: ""
182-
CI_IMAGE_DEB_X64: v62029117-1ba50f31
182+
CI_IMAGE_DEB_X64: v62994096-9c8f38f2
183183
CI_IMAGE_DEB_X64_SUFFIX: ""
184-
CI_IMAGE_DEB_ARM64: v62029117-1ba50f31
184+
CI_IMAGE_DEB_ARM64: v62994096-9c8f38f2
185185
CI_IMAGE_DEB_ARM64_SUFFIX: ""
186-
CI_IMAGE_DEB_ARMHF: v62029117-1ba50f31
186+
CI_IMAGE_DEB_ARMHF: v62994096-9c8f38f2
187187
CI_IMAGE_DEB_ARMHF_SUFFIX: ""
188-
CI_IMAGE_DD_AGENT_TESTING: v62029117-1ba50f31
188+
CI_IMAGE_DD_AGENT_TESTING: v62994096-9c8f38f2
189189
CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
190-
CI_IMAGE_DOCKER_X64: v62029117-1ba50f31
190+
CI_IMAGE_DOCKER_X64: v62994096-9c8f38f2
191191
CI_IMAGE_DOCKER_X64_SUFFIX: ""
192-
CI_IMAGE_DOCKER_ARM64: v62029117-1ba50f31
192+
CI_IMAGE_DOCKER_ARM64: v62994096-9c8f38f2
193193
CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
194-
CI_IMAGE_GITLAB_AGENT_DEPLOY: v62029117-1ba50f31
194+
CI_IMAGE_GITLAB_AGENT_DEPLOY: v62994096-9c8f38f2
195195
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
196-
CI_IMAGE_LINUX_GLIBC_2_17_X64: v62029117-1ba50f31
196+
CI_IMAGE_LINUX_GLIBC_2_17_X64: v62994096-9c8f38f2
197197
CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
198-
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v62029117-1ba50f31
198+
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v62994096-9c8f38f2
199199
CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
200-
CI_IMAGE_SYSTEM_PROBE_X64: v62029117-1ba50f31
200+
CI_IMAGE_SYSTEM_PROBE_X64: v62994096-9c8f38f2
201201
CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
202-
CI_IMAGE_SYSTEM_PROBE_ARM64: v62029117-1ba50f31
202+
CI_IMAGE_SYSTEM_PROBE_ARM64: v62994096-9c8f38f2
203203
CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
204-
CI_IMAGE_RPM_X64: v62029117-1ba50f31
204+
CI_IMAGE_RPM_X64: v62994096-9c8f38f2
205205
CI_IMAGE_RPM_X64_SUFFIX: ""
206-
CI_IMAGE_RPM_ARM64: v62029117-1ba50f31
206+
CI_IMAGE_RPM_ARM64: v62994096-9c8f38f2
207207
CI_IMAGE_RPM_ARM64_SUFFIX: ""
208-
CI_IMAGE_RPM_ARMHF: v62029117-1ba50f31
208+
CI_IMAGE_RPM_ARMHF: v62994096-9c8f38f2
209209
CI_IMAGE_RPM_ARMHF_SUFFIX: ""
210-
CI_IMAGE_WIN_LTSC2022_X64: v62029117-1ba50f31
210+
CI_IMAGE_WIN_LTSC2022_X64: v62994096-9c8f38f2
211211
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
212212

213213
DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
@@ -264,9 +264,6 @@ variables:
264264
DD_PKG_VERSION: "latest"
265265
PIPELINE_KEY_ALIAS: "alias/ci_datadog-agent_pipeline-key"
266266

267-
# Job cloning strategy
268-
OVERRIDE_GIT_STRATEGY: "s3"
269-
270267
# Job stage attempts (see https://docs.gitlab.com/ee/ci/runners/configure_runners.html#job-stages-attempts)
271268
ARTIFACT_DOWNLOAD_ATTEMPTS: 2
272269
EXECUTOR_JOB_SECTION_ATTEMPTS: 2
@@ -276,7 +273,6 @@ variables:
276273
FF_SCRIPT_SECTIONS: 1 # Prevent multiline scripts log collapsing, see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/3392
277274
FF_KUBERNETES_HONOR_ENTRYPOINT: true # Honor the entrypoint in the Docker image when running Kubernetes jobs
278275
FF_TIMESTAMPS: true
279-
FF_USE_FASTZIP: true
280276

281277
#
282278
# Condition mixins for simplification of rules

.gitlab/.ci-linters.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ job-owners:
6565
- build_otel_agent_binary_arm64
6666
- build_otel_agent_binary_x64
6767
- cancel-prev-pipelines
68-
- clone
6968
- close_failing_tests_stale_issues
7069
- compute_gitlab_ci_config
7170
- deploy_cluster_agent_cloudfoundry

.gitlab/.pre/clone.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.gitlab/.pre/include.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
# Define preliminary jobs, which can start as soon as possible
33

44
include:
5-
- .gitlab/.pre/clone.yml
65
- .gitlab/.pre/cancel-prev-pipelines.yml
76
- .gitlab/.pre/ci_configuration.yml

.gitlab/JOBOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,8 @@ single_machine_performance* @DataDog/single-machine-performance
170170
# Dependency Security
171171
software_composition_analysis* @DataDog/sdlc-security
172172

173+
# CodeQL
174+
run_codeql_scan @DataDog/sdlc-security
175+
173176
# Experiment systemd units
174177
validate_experiment_systemd_units @DataDog/fleet

.gitlab/common/macos.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,39 @@
1919
2020
.select_python_env_commands:
2121
# Select the virtualenv using the current Python version. Create it if it doesn't exist.
22-
- PYTHON_VERSION=$(python3 --version | awk '{print $2}')
22+
- |
23+
export PATH="$(pyenv root)/shims:$PATH"
24+
eval "$(pyenv init -)"
25+
eval "$(pyenv virtualenv-init -)"
26+
- PYTHON_VERSION=3.12.6
2327
- VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
2428
- VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
2529
- echo "Using Python $PYTHON_VERSION..."
2630
- |
2731
# Check if the virtual environment directory exists
2832
if [ ! -d "$VENV_PATH" ]; then
33+
# Install target python if necessary
34+
if [ ! -d "$(pyenv root)/versions/$PYTHON_VERSION" ]; then
35+
echo "Installing Python $PYTHON_VERSION..."
36+
pyenv install "$PYTHON_VERSION"
37+
fi
38+
2939
echo "Creating virtual environment '$VENV_NAME'..."
3040
pyenv virtualenv "$PYTHON_VERSION" "$VENV_NAME"
3141
else
3242
echo "Virtual environment '$VENV_NAME' already exists. Skipping creation."
3343
fi
3444
- pyenv activate $VENV_NAME
3545

46+
.install_python_dependencies:
47+
# Python 3.12 changes default behavior how packages are installed.
48+
# In particular, --break-system-packages command line option is
49+
# required to use the old behavior or use a virtual env. https://github.com/actions/runner-images/issues/8615
50+
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat .dda/version)" --break-system-packages
51+
- pyenv rehash
52+
- python3 -m dda self dep sync -f legacy-tasks
53+
- pyenv rehash
54+
3655
.vault_login:
3756
# Point the CLI to our internal vault
3857
- export VAULT_ADDR=https://vault.us1.ddbuild.io
@@ -51,16 +70,10 @@
5170
export GOPATH=$GOROOT
5271
# Selecting the current Python version
5372
- !reference [.select_python_env_commands]
73+
- !reference [.install_python_dependencies]
5474
# List Python and Go existing environments and their disk space
5575
- !reference [.list_go_versions_commands]
5676
- !reference [.list_python_versions_commands]
57-
# Installing the job dependencies
58-
# Python 3.12 changes default behavior how packages are installed.
59-
# In particular, --break-system-packages command line option is
60-
# required to use the old behavior or use a virtual env. https://github.com/actions/runner-images/issues/8615
61-
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat .dda/version)" --break-system-packages
62-
- python3 -m dda self dep sync -f legacy-tasks
63-
- pyenv rehash
6477
- dda inv -- -e rtloader.make
6578
- dda inv -- -e rtloader.install
6679
- dda inv -- -e install-tools

.gitlab/deploy_packages/oci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ include:
3030
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_PACKAGE} ${VERSION_NO_PIPELINE}
3131
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_PACKAGE} ${CI_COMMIT_SHA}
3232
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_PACKAGE} pipeline-${CI_PIPELINE_ID}
33-
# necessary for ddstaging until we deprecate `-dev` packaging
34-
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_STAGING_PACKAGE} ${VERSION}
35-
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_PACKAGE} ${VERSION_NO_PIPELINE}
36-
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_STAGING_PACKAGE} ${CI_COMMIT_SHA}
37-
- datadog-package replicate-s3 registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID} us-east-1 ${INSTALLER_TESTING_S3_BUCKET} ${S3_STAGING_PACKAGE} pipeline-${CI_PIPELINE_ID}
3833
variables:
3934
MAJOR_VERSION: 7
4035

@@ -44,12 +39,10 @@ deploy_agent_oci:
4439
variables:
4540
OCI_PRODUCT: "datadog-agent"
4641
S3_PACKAGE: "agent-package"
47-
S3_STAGING_PACKAGE: "agent-package-dev"
4842

4943
deploy_installer_oci:
5044
extends: ".deploy_packages_oci"
5145
needs: [ "installer_oci", "go_tools_deps" ]
5246
variables:
5347
OCI_PRODUCT: "datadog-installer"
5448
S3_PACKAGE: "installer-package"
55-
S3_STAGING_PACKAGE: "installer-package-dev"

.gitlab/dev_container_deploy/docker_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ dev_nightly-a7-full:
205205
variables:
206206
IMG_REGISTRIES: dev
207207
IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-full-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-full-arm64
208-
IMG_DESTINATIONS: agent-dev:nightly-full-${CI_COMMIT_REF_SLUG}-jmx
208+
IMG_DESTINATIONS: agent-dev:nightly-full-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}-jmx,agent-dev:nightly-full-${CI_COMMIT_REF_SLUG}-jmx
209209

210210
# deploys nightlies to agent-dev
211211
dev_nightly-dogstatsd:

.gitlab/e2e/e2e.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ new-e2e-installer-windows:
601601
- EXTRA_PARAMS: --run "TestInstallScript$/TestInstallFromOldInstaller$"
602602
- EXTRA_PARAMS: --run "TestInstallScript$/TestFailedUnsupportedVersion$"
603603
- EXTRA_PARAMS: --run "TestInstallScriptWithAgentUser$"
604+
- EXTRA_PARAMS: --run "TestInstallScriptWithAgentUserOnDC$"
604605
# installer-package
605606
- EXTRA_PARAMS: --run "TestInstaller$"
606607
# TODO: disabling tests during MSI merge, should be covered by regular Agent MSI tests

.gitlab/integration_test/otel.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,24 @@ docker_image_build_otel:
4343
- !reference [.except_mergequeue]
4444
- when: on_success
4545

46-
# TODO(songy23): restore datadog_otel_components_ocb_build in next version upgrade
46+
datadog_otel_components_ocb_build:
47+
stage: integration_test
48+
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
49+
tags: ["arch:amd64"]
50+
needs: ["go_deps"]
51+
artifacts:
52+
paths:
53+
- ocb-output.log
54+
- otelcol-custom.log
55+
- flare-info.log
56+
when: always
57+
before_script:
58+
- !reference [.retrieve_linux_go_deps]
59+
script:
60+
- echo "Building custom collector with datadog components"
61+
- test/otel/testdata/ocb_build_script.sh
62+
- echo "see artifacts for job logs"
63+
rules:
64+
- !reference [.except_mergequeue]
65+
- when: on_success
66+
timeout: 15 minutes

.gitlab/source_test/codeql_scan.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
# codeql_scan stage
3+
# Contains CodeQL scan job to perform security static analysis
4+
5+
run_codeql_scan:
6+
image: registry.ddbuild.io/code-scanning:v62112110-4faa53b-datadog-agent
7+
tags: ["arch:amd64"]
8+
stage: source_test
9+
rules:
10+
- !reference [.on_scheduled_main]
11+
needs: ["go_deps", "go_tools_deps"]
12+
allow_failure: true # This job should not impact the overall status of the pipeline
13+
variables:
14+
ARCH: arm64
15+
BASE_REF: main
16+
GOMAXPROCS: 10
17+
KUBERNETES_CPU_REQUEST: 10
18+
KUBERNETES_CPU_LIMIT: 10
19+
KUBERNETES_MEMORY_REQUEST: 64Gi
20+
KUBERNETES_MEMORY_LIMIT: 64Gi
21+
GITHUB_APP_PRIVATE_KEY_NAME: csec.codescanning.githubapp.privatekey
22+
CODEQL: /usr/local/codeql/codeql
23+
CODEQL_DB: /tmp/datadog-agent.codeql
24+
DB_CONFIGS: --threads 8 --ram 96000 --db-cluster --language=go,python,javascript,cpp
25+
SCAN_CONFIGS: --format sarifv2.1.0 --threads 8 --ram 96000 --no-tuple-counting
26+
UPLOAD_CONFIGS: -upload_sarif=true
27+
GITHUB_APP_PRIVATE_KEY_NAME: csec.codescanning.githubapp.privatekey
28+
GITHUB_APP_ID: 209967
29+
GITHUB_INSTALLATION_ID: 26442897
30+
script:
31+
- !reference [.retrieve_linux_go_deps]
32+
- !reference [.retrieve_linux_go_tools_deps]
33+
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "https://github.com/DataDog/"
34+
- git clone https://github.com/DataDog/codescanning.git --depth 1 --single-branch --branch=main /tmp/codescanning
35+
- invoke install-tools
36+
- $CODEQL database create datadog-agent.codeql $DB_CONFIGS --command="inv -e agent.build --build-exclude=systemd"
37+
- $CODEQL database analyze datadog-agent.codeql/javascript codeql/javascript-queries $SCAN_CONFIGS --sarif-category="javascript" --output="/tmp/javascript.sarif" --verbosity=progress+++
38+
- $CODEQL database analyze datadog-agent.codeql/go codeql/go-queries $SCAN_CONFIGS --sarif-category="go" --output="/tmp/go.sarif" --verbosity=progress+++
39+
- $CODEQL database analyze datadog-agent.codeql/python codeql/python-queries $SCAN_CONFIGS --sarif-category="python" --output="/tmp/python.sarif" --verbosity=progress+++
40+
- $CODEQL database analyze datadog-agent.codeql/cpp codeql/cpp-queries $SCAN_CONFIGS --sarif-category="cpp" --output="/tmp/cpp.sarif" --verbosity=progress+++
41+
- GOPRIVATE=github.com/DataDog GOBIN=/usr/local/go/bin go install github.com/DataDog/codescanning@main
42+
- CODEQL_SARIF="/tmp/go.sarif" codescanning $UPLOAD_CONFIGS -scan_started_time="$CI_JOB_STARTED_AT"
43+
- CODEQL_SARIF="/tmp/javascript.sarif" codescanning $UPLOAD_CONFIGS -scan_started_time="$CI_JOB_STARTED_AT"
44+
- CODEQL_SARIF="/tmp/python.sarif" codescanning $UPLOAD_CONFIGS -scan_started_time="$CI_JOB_STARTED_AT"
45+
- CODEQL_SARIF="/tmp/cpp.sarif" codescanning $UPLOAD_CONFIGS -scan_started_time="$CI_JOB_STARTED_AT"
46+

.gitlab/source_test/include.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ include:
1515
- .gitlab/source_test/notify.yml
1616
- .gitlab/source_test/protobuf.yml
1717
- .gitlab/source_test/tooling_unit_tests.yml
18+
- .gitlab/source_test/codeql_scan.yml

0 commit comments

Comments
 (0)