Skip to content

Commit e4ed7b8

Browse files
committed
Merge remote-tracking branch 'origin/dd-v3.4.1'
2 parents eef5409 + d1cda49 commit e4ed7b8

File tree

780 files changed

+43671
-74569
lines changed

Some content is hidden

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

780 files changed

+43671
-74569
lines changed

.azure-pipelines/ultimate-pipeline.yml

Whitespace-only changes.

.github/CODEOWNERS

Whitespace-only changes.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: "Publish native debug symbols"
2+
description: 'Publish native debug symbols'
3+
4+
inputs:
5+
symbols_folder:
6+
description: "Folder containing the debug symbols"
7+
required: true
8+
preprod_key:
9+
description: "Preprod API key"
10+
default: ""
11+
required: false
12+
prod_key:
13+
description: "Prod API key"
14+
default: ""
15+
required: false
16+
17+
runs:
18+
using: "composite"
19+
steps:
20+
# datadog-ci needs the version 20 (https://github.com/DataDog/profiling-backend/blob/prod/debug-symbol-upload/Dockerfile#L6)
21+
- name: Install Node
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: 20
25+
26+
# Use the same go version as in https://github.com/DataDog/profiling-backend/blob/prod/debug-symbol-upload/Dockerfile#L21
27+
- name: Install Go
28+
uses: actions/setup-go@v5
29+
with:
30+
go-version: '^1.22.3'
31+
32+
# Use the same version of datadog-ci as in https://github.com/DataDog/profiling-backend/blob/prod/debug-symbol-upload/Dockerfile#L14
33+
- name: Install datadog-ci
34+
shell: bash
35+
run: npm install -g @datadog/[email protected]
36+
37+
- name: Push debug symbols
38+
shell: bash
39+
run: |
40+
if [ -n "${{ inputs.prod_key }}" ]; then
41+
echo "Push symbols to prod env"
42+
DATADOG_API_KEY="${{ inputs.prod_key }}" DD_BETA_COMMANDS_ENABLED=1 datadog-ci elf-symbols upload ${{inputs.symbols_folder}}
43+
fi
44+
45+
if [ -n "${{ inputs.preprod_key }}" ]; then
46+
echo "Push symbols to staging env"
47+
DATADOG_API_KEY="${{ inputs.preprod_key }}" DATADOG_SITE="datad0g.com" DD_BETA_COMMANDS_ENABLED=1 datadog-ci elf-symbols upload ${{inputs.symbols_folder}}
48+
fi
49+
50+

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,4 +381,9 @@ cmake-build-debug/
381381
.cache/jb
382382

383383
#datadog coverage
384-
datadog-coverage-*
384+
datadog-coverage-*
385+
386+
.localstack/*
387+
388+
# nuke
389+
.nuke/build.schema.json

.gitlab-ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,19 @@ download-single-step-artifacts:
9797
start_in: 15 minutes
9898
script:
9999
- .gitlab/download-single-step-artifacts.sh
100+
- cp tracer/build/artifacts/requirements.json artifacts/requirements.json
100101
artifacts:
101102
expire_in: 2 weeks
102103
paths:
103104
- artifacts
104105

106+
requirements_json_test:
107+
rules:
108+
- when: on_success
109+
variables:
110+
REQUIREMENTS_BLOCK_JSON_PATH: "tracer/build/artifacts/requirements_block.json"
111+
REQUIREMENTS_ALLOW_JSON_PATH: "tracer/build/artifacts/requirements_allow.json"
112+
105113
package-oci:
106114
needs: [ download-single-step-artifacts ]
107115

@@ -182,3 +190,4 @@ benchmark-serverless-trigger:
182190
UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
183191
UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN
184192
UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL
193+

.gitlab/prepare-oci-package.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ mkdir -p sources
3838
tar --same-owner -pxvzf $SRC_TAR -C sources
3939

4040
echo -n $VERSION > sources/version
41+
42+
cp ../artifacts/requirements.json sources/requirements.json

0 commit comments

Comments
 (0)