Skip to content

Commit

Permalink
[chore] add missing components to otelcontribcol (#21989)
Browse files Browse the repository at this point in the history
Adds cloudflarereceiver, oracledbreceiver, prometheusexecreceiver, pulsarreceiver and windowseventlogreceiver.
  • Loading branch information
atoulme authored May 17, 2023
1 parent 525d24b commit 4a2f6ec
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 2 deletions.
12 changes: 12 additions & 0 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.77.0
Expand Down Expand Up @@ -118,6 +119,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.77.0
Expand Down Expand Up @@ -154,10 +156,13 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefbreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.77.0
Expand All @@ -182,6 +187,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.77.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.77.0

Expand Down Expand Up @@ -387,6 +393,12 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/lokireceiver => ../../receiver/lokireceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver => ../../receiver/filestatsreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter => ../../exporter/awss3exporter
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver => ../../receiver/pulsarreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver => ../../receiver/oracledbreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver => ../../receiver/cloudflarereceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver => ../../receiver/prometheusexecreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver => ../../receiver/windowseventlogreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver => ../../extension/observer/ecsobserver
# see https://github.com/mattn/go-ieproxy/issues/45
- github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
Expand Down
12 changes: 12 additions & 0 deletions cmd/otelcontribcol/components.go

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

4 changes: 4 additions & 0 deletions cmd/otelcontribcol/extensions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ func TestDefaultExtensions(t *testing.T) {
return cfg
},
},
{
extension: "ecs_observer",
skipLifecycle: true,
},
{
extension: "ecs_task_observer",
getConfigFn: func() component.Config {
Expand Down
19 changes: 19 additions & 0 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.77.0
Expand Down Expand Up @@ -108,6 +109,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.77.0
Expand Down Expand Up @@ -144,10 +146,13 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefbreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.77.0
Expand All @@ -171,6 +176,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.77.0
Expand Down Expand Up @@ -445,6 +451,7 @@ require (
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
Expand Down Expand Up @@ -1055,6 +1062,18 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/files

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter => ../../exporter/awss3exporter

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

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

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

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

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver => ../../extension/observer/ecsobserver

replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
Expand Down
1 change: 1 addition & 0 deletions cmd/otelcontribcol/go.sum

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

4 changes: 4 additions & 0 deletions cmd/otelcontribcol/receivers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ func TestDefaultReceivers(t *testing.T) {
},
skipLifecyle: true, // Panics after test have completed, requires a wait group
},
{
receiver: "cloudflare",
skipLifecyle: true,
},
{
receiver: "cloudfoundry",
skipLifecyle: true, // Requires UAA (auth) endpoint to run
Expand Down
4 changes: 2 additions & 2 deletions receiver/pulsarreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type Config struct {

type Authentication struct {
TLS *TLS `mapstructure:"tls"`
Token *Token `mapstructure:"Token"`
Token *Token `mapstructure:"token"`
Athenz *Athenz `mapstructure:"athenz"`
OAuth2 *OAuth2 `mapstructure:"oauth2"`
}
Expand All @@ -53,7 +53,7 @@ type TLS struct {
}

type Token struct {
Token string `mapstructure:"Token"`
Token string `mapstructure:"token"`
}

type Athenz struct {
Expand Down
6 changes: 6 additions & 0 deletions receiver/pulsarreceiver/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,9 @@ func TestLoadConfig(t *testing.T) {
cfg,
)
}

func TestDefaultConfig(t *testing.T) {
factory := NewFactory()
cfg := factory.CreateDefaultConfig().(*Config)
require.NoError(t, cfg.Validate())
}

0 comments on commit 4a2f6ec

Please sign in to comment.