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

Proposed Internal Datadog Module Component #24650

Merged
merged 35 commits into from
Aug 7, 2023
Merged

Proposed Internal Datadog Module Component #24650

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ae96cd6
moving agent to an internal shared datadog folder
gord02 Jul 25, 2023
4fa8eee
resolving issues with go dependencies for internal datadog module
gord02 Jul 27, 2023
22bd82a
merging with main
gord02 Jul 27, 2023
b91c4b3
merging main into branch to resolve issues
gord02 Jul 27, 2023
1ae8754
resloving package requirements in datadog processor
gord02 Jul 27, 2023
9b72ac5
Merge branch 'open-telemetry:main' into internal
gord02 Jul 27, 2023
5d7a006
resolving issues for checks including codeowners and issues with unit…
gord02 Jul 28, 2023
d3e1eaa
Merge branch 'internal' of github.com:gord02/opentelemetry-collector-…
gord02 Jul 28, 2023
a4fcdaa
fixing code to pass checks
gord02 Jul 28, 2023
7b8dc5a
resloving issues preventing checks from passing
gord02 Jul 31, 2023
15a1921
Revert "resolving issues with go dependencies for internal datadog mo…
gord02 Jul 31, 2023
4ce4c8f
removing file files from previous commit
gord02 Jul 31, 2023
81e336a
resolving merge conflicts
gord02 Jul 31, 2023
d182bcd
working on components.go conflict issues
gord02 Aug 1, 2023
81aaf26
resolving version issues for modules
gord02 Aug 1, 2023
d3a7c40
ran make gengithub
gord02 Aug 1, 2023
c93064a
updating version of datadogexporter in go.mod file
gord02 Aug 2, 2023
36ba079
correcting other module verisons to v0.82.0
gord02 Aug 2, 2023
5cf1fda
updating dependabot
gord02 Aug 2, 2023
125a6df
Merge branch 'main' into internal
songy23 Aug 2, 2023
0c886c6
Merge branch 'main' into internal
gord02 Aug 3, 2023
a43bbae
Merge branch 'internal' of github.com:gord02/opentelemetry-collector-…
gord02 Aug 3, 2023
a91a74a
Merge branch 'main' into internal
gord02 Aug 4, 2023
b8fe633
adding new code owner
gord02 Aug 4, 2023
616cf15
Merge branch 'main' into internal
gord02 Aug 4, 2023
8b7fc12
Merge branch 'internal' of github.com:gord02/opentelemetry-collector-…
gord02 Aug 4, 2023
b7c7490
minor changes to internal moudle files
gord02 Aug 4, 2023
950a42d
Merge branch 'main' into internal
gord02 Aug 4, 2023
dd0e54e
ran 'make gengithub'
gord02 Aug 4, 2023
c8da169
manually making fixes to dependabot.yml
gord02 Aug 4, 2023
f7b7a94
removing blank and unnecessary lines
gord02 Aug 4, 2023
47c326e
Merge branch 'main' into internal
gord02 Aug 4, 2023
2cbac1e
ran 'make gendependabot'
gord02 Aug 4, 2023
1935bd1
updating versions.yaml to include internal datadog module
gord02 Aug 4, 2023
3a1f987
updating the github files
gord02 Aug 4, 2023
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ internal/kubelet/ @open-telemetry/collect
internal/metadataproviders/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
internal/sharedcomponent/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
internal/splunk/ @open-telemetry/collector-contrib-approvers @dmitryax
internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
internal/tools/ @open-telemetry/collector-contrib-approvers

pkg/batchperresourceattr/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
Expand Down
3 changes: 3 additions & 0 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.81.0 // indirect
gord02 marked this conversation as resolved.
Show resolved Hide resolved
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.81.0 // indirect
Expand Down Expand Up @@ -1110,4 +1111,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/obse

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ../../extension/jaegerremotesampling
35 changes: 17 additions & 18 deletions cmd/otelcontribcol/components.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion cmd/otelcontribcol/components_test.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.81.0 // indirect
gord02 marked this conversation as resolved.
Show resolved Hide resolved
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.81.0 // indirect
Expand Down Expand Up @@ -1125,3 +1126,5 @@ replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristre

// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
replace cloud.google.com/go => cloud.google.com/go v0.110.2

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
gord02 marked this conversation as resolved.
Show resolved Hide resolved
1 change: 0 additions & 1 deletion cmd/otelcontribcol/main.go
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions cmd/otelcontribcol/main_windows.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.81.0 // indirect
gord02 marked this conversation as resolved.
Show resolved Hide resolved
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.81.0 // indirect
Expand Down Expand Up @@ -1084,6 +1085,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zooke

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ./extension/observer/dockerobserver

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ./internal/datadog

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ./extension/jaegerremotesampling

// see https://github.com/google/gnostic/issues/262
Expand Down
1 change: 1 addition & 0 deletions internal/datadog/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../../Makefile.Common
Loading