Skip to content

Commit

Permalink
Merge pull request open-telemetry#57 from chadpatel/patchad-spr-to-pr…
Browse files Browse the repository at this point in the history
…om-refactor

migrate simple prometheus receiver to prometheus receiver
  • Loading branch information
chadpatel authored Jul 25, 2023
2 parents 7567204 + 0536a9b commit 68f3439
Show file tree
Hide file tree
Showing 7 changed files with 268 additions and 320 deletions.
7 changes: 2 additions & 5 deletions receiver/awscontainerinsightreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.77.0
github.com/prometheus/common v0.42.0
github.com/prometheus/prometheus v0.43.0
github.com/shirou/gopsutil/v3 v3.23.4
github.com/stretchr/testify v1.8.2
Expand Down Expand Up @@ -143,7 +144,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.77.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.77.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.77.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.77.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
Expand All @@ -157,7 +157,6 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.15.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rs/cors v1.9.0 // indirect
Expand Down Expand Up @@ -231,8 +230,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator

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

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

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func (le *LeaderElection) startLeaderElection(ctx context.Context, lock resource
le.mu.Lock()
defer le.mu.Unlock()
le.leading = false
// node and pod are only used for cluster level metrics, endpoint is used for decorator too.
// node and pod are only used for cluster level metrics, Endpoint is used for decorator too.
le.k8sClient.ShutdownNodeClient()
le.k8sClient.ShutdownPodClient()
},
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 68f3439

Please sign in to comment.