Skip to content

Commit

Permalink
add owner for simpleprometheus (open-telemetry#11526)
Browse files Browse the repository at this point in the history
* add owner for simpleprometheus

Signed-off-by: Ziqi Zhao <[email protected]>

* fix format

Signed-off-by: Ziqi Zhao <[email protected]>

* remove unmantained line in changelog

Signed-off-by: Ziqi Zhao <[email protected]>

* remove wrong line

Signed-off-by: Ziqi Zhao <[email protected]>

* remove unmaintained log

Signed-off-by: Ziqi Zhao <[email protected]>

* remove unmaintained log

Signed-off-by: Ziqi Zhao <[email protected]>

* fix for error

Signed-off-by: Ziqi Zhao <[email protected]>

* fix for error

Signed-off-by: Ziqi Zhao <[email protected]>

* run make gotidy

Signed-off-by: Ziqi Zhao <[email protected]>
  • Loading branch information
fatsheep9146 committed Jun 27, 2022
1 parent 4e73810 commit adabcb8
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 17 deletions.
2 changes: 0 additions & 2 deletions .github/ALLOWLIST
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,5 @@ pkg/winperfcounters
processor/deltatorateprocessor
processor/metricsgenerationprocessor
receiver/podmanreceiver
receiver/simpleprometheusreceiver
receiver/simpleprometheusreceiver/examples/federation/prom-counter
testbed
testbed/mockdatareceivers/mockawsxrayreceiver
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ receiver/riakreceiver/ @open-telemetry/collector-c
receiver/saphanareceiver/ @open-telemetry/collector-contrib-approvers @pmm-sumo @dehaansa
receiver/sapmreceiver/ @open-telemetry/collector-contrib-approvers @owais
receiver/signalfxreceiver/ @open-telemetry/collector-contrib-approvers @pjanotti @dmitryax
receiver/simpleprometheusreceiver/ @open-telemetry/collector-contrib-approvers @fatsheep9146
receiver/skywalkingreceiver/ @open-telemetry/collector-contrib-approvers @JaredTan95
receiver/splunkhecreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @keitwb
receiver/sqlqueryreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @pmcollins
Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

### Unmaintained components

- `simpleprometheusreceiver`(#11133)
- `aerospikereceiver`: Fix issue where namespaces would not be collected (#11465)
- `signalfxreceiver`: Fix issue where component instance use in multiple pipelines leads to start failures (#11513)
- `splunkhecreceiver`: Fix issue where component instance use in multiple pipelines leads to start failures (#11517)
Expand Down
4 changes: 2 additions & 2 deletions receiver/simpleprometheusreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Status | |
| ------------------------ | -------------- |
| Stability | [unmaintained] |
| Stability | [beta] |
| Supported pipeline types | metrics |
| Distributions | [contrib] |

Expand Down Expand Up @@ -72,5 +72,5 @@ Example:
The full list of settings exposed for this receiver are documented [here](./config.go)
with detailed sample configurations [here](./testdata/config.yaml).
[unmaintained]:https://github.com/open-telemetry/opentelemetry-collector#unmaintained
[beta]:https://github.com/open-telemetry/opentelemetry-collector#beta
[contrib]:https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
11 changes: 0 additions & 11 deletions receiver/simpleprometheusreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ package simpleprometheusreceiver // import "github.com/open-telemetry/openteleme

import (
"context"
"sync"
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/config/confignet"
"go.opentelemetry.io/collector/consumer"
"go.uber.org/zap"
)

// This file implements factory for prometheus_simple receiver
Expand All @@ -35,8 +33,6 @@ const (
defaultMetricsPath = "/metrics"
)

var once sync.Once

var defaultCollectionInterval = 10 * time.Second

// NewFactory creates a factory for "Simple" Prometheus receiver.
Expand All @@ -58,19 +54,12 @@ func createDefaultConfig() config.Receiver {
}
}

func logStatus(logger *zap.Logger) {
once.Do(func() {
logger.Warn("prometheus_simple receiver is unmaintained and actively looking for contributors.")
})
}

func createMetricsReceiver(
_ context.Context,
params component.ReceiverCreateSettings,
cfg config.Receiver,
nextConsumer consumer.Metrics,
) (component.MetricsReceiver, error) {
rCfg := cfg.(*Config)
logStatus(params.Logger)
return new(params, rCfg, nextConsumer), nil
}
2 changes: 1 addition & 1 deletion receiver/simpleprometheusreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ require (
github.com/prometheus/prometheus v0.36.2
github.com/stretchr/testify v1.7.4
go.opentelemetry.io/collector v0.54.0
go.uber.org/zap v1.21.0
k8s.io/client-go v0.24.2
)

Expand Down Expand Up @@ -120,6 +119,7 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
Expand Down

0 comments on commit adabcb8

Please sign in to comment.