Skip to content

Commit f7be511

Browse files
authored
[chore] Replace internal/datadog with datadog agent packages (#33233)
**Description:** Remove internal/datadog package, replace with datadog-agent packages. Follow-up of DataDog/datadog-agent#25841
1 parent 15dde8a commit f7be511

File tree

30 files changed

+45
-1075
lines changed

30 files changed

+45
-1075
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ extension/sumologicextension/ @open-telemetry/collect
123123
internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
124124
internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme
125125
internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
126-
internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13
127126
internal/docker/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis
128127
internal/exp/metrics/ @open-telemetry/collector-contrib-approvers @sh0rez @RichieSams
129128
internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ body:
121121
- internal/aws
122122
- internal/collectd
123123
- internal/core
124-
- internal/datadog
125124
- internal/docker
126125
- internal/exp/metrics
127126
- internal/filter

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ body:
115115
- internal/aws
116116
- internal/collectd
117117
- internal/core
118-
- internal/datadog
119118
- internal/docker
120119
- internal/exp/metrics
121120
- internal/filter

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ body:
115115
- internal/aws
116116
- internal/collectd
117117
- internal/core
118-
- internal/datadog
119118
- internal/docker
120119
- internal/exp/metrics
121120
- internal/filter

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ body:
120120
- internal/aws
121121
- internal/collectd
122122
- internal/core
123-
- internal/datadog
124123
- internal/docker
125124
- internal/exp/metrics
126125
- internal/filter

cmd/configschema/go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@ require (
228228
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.5 // indirect
229229
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.54.0-rc.5 // indirect
230230
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.54.0-rc.5 // indirect
231+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.0.0-20240525065430-d0b647bcb646 // indirect
232+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.0.0-20240525065430-d0b647bcb646 // indirect
231233
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.5 // indirect
232234
github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.5 // indirect
233235
github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.5 // indirect
@@ -562,7 +564,6 @@ require (
562564
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.101.0 // indirect
563565
github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.101.0 // indirect
564566
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.101.0 // indirect
565-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.101.0 // indirect
566567
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 // indirect
567568
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.101.0 // indirect
568569
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.101.0 // indirect
@@ -1187,8 +1188,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/obse
11871188

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

1190-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
1191-
11921191
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ../../extension/jaegerremotesampling
11931192

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

cmd/configschema/go.sum

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/builder-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ replaces:
266266
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter => ../../exporter/cassandraexporter
267267
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver => ../../receiver/udplogreceiver
268268
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk
269-
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
270269
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver => ../../receiver/podmanreceiver
271270
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ../../receiver/flinkmetricsreceiver
272271
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver => ../../receiver/awsecscontainermetricsreceiver

cmd/otelcontribcol/go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ require (
295295
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.5 // indirect
296296
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.54.0-rc.5 // indirect
297297
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.54.0-rc.5 // indirect
298+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.0.0-20240525065430-d0b647bcb646 // indirect
299+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.0.0-20240525065430-d0b647bcb646 // indirect
298300
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.5 // indirect
299301
github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.5 // indirect
300302
github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.5 // indirect
@@ -614,7 +616,6 @@ require (
614616
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.101.0 // indirect
615617
github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.101.0 // indirect
616618
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.101.0 // indirect
617-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.101.0 // indirect
618619
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.101.0 // indirect
619620
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.101.0 // indirect
620621
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.101.0 // indirect
@@ -888,8 +889,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplo
888889

889890
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk
890891

891-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
892-
893892
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver => ../../receiver/podmanreceiver
894893

895894
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ../../receiver/flinkmetricsreceiver

cmd/otelcontribcol/go.sum

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)