From ba9e3e5f2f53e55d0be8c8070891970bea760666 Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 09:35:52 +1000 Subject: [PATCH 1/7] add expvarreceiver to components.go --- internal/components/components.go | 2 ++ internal/components/receivers_test.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/internal/components/components.go b/internal/components/components.go index 4efca8895a29..a43e29d08591 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -113,6 +113,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver" @@ -206,6 +207,7 @@ func Components() (component.Factories, error) { dockerstatsreceiver.NewFactory(), dotnetdiagnosticsreceiver.NewFactory(), elasticsearchreceiver.NewFactory(), + expvarreceiver.NewFactory(), filelogreceiver.NewFactory(), flinkmetricsreceiver.NewFactory(), fluentforwardreceiver.NewFactory(), diff --git a/internal/components/receivers_test.go b/internal/components/receivers_test.go index 3fb80bf16c19..2bd83e27259d 100644 --- a/internal/components/receivers_test.go +++ b/internal/components/receivers_test.go @@ -106,6 +106,9 @@ func TestDefaultReceivers(t *testing.T) { { receiver: "elasticsearch", }, + { + receiver: "expvar", + }, { receiver: "filelog", getConfigFn: func() config.Receiver { From 26e9cbdece546e43746c3acd602242b041eb10a5 Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 09:59:39 +1000 Subject: [PATCH 2/7] add to changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dac8a50e3da..dda23449d31f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ ### 🚀 New components 🚀 +- `expvarreceiver`: Include `expvarreceiver` in components (#10847) + ### 💡 Enhancements 💡 ### 🧰 Bug fixes 🧰 From 6c9bc42d1657853082985c646df9460bca1c727f Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 10:02:53 +1000 Subject: [PATCH 3/7] add to go.mod --- cmd/configschema/go.mod | 3 +++ go.mod | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 7e0fac02c109..1b892e216b4a 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -355,6 +355,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.53.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.53.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.53.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.53.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.53.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.53.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.53.0 // indirect @@ -775,6 +776,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotne replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver => ../../receiver/elasticsearchreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver => ../../receiver/expvarreceiver + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver => ../../receiver/filelogreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ../../receiver/flinkmetricsreceiver diff --git a/go.mod b/go.mod index 723c753af87b..e0147243c415 100644 --- a/go.mod +++ b/go.mod @@ -93,6 +93,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.53.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.53.0 @@ -780,6 +781,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotne replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver => ./receiver/elasticsearchreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver => ./receiver/expvarreceiver + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver => ./receiver/filelogreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver => ./receiver/fluentforwardreceiver From 70a6e51773acf6cbcff27180b87883ae8764cc46 Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 10:25:52 +1000 Subject: [PATCH 4/7] mark as alpha --- receiver/expvarreceiver/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/expvarreceiver/README.md b/receiver/expvarreceiver/README.md index 618b3caa4223..67691d9cef94 100644 --- a/receiver/expvarreceiver/README.md +++ b/receiver/expvarreceiver/README.md @@ -5,7 +5,7 @@ which exposes data in JSON format from an HTTP endpoint. The metrics are extracted from the `expvar` variable [memstats](https://pkg.go.dev/runtime#MemStats), which exposes various information about the Go runtime. -> :construction: This receiver is in development and incomplete. It should not be used yet. +> :construction: This component is in alpha and configuration fields are subject to change. ## Configuration From e8f8bb7b6d69d1056d7c82c30e3409bd6ec0dec7 Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 11:58:43 +1000 Subject: [PATCH 5/7] add status header --- receiver/expvarreceiver/README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/receiver/expvarreceiver/README.md b/receiver/expvarreceiver/README.md index 67691d9cef94..2493caed0f95 100644 --- a/receiver/expvarreceiver/README.md +++ b/receiver/expvarreceiver/README.md @@ -1,12 +1,16 @@ # Expvar Receiver +| Status | | +| ------------------------ |-----------| +| Stability | [beta] | +| Supported pipeline types | metrics | +| Distributions | [contrib] | + An Expvar Receiver scrapes metrics from [expvar](https://pkg.go.dev/expvar), which exposes data in JSON format from an HTTP endpoint. The metrics are extracted from the `expvar` variable [memstats](https://pkg.go.dev/runtime#MemStats), which exposes various information about the Go runtime. -> :construction: This component is in alpha and configuration fields are subject to change. - ## Configuration ### Default From 29f67eac262184094e64d98645a8be98e8e467d6 Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 12:03:56 +1000 Subject: [PATCH 6/7] alpha not beta --- receiver/expvarreceiver/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/expvarreceiver/README.md b/receiver/expvarreceiver/README.md index 2493caed0f95..32c3969c9f7d 100644 --- a/receiver/expvarreceiver/README.md +++ b/receiver/expvarreceiver/README.md @@ -2,7 +2,7 @@ | Status | | | ------------------------ |-----------| -| Stability | [beta] | +| Stability | [alpha] | | Supported pipeline types | metrics | | Distributions | [contrib] | From 86abb65b5e98a548abdc99afc1743d2b9f7945fa Mon Sep 17 00:00:00 2001 From: James Moessis Date: Thu, 9 Jun 2022 12:28:47 +1000 Subject: [PATCH 7/7] add links --- receiver/expvarreceiver/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/receiver/expvarreceiver/README.md b/receiver/expvarreceiver/README.md index 32c3969c9f7d..e92c9d9265e7 100644 --- a/receiver/expvarreceiver/README.md +++ b/receiver/expvarreceiver/README.md @@ -49,4 +49,7 @@ receivers: enabled: true process.runtime.memstats.mallocs: enabled: false -``` \ No newline at end of file +``` + +[alpha]:https://github.com/open-telemetry/opentelemetry-collector#alpha +[contrib]:https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib \ No newline at end of file