Skip to content

Commit c223273

Browse files
authored
Merge branch 'main' into chris.agocs/create_trace_context_from_stepfunction_input
2 parents f59fde7 + a0be446 commit c223273

1,380 files changed

Lines changed: 42802 additions & 12871 deletions

File tree

Some content is hidden

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

.copyright-overrides.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ github.com/gogo/protobuf: ["Copyright (c) 2013, The GoGo Authors. All rights res
216216
github.com/moby/sys/mountinfo: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
217217
github.com/moby/sys/signal: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
218218
github.com/moby/sys/user: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
219+
github.com/moby/sys/userns: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
219220
github.com/modern-go/concurrent: Copyright (c) 2018 Tao Wen
220221
github.com/modern-go/reflect2: Copyright (c) 2018 Tao Wen
221222
github.com/opencontainers/selinux/*: Copyright (c) 2017 The Authors
@@ -247,6 +248,7 @@ github.com/chrusty/protoc-gen-jsonschema: Copyright (c) 2017 The Authors
247248
github.com/antchfx/htmlquery: Copyright (c) 2016 Zheng Chun
248249
github.com/antchfx/xmlquery: Copyright (c) 2016 Zheng Chun
249250
github.com/antchfx/xpath: Copyright (c) 2016 Zheng Chun
251+
github.com/kouhin/envflag: Copyright (c) 2015 kouhin
250252

251253

252254
# The Copyright information is not contained in the LICENSE file, but it can be found in other

.ddqa/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jira_issue_type = "Task"
7878
jira_statuses = ["To Do", "In Progress", "Done"]
7979
github_team = "opentelemetry"
8080
github_labels = ["team/opentelemetry"]
81+
exclude_members = ["ancostas", "Maascamp"]
8182

8283
[teams."eBPF Platform"]
8384
jira_project = "EBPF"

.github/CODEOWNERS

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,14 @@
9292

9393
/.gitlab/kitchen_* @DataDog/agent-delivery
9494
/.gitlab/kitchen_testing/windows.yml @DataDog/agent-delivery @DataDog/windows-agent
95-
/.gitlab/kitchen_testing/new-e2e_testing/windows.yml @DataDog/agent-delivery @DataDog/windows-agent
95+
/.gitlab/e2e_install_packages/windows.yml @DataDog/agent-delivery @DataDog/windows-agent
9696

9797
/.gitlab/common/ @DataDog/agent-devx-infra
9898
/.gitlab/common/test_infra_version.yml @DataDog/agent-devx-loops @DataDog/agent-devx-infra
9999

100100
/.gitlab/e2e/e2e.yml @DataDog/container-integrations @DataDog/agent-devx-loops
101+
/.gitlab/e2e_k8s/e2e_k8s.yml @DataDog/container-integrations @DataDog/agent-devx-loops
102+
/.gitlab/e2e/install_packages @DataDog/agent-delivery
101103
/.gitlab/container_build/fakeintake.yml @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
102104
/.gitlab/binary_build/fakeintake.yml @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
103105

@@ -106,6 +108,9 @@
106108
/.gitlab/functional_test_cleanup.yml @DataDog/agent-security @DataDog/windows-kernel-integrations @DataDog/agent-devx-infra
107109
/.gitlab/functional_test/system_probe_windows.yml @DataDog/agent-devx-infra @DataDog/windows-kernel-integrations
108110
/.gitlab/functional_test/common.yml @DataDog/agent-devx-infra @DataDog/windows-kernel-integrations
111+
/.gitlab/functional_test/oracle.yml @DataDog/agent-devx-infra @DataDog/database-monitoring
112+
113+
109114
/.gitlab/choco_build/choco_build.yml @DataDog/agent-delivery @DataDog/windows-agent
110115
/.gitlab/choco_deploy/choco_deploy.yml @DataDog/agent-delivery @DataDog/windows-agent
111116

@@ -200,6 +205,7 @@
200205
/cmd/system-probe/modules/service_discover* @DataDog/apm-onboarding @DataDog/universal-service-monitoring
201206
/cmd/system-probe/modules/language_detection* @DataDog/processes @DataDog/universal-service-monitoring
202207
/cmd/system-probe/runtime/ @DataDog/agent-security
208+
/cmd/system-probe/modules/dynamic_instrumentation* @DataDog/debugger
203209
/cmd/system-probe/windows/ @DataDog/windows-kernel-integrations
204210
/cmd/system-probe/windows_resources/ @DataDog/windows-kernel-integrations
205211
/cmd/system-probe/main_windows*.go @DataDog/windows-kernel-integrations
@@ -296,6 +302,7 @@
296302
/pkg/cli/ @DataDog/agent-shared-components
297303
/pkg/cli/subcommands/clusterchecks @DataDog/container-platform
298304
/pkg/dogstatsd/ @DataDog/agent-metrics-logs
305+
/pkg/discovery/ @DataDog/apm-onboarding @DataDog/universal-service-monitoring
299306
/pkg/errors/ @DataDog/agent-shared-components
300307
/pkg/forwarder/ @DataDog/agent-processing-and-routing
301308
/pkg/gohai @DataDog/agent-shared-components
@@ -419,6 +426,7 @@
419426
/pkg/util/orchestrator/ @DataDog/container-app
420427
/pkg/util/podman/ @DataDog/container-integrations
421428
/pkg/util/prometheus @DataDog/container-integrations
429+
/pkg/util/tagger @DataDog/container-platform
422430
/pkg/util/trivy/ @DataDog/container-integrations @DataDog/agent-security
423431
/pkg/util/uuid/ @DataDog/agent-shared-components
424432
/pkg/util/cgroups/ @DataDog/container-integrations
@@ -585,6 +593,8 @@
585593
/test/fakeintake/ @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
586594
/test/fakeintake/aggregator/ndmflowAggregator.go @DataDog/network-device-monitoring
587595
/test/fakeintake/aggregator/ndmflowAggregator_test.go @DataDog/network-device-monitoring
596+
/test/fakeintake/aggregator/servicediscoveryAggregator.go @DataDog/apm-onboarding @DataDog/universal-service-monitoring
597+
/test/fakeintake/aggregator/servicediscoveryAggregator_test.go @DataDog/apm-onboarding @DataDog/universal-service-monitoring
588598
/test/new-e2e/ @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
589599
/test/new-e2e/test-infra-definition @DataDog/agent-devx-loops
590600
/test/new-e2e/system-probe @DataDog/ebpf-platform

.github/workflows/add_milestone.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ on:
88
- main
99
- "[0-9]+.[0-9]+.x"
1010

11+
permissions: {}
12+
1113
jobs:
1214
add-milestone-pr:
1315
name: Add Milestone on PR
1416
if: github.event.pull_request.merged == true
1517
runs-on: ubuntu-latest
18+
permissions:
19+
pull-requests: write
1620
env:
1721
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1822
GH_REPO: ${{ github.repository }}

.github/workflows/backport-pr.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
- closed
66
- labeled
77

8+
permissions: {}
9+
810
jobs:
911
backport:
1012
name: Backport PR
@@ -18,6 +20,9 @@ jobs:
1820
&& contains(github.event.label.name, 'backport')
1921
)
2022
)
23+
permissions:
24+
contents: write
25+
pull-requests: write
2126
steps:
2227
- uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
2328
id: app-token

.github/workflows/buildimages-update.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ on:
2424
required: true
2525
type: boolean
2626

27+
permissions: {}
28+
2729
jobs:
2830
open-go-update-pr:
2931
runs-on: ubuntu-latest

.github/workflows/chase_release_managers.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
required: true
99
type: string
1010

11+
permissions: {}
1112

1213
jobs:
13-
create_release_schedule:
14+
chase_release_managers:
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Checkout repository
@@ -30,5 +31,6 @@ jobs:
3031
env:
3132
ATLASSIAN_USERNAME : ${{ secrets.ATLASSIAN_USERNAME }}
3233
ATLASSIAN_PASSWORD : ${{ secrets.ATLASSIAN_PASSWORD }}
34+
SLACK_API_TOKEN : ${{ secrets.SLACK_DATADOG_AGENT_BOT_TOKEN }}
3335
run: |
3436
inv -e release.chase-release-managers --version ${{ github.event.inputs.version }}

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ on:
1010
- main
1111
- "[0-9]+.[0-9]+.x"
1212

13+
permissions: {}
14+
1315
jobs:
1416
CodeQL-Build:
1517
runs-on: ubuntu-20.04
18+
permissions:
19+
security-events: write
1620
strategy:
1721
matrix:
1822
language: ["go", "javascript", "python", "cpp"]

.github/workflows/create_rc_pr.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ on:
99
env:
1010
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1111

12+
permissions: {}
13+
1214
jobs:
1315
find_release_branches:
1416
runs-on: ubuntu-latest
1517
outputs:
1618
branches: ${{ steps.branches.outputs.value }}
19+
warning: ${{ steps.warning.outputs.value }}
1720
steps:
1821
- name: Checkout repository
1922
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
@@ -39,12 +42,17 @@ jobs:
3942
echo "value=$(inv release.get-unreleased-release-branches)" >> $GITHUB_OUTPUT
4043
4144
- name: Set the warning option
45+
id: warning
4246
if: github.event.schedule == '0 8 * * 1,3,5'
43-
run: echo "WARNING='-w'" >> $GITHUB_ENV
47+
run: |
48+
echo "value=-w" >> $GITHUB_OUTPUT
4449
4550
create_rc_pr:
4651
runs-on: ubuntu-latest
4752
needs: find_release_branches
53+
permissions:
54+
contents: write
55+
pull-requests: write
4856
strategy:
4957
matrix:
5058
value: ${{fromJSON(needs.find_release_branches.outputs.branches)}}
@@ -73,8 +81,9 @@ jobs:
7381
env:
7482
ATLASSIAN_USERNAME: ${{ secrets.ATLASSIAN_USERNAME }}
7583
ATLASSIAN_PASSWORD: ${{ secrets.ATLASSIAN_PASSWORD }}
84+
SLACK_API_TOKEN : ${{ secrets.SLACK_DATADOG_AGENT_BOT_TOKEN }}
7685
run: |
77-
echo "CHANGES=$(inv -e release.check-for-changes -r ${{ matrix.value }} ${{ env.WARNING }})" >> $GITHUB_OUTPUT
86+
echo "CHANGES=$(inv -e release.check-for-changes -r ${{ matrix.value }} ${{ needs.find_release_branches.outputs.warning }})" >> $GITHUB_OUTPUT
7887
7988
- name: Create RC PR
8089
if: ${{ steps.check_for_changes.outputs.CHANGES == 'true'}}

.github/workflows/create_release_schedule.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
required: true
1313
type: string
1414

15+
permissions: {}
16+
1517

1618
jobs:
1719
create_release_schedule:

0 commit comments

Comments
 (0)