Skip to content

Commit

Permalink
[exporter/datadog] Remove Docker hostname detector (#11834)
Browse files Browse the repository at this point in the history
* [exporter/datadog] Remove Docker hostname detector

* Add Changelog entry

* make gotidy
  • Loading branch information
mx-psi authored Jun 30, 2022
1 parent 3910086 commit 2936720
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 81 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- If users were disabling this feature gate, they may have to update
monitoring for a few Kubernetes cpu metrics. For more details see [feature-gate-configurations](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.54.0/receiver/k8sclusterreceiver#feature-gate-configurations).
- `prometheusexporter`: Automatically rename metrics with units to follow Prometheus naming convention (#8950)
- `datadogexporter`: (Under `exporter.datadog.hostname.preview` feature gate) Remove `docker` hostname detector (#11834)

### 🚩 Deprecations 🚩

Expand Down
8 changes: 0 additions & 8 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ require (

require (
cloud.google.com/go/compute v1.6.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.38.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.38.0-rc.1 // indirect
github.com/DataDog/datadog-go/v5 v5.1.0 // indirect
Expand All @@ -40,10 +39,6 @@ require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.17+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
Expand Down Expand Up @@ -74,8 +69,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.54.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
github.com/philhofer/fwd v1.1.1 // indirect
Expand All @@ -85,7 +78,6 @@ require (
github.com/rs/cors v1.8.2 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.3.1 // indirect
github.com/shirou/gopsutil/v3 v3.22.5 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/theupdateframework/go-tuf v0.3.0 // indirect
Expand Down
19 changes: 0 additions & 19 deletions exporter/datadogexporter/go.sum

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

9 changes: 1 addition & 8 deletions exporter/datadogexporter/internal/metadata/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata/internal/azure"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata/internal/docker"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata/internal/ec2"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata/internal/ecs"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata/internal/gcp"
Expand All @@ -51,11 +50,6 @@ func init() {
}

func buildPreviewProvider(set component.TelemetrySettings, configHostname string) (source.Provider, error) {
dockerProvider, err := docker.NewProvider()
if err != nil {
return nil, err
}

ecs, err := ecs.NewProvider(set)
if err != nil {
return nil, fmt.Errorf("failed to build ECS Fargate provider: %w", err)
Expand Down Expand Up @@ -94,10 +88,9 @@ func buildPreviewProvider(set component.TelemetrySettings, configHostname string
"ec2": ec2Provider,
"gcp": gcpProvider,
"kubernetes": k8sProvider,
"docker": dockerProvider,
"system": system.NewProvider(set.Logger),
},
[]string{"config", "azure", "ecs", "ec2", "gcp", "kubernetes", "docker", "system"},
[]string{"config", "azure", "ecs", "ec2", "gcp", "kubernetes", "system"},
)

if err != nil {
Expand Down

This file was deleted.

0 comments on commit 2936720

Please sign in to comment.