Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from DataDog:main #108

Merged
merged 8 commits into from
Dec 19, 2024
Merged

[pull] main from DataDog:main #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83bedeb
fix(installer): Make policy metadata files root-owned & world-readabl…
BaptisteFoy Dec 19, 2024
64ff98e
[CI] Remove the GitHub macOS tests workflow (#32151)
amenasria Dec 19, 2024
ff4d5fa
Add USM debugger (#32325)
vitkyrka Dec 19, 2024
463c776
[ASCII-2613] Remove golang.org/x/text/cases from some builds (#32216)
pgimalac Dec 19, 2024
3c2d6cb
[e2e] recreate stack on fakeintake grpc error (#32332)
pducolin Dec 19, 2024
091e10e
Check if key supports batch API in Map() ctor (#32348)
usamasaqib Dec 19, 2024
13597f4
Bump actions/setup-node from 4.0.3 to 4.1.0 (#30492)
dependabot[bot] Dec 19, 2024
22022a5
[ASCII-2628] Update golang.org/x/net to v33 (#32380)
louis-cqrl Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/serverless-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
persist-credentials: false

- name: Set up Node 20
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20

Expand Down
12 changes: 0 additions & 12 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,18 +623,6 @@ workflow:
- <<: *if_main_branch
- <<: *if_release_branch

.on_main_or_release_branch_or_all_builds_or_pkg_installer_changes:
- <<: *if_main_branch
- <<: *if_release_branch
- <<: *if_run_all_builds
- <<: *if_run_all_unit_tests
- changes:
paths:
- pkg/fleet/**/*
compare_to: main
variables:
FAST_TESTS: "true"

.only_main:
- <<: *if_not_main_branch
when: never
Expand Down
1 change: 1 addition & 0 deletions .gitlab/.ci-linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ needs-rules:
- setup_agent_version
- tests_ebpf_arm64
- tests_ebpf_x64
- tests_macos_gitlab_amd64
- tests_windows_secagent_x64
- tests_windows_sysprobe_x64
- trigger_auto_staging_release
Expand Down
36 changes: 0 additions & 36 deletions .gitlab/source_test/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,8 @@
include:
- .gitlab/common/macos.yml

tests_macos:
stage: source_test
# HACK: Run macOS unit tests only on full pipelines, to limit the use of macOS GitHub runners.
rules:
- !reference [.on_main_or_release_branch_or_all_builds_or_pkg_installer_changes]
- when: manual
allow_failure: true
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:amd64"]
needs: ["setup_agent_version"]
script:
- !reference [.setup_macos_github_app]
- $S3_CP_CMD $S3_ARTIFACTS_URI/agent-version.cache .
- export VERSION_CACHE_CONTENT=$(cat agent-version.cache | base64 -)
# Python 3.12 changes default behavior how packages are installed.
# In particular, --break-system-packages command line option is
# required to use the old behavior or use a virtual env. https://github.com/actions/runner-images/issues/8615
- python3 -m pip install -r tasks/libs/requirements-github.txt --break-system-packages
- FAST_TESTS_FLAG=""
- if [[ "$FAST_TESTS" = "true" ]]; then FAST_TESTS_FLAG="--fast-tests true"; fi
- inv -e github.trigger-macos --workflow-type "test" --datadog-agent-ref "$CI_COMMIT_SHA" --version-cache "$VERSION_CACHE_CONTENT" $FAST_TESTS_FLAG --test-washer
timeout: 6h
after_script:
- $CI_PROJECT_DIR/tools/ci/junit_upload.sh "junit-*-repacked.tgz"
artifacts:
expire_in: 2 weeks
when: always
paths:
- test_output.json
- junit-*-repacked.tgz
reports:
junit: "**/junit-out-*.xml"

.tests_macos_gitlab:
stage: source_test
rules:
- !reference [.except_mergequeue]
- when: on_success
extends: .macos_gitlab
needs: ["go_deps", "go_tools_deps"]
variables:
Expand Down
8 changes: 5 additions & 3 deletions comp/core/status/render_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"github.com/fatih/color"
"github.com/spf13/cast"

"golang.org/x/text/cases"
"golang.org/x/text/language"
"golang.org/x/text/unicode/norm"
)

Expand Down Expand Up @@ -290,8 +288,12 @@ func formatTitle(title string) string {
}
title = strings.Join(words, " ")

if title == "" {
return ""
}

// Capitalize the first letter
return cases.Title(language.English, cases.NoLower).String(title)
return strings.ToUpper(string(title[0])) + title[1:]
}

func status(check map[string]interface{}) string {
Expand Down
4 changes: 2 additions & 2 deletions comp/forwarder/defaultforwarder/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ require (
github.com/stretchr/testify v1.10.0
go.uber.org/atomic v1.11.0
go.uber.org/fx v1.23.0
golang.org/x/text v0.21.0
)

require (
Expand Down Expand Up @@ -146,8 +145,9 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/forwarder/defaultforwarder/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions comp/forwarder/defaultforwarder/internal/retry/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ import (
"expvar"
"strings"

"golang.org/x/text/cases"
"golang.org/x/text/language"

"github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder/transaction"
"github.com/DataDog/datadog-agent/pkg/telemetry"
)
Expand Down Expand Up @@ -308,11 +305,14 @@ func (t onDiskRetryQueueTelemetry) addDeserializeTransactionsCount(count int) {
}

func toCamelCase(s string) string {
caser := cases.Title(language.English)
parts := strings.Split(s, "_")
var camelCase string
for _, p := range parts {
camelCase += caser.String(p)
if p == "" {
continue
}
camelCase += strings.ToUpper(string(p[0]))
camelCase += string(p[1:])
}
return camelCase
}
2 changes: 1 addition & 1 deletion comp/forwarder/orchestrator/orchestratorinterface/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/forwarder/orchestrator/orchestratorinterface/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions comp/otelcol/collector-contrib/def/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
Expand Down
12 changes: 6 additions & 6 deletions comp/otelcol/collector-contrib/def/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions comp/otelcol/collector-contrib/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,15 +312,15 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.27.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
Expand Down
24 changes: 12 additions & 12 deletions comp/otelcol/collector-contrib/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/ddflareextension/def/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/ddflareextension/def/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/ddflareextension/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ require (
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/ddflareextension/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/logsagentpipeline/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
Expand Down
Loading
Loading