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.

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

[OTEL-931] Convert pkg/autodiscovery/common/types to go modules #20233

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ replace (
)

replace (
github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types => ./pkg/autodiscovery/common/types
github.com/DataDog/datadog-agent/pkg/errors => ./pkg/errors
github.com/DataDog/datadog-agent/pkg/gohai => ./pkg/gohai
github.com/DataDog/datadog-agent/pkg/networkdevice/profile => ./pkg/networkdevice/profile
Expand Down Expand Up @@ -565,6 +566,7 @@ require github.com/lorenzosaino/go-sysctl v0.3.1
require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/DataDog/agent-payload/v5 v5.0.97
github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/pkg/errors v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.49.0-rc.2
github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2
Expand Down
19 changes: 19 additions & 0 deletions pkg/autodiscovery/common/types/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types

go 1.20

replace github.com/DataDog/datadog-agent/pkg/util/log => ../../../util/log/

require (
github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.8.4
)

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect
songy23 marked this conversation as resolved.
Show resolved Hide resolved
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
16 changes: 16 additions & 0 deletions pkg/autodiscovery/common/types/go.sum

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

1 change: 1 addition & 0 deletions tasks/modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ def dependency_path(self, agent_version):
lint_targets=["."],
),
"test/fakeintake": GoModule("test/fakeintake", independent=True),
"pkg/autodiscovery/common/types": GoModule("pkg/autodiscovery/common/types", independent=True),
"pkg/errors": GoModule("pkg/errors", independent=True),
"pkg/obfuscate": GoModule("pkg/obfuscate", independent=True),
"pkg/gohai": GoModule("pkg/gohai", independent=True, importable=False),
Expand Down
Loading