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

Jump to bottom

Commit gowork and work sync #30891

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
+15,634 −7,821
Draft

Commit gowork and work sync #30891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0c316da
Commit gowork and work sync
KevinFairise2 Nov 8, 2024
21381f6
Commit gowork and work sync
KevinFairise2 Nov 8, 2024
80712bc
Fix lint
KevinFairise2 Nov 8, 2024
d139b86
work sync
KevinFairise2 Nov 8, 2024
21f9b51
Tidy
KevinFairise2 Nov 8, 2024
dfea651
Sync internal
KevinFairise2 Nov 8, 2024
2519e19
Set go mod readonly
KevinFairise2 Nov 8, 2024
a0bbed8
Tidy all
KevinFairise2 Nov 8, 2024
63313db
Update invoke tasks so it runs go work sync
KevinFairise2 Nov 8, 2024
3cedaa1
More mod -> readonly
KevinFairise2 Nov 8, 2024
c7bf6ea
empty
KevinFairise2 Nov 8, 2024
d52d0ec
go.work sync
KevinFairise2 Nov 8, 2024
cdd1f78
Include all modules
KevinFairise2 Nov 8, 2024
180e7e1
inv tidy
KevinFairise2 Nov 8, 2024
7d11c77
Fix small issues
KevinFairise2 Nov 8, 2024
f115da5
Fid lint license
KevinFairise2 Nov 12, 2024
122f5de
Merge branch 'main' of github.com:DataDog/datadog-agent into kfairise…
KevinFairise2 Nov 12, 2024
d543fb9
Take licenses from main module only
KevinFairise2 Nov 13, 2024
6f0355a
Try to remove internal/tools from gowork
KevinFairise2 Nov 13, 2024
98f360a
Try OTel fix
KevinFairise2 Nov 13, 2024
1bd08d0
Try golangci-lint bump
KevinFairise2 Nov 14, 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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ pkg/network/netlink/testdata/message_dump*
cscope.out

# Go workspace until we have proper support in the tooling
go.work*
# go.work*

tools/windows/DatadogAgentInstaller/.vs/
tools/windows/DatadogAgentInstaller/packages/
Expand Down
7 changes: 5 additions & 2 deletions comp/api/api/def/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ module github.com/DataDog/datadog-agent/comp/api/api/def

go 1.22.0

require go.uber.org/fx v1.22.2
require go.uber.org/fx v1.23.0

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/stretchr/testify v1.9.0 // indirect
go.uber.org/dig v1.18.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/sys v0.27.0 // indirect
)
20 changes: 10 additions & 10 deletions comp/api/api/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.

45 changes: 21 additions & 24 deletions comp/api/authtoken/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0
github.com/DataDog/datadog-agent/pkg/util/optional v0.57.1
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.22.2
go.uber.org/fx v1.23.0
)

require (
Expand Down Expand Up @@ -75,42 +75,39 @@ require (
github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.56.0 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.18.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading