Skip to content

Commit

Permalink
Integrate nginxreceiver (#9572)
Browse files Browse the repository at this point in the history
* Add nginxreceiver factory to components

This enables using the nginxreceiver in the collector built from this
repo.

* Import nginxreceiver in components

* add replace rule for nginxreceiver in go.mod && make tidy

* update go.mod in cmd/configschema

First `make tidy` in the cmd/configschema module then add the replace
directive on receiver/nginxreceiver using the relative path.

* Add nginx check to receivers_test.go

* gofmt components.go

* Add nginx-receiver to go.mod in root and configcshema

* Add bug fix to CHANGELOG

* Remove errant linespace in receivers_test

* Require nginxreceiver v0.50.0 in go.mod

Co-authored-by: Alex Boten <aboten@lightstep.com>
  • Loading branch information
nslaughter and Alex Boten authored May 4, 2022
1 parent 99d2204 commit bcbf2db
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- `opencensusreceiver`: Do not report fatal error if err is server closed (#9559).
- `sqlserverreceiver`: Fix the receiver to have integer types on metrics where applicable (#9601)
- `prometheusreceiver`: Fix the memory issue introduced in the 0.49.0 release (#9718)
- `nginxreceiver`: Include nginxreceiver in components (#9572)

## v0.50.0

Expand Down
4 changes: 4 additions & 0 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ require (
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/newrelic/newrelic-telemetry-sdk-go v0.8.1 // indirect
github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect
github.com/observiq/ctimefmt v1.0.0 // indirect
github.com/olivere/elastic v6.2.37+incompatible // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.50.0 // indirect
Expand Down Expand Up @@ -346,6 +347,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.50.0 // indirect
Expand Down Expand Up @@ -758,6 +760,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongo

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

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

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver => ../../receiver/podmanreceiver
Expand Down
5 changes: 4 additions & 1 deletion cmd/configschema/go.sum

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

5 changes: 5 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.50.0
Expand Down Expand Up @@ -330,6 +331,7 @@ require (
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -341,6 +343,7 @@ require (
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/newrelic/newrelic-telemetry-sdk-go v0.8.1 // indirect
github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect
github.com/observiq/ctimefmt v1.0.0 // indirect
github.com/olivere/elastic v6.2.37+incompatible // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.50.0 // indirect
Expand Down Expand Up @@ -762,6 +765,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongo

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

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

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver => ./receiver/podmanreceiver
Expand Down
9 changes: 8 additions & 1 deletion go.sum

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

2 changes: 2 additions & 0 deletions internal/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver"
Expand Down Expand Up @@ -205,6 +206,7 @@ func Components() (component.Factories, error) {
memcachedreceiver.NewFactory(),
mongodbatlasreceiver.NewFactory(),
mysqlreceiver.NewFactory(),
nginxreceiver.NewFactory(),
opencensusreceiver.NewFactory(),
otlpreceiver.NewFactory(),
podmanreceiver.NewFactory(),
Expand Down
3 changes: 3 additions & 0 deletions internal/components/receivers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ func TestDefaultReceivers(t *testing.T) {
{
receiver: "mysql",
},
{
receiver: "nginx",
},
{
receiver: "opencensus",
skipLifecyle: true, // TODO: Usage of CMux doesn't allow proper shutdown.
Expand Down

0 comments on commit bcbf2db

Please sign in to comment.