Skip to content

Commit

Permalink
Merge branch 'main' into remeh/arm64-sds
Browse files Browse the repository at this point in the history
  • Loading branch information
@remeh
remeh authored Jun 4, 2024
2 parents 0d81e2b + 4335d82 commit ab63fd6
Show file tree
Hide file tree
Showing 82 changed files with 2,268 additions and 1,075 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/chase_release_managers.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r tasks/libs/requirements-github.txt -r tasks/requirements-release-tasks.txt
- name: Create release schedule
pip install -r requirements.txt -r tasks/libs/requirements-github.txt -r tasks/requirements_release_tasks.txt
- name: Chase release managers
env:
ATLASSIAN_USERNAME : ${{ secrets.ATLASSIAN_USERNAME }}
ATLASSIAN_PASSWORD : ${{ secrets.ATLASSIAN_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release_schedule.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r tasks/libs/requirements-github.txt -r tasks/requirements-release-tasks.txt
pip install -r requirements.txt -r tasks/libs/requirements-github.txt -r tasks/requirements_release_tasks.txt
- name: Create release schedule
env:
ATLASSIAN_USERNAME : ${{ secrets.ATLASSIAN_USERNAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/external-contributor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
if: github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
ref: main
fetch-depth: 0
- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.11
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/send-failure-summary-notification.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
ref: main
- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.11
cache: 'pip'
Expand Down
6 changes: 5 additions & 1 deletion .gitlab/e2e/e2e.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,11 @@ new-e2e-npm-docker:
EXTRA_PARAMS: --run "Test(ECSVM|EC2VMContainerized|EKSVM)Suite"

new-e2e-aml:
extends: .new_e2e_template_needs_deb_windows_x64
extends: .new_e2e_template
needs:
- deploy_deb_testing-a7_x64
- deploy_windows_testing-a7
- qa_agent
rules: !reference [.on_aml_or_e2e_changes_or_manual]
variables:
TARGETS: ./tests/agent-metric-logs
Expand Down
8 changes: 4 additions & 4 deletions cmd/agent/common/path/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ replace (
)

require (
github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/executable v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/winutil v0.55.0-rc.1
golang.org/x/sys v0.19.0
)

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.1 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
Expand Down
44 changes: 22 additions & 22 deletions comp/core/config/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@ replace (
)

require (
github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.2
github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/cmd/agent/common/path v0.55.0-rc.1
github.com/DataDog/datadog-agent/comp/core/secrets v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/config/env v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/config/model v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/config/setup v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/optional v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/winutil v0.55.0-rc.1
github.com/DataDog/viper v1.13.5
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.18.2
)

require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/telemetry v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.55.0-rc.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion comp/core/flare/builder/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ go 1.21.0

replace github.com/DataDog/datadog-agent/comp/def => ../../../def

require github.com/DataDog/datadog-agent/comp/def v0.55.0-devel
require github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1
4 changes: 2 additions & 2 deletions comp/core/flare/types/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ replace (
)

require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.55.0-rc.1
go.uber.org/fx v1.18.2
)

require (
github.com/DataDog/datadog-agent/comp/def v0.55.0-devel // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/dig v1.17.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/core/hostname/hostnameinterface/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ replace (
)

require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.18.2
)

require (
github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down
46 changes: 23 additions & 23 deletions comp/core/log/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,35 @@ replace (
)

require (
github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2
github.com/DataDog/datadog-agent/comp/core/config v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/config/env v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/config/logs v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/trace v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.55.0-rc.1
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // v2.6
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.18.2
)

require (
github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/setup v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
github.com/DataDog/go-sqllexer v0.0.12 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
Expand Down
18 changes: 9 additions & 9 deletions comp/core/secrets/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ replace (
)

require (
github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/comp/core/flare/types v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/telemetry v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/winutil v0.55.0-rc.1
github.com/benbjohnson/clock v1.3.0
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.18.2
Expand All @@ -31,9 +31,9 @@ require (
)

require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-devel // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
Expand Down
46 changes: 23 additions & 23 deletions comp/core/status/statusimpl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,35 @@ replace (
)

require (
github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2
github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2
github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/flavor v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2
github.com/DataDog/datadog-agent/comp/core/config v0.55.0-rc.1
github.com/DataDog/datadog-agent/comp/core/flare/types v0.55.0-rc.1
github.com/DataDog/datadog-agent/comp/core/status v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/config/setup v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/flavor v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1
github.com/DataDog/datadog-agent/pkg/version v0.55.0-rc.1
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.18.2
golang.org/x/text v0.14.0
)

require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.55.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.55.0-rc.1 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
Expand Down
1 change: 1 addition & 0 deletions comp/core/tagger/taggerimpl/collectors/workloadmeta_extract.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ func (c *WorkloadMetaCollector) addOpenTelemetryStandardTags(container *workload
if otelResourceAttributes, ok := container.EnvVars[envVarOtelResourceAttributes]; ok {
for _, pair := range strings.Split(otelResourceAttributes, ",") {
fields := strings.SplitN(pair, "=", 2)
fields[0], fields[1] = strings.TrimSpace(fields[0]), strings.TrimSpace(fields[1])
if tag, ok := otelResourceAttributesMapping[fields[0]]; ok {
tags.AddStandard(tag, fields[1])
}
Expand Down
36 changes: 36 additions & 0 deletions comp/core/tagger/taggerimpl/collectors/workloadmeta_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,42 @@ func TestHandleContainer(t *testing.T) {
},
},
},
{
name: "tags from environment with opentelemetry sdk with whitespace",
container: workloadmeta.Container{
EntityID: entityID,
EntityMeta: workloadmeta.EntityMeta{
Name: containerName,
},
EnvVars: map[string]string{
// env as tags
"TEAM": "container-integrations",
"TIER": "node",

// otel standard tags
"OTEL_SERVICE_NAME": svc,
"OTEL_RESOURCE_ATTRIBUTES": fmt.Sprintf("service.name= %s, service.version = %s , deployment.environment =%s", svc, version, env),
},
},
envAsTags: map[string]string{
"team": "owner_team",
},
expected: []*types.TagInfo{
{
Source: containerSource,
Entity: taggerEntityID,
HighCardTags: []string{
fmt.Sprintf("container_name:%s", containerName),
fmt.Sprintf("container_id:%s", entityID.ID),
},
OrchestratorCardTags: []string{},
LowCardTags: append([]string{
"owner_team:container-integrations",
}, standardTags...),
StandardTags: standardTags,
},
},
},
{
name: "tags from labels",
container: workloadmeta.Container{
Expand Down
4 changes: 2 additions & 2 deletions comp/core/telemetry/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace (
)

require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
github.com/stretchr/testify v1.9.0
Expand All @@ -19,7 +19,7 @@ require (
)

require (
github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect
github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down
Loading

0 comments on commit ab63fd6

Please sign in to comment.