Added context into OTelReceiver.Pipelines() (#1364)

GoogleCloudPlatform · Aug 3, 2023 · a61363a · a61363a
1 parent b4438c2
commit a61363a
Show file tree

Hide file tree

Showing 38 changed files with 64 additions and 52 deletions.
diff --git a/apps/active_directory_ds.go b/apps/active_directory_ds.go
@@ -32,7 +32,7 @@ func (r MetricsReceiverActiveDirectoryDS) Type() string {
 	return "active_directory_ds"
 }
 
-func (r MetricsReceiverActiveDirectoryDS) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverActiveDirectoryDS) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	return []otel.ReceiverPipeline{{
 		Receiver: otel.Component{
 			Type: "active_directory_ds",

diff --git a/apps/activemq.go b/apps/activemq.go
@@ -15,6 +15,8 @@
 package apps
 
 import (
+	"context"
+
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 )
@@ -32,7 +34,7 @@ func (r MetricsReceiverActivemq) Type() string {
 	return "activemq"
 }
 
-func (r MetricsReceiverActivemq) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverActivemq) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 
 	targetSystem := "activemq"
 

diff --git a/apps/aerospike.go b/apps/aerospike.go
@@ -15,6 +15,7 @@
 package apps
 
 import (
+	"context"
 	"time"
 
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
@@ -50,7 +51,7 @@ var (
 )
 
 // Pipelines is the OTEL pipelines created from MetricsReceiverAerospike
-func (r MetricsReceiverAerospike) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverAerospike) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultAerospikeEndpoint
 	}

diff --git a/apps/apache.go b/apps/apache.go
@@ -36,7 +36,7 @@ func (r MetricsReceiverApache) Type() string {
 	return "apache"
 }
 
-func (r MetricsReceiverApache) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverApache) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.ServerStatusURL == "" {
 		r.ServerStatusURL = defaultServerStatusURL
 	}

diff --git a/apps/cassandra.go b/apps/cassandra.go
@@ -36,7 +36,7 @@ func (r MetricsReceiverCassandra) Type() string {
 	return "cassandra"
 }
 
-func (r MetricsReceiverCassandra) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverCassandra) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "cassandra"
 
 	return r.MetricsReceiverSharedJVM.

diff --git a/apps/couchbase.go b/apps/couchbase.go
@@ -43,7 +43,7 @@ func (r MetricsReceiverCouchbase) Type() string {
 }
 
 // Pipelines will construct the prometheus receiver configuration
-func (r MetricsReceiverCouchbase) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverCouchbase) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targets := []string{r.Endpoint}
 	if r.Endpoint == "" {
 		targets = []string{defaultCouchbaseEndpoint}

diff --git a/apps/couchdb.go b/apps/couchdb.go
@@ -40,7 +40,7 @@ func (MetricsReceiverCouchdb) Type() string {
 	return "couchdb"
 }
 
-func (r MetricsReceiverCouchdb) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverCouchdb) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultCouchdbEndpoint
 	}

diff --git a/apps/elasticsearch.go b/apps/elasticsearch.go
@@ -45,7 +45,7 @@ func (r MetricsReceiverElasticsearch) Type() string {
 	return "elasticsearch"
 }
 
-func (r MetricsReceiverElasticsearch) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverElasticsearch) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultElasticsearchEndpoint
 	}

diff --git a/apps/flink.go b/apps/flink.go
@@ -34,7 +34,7 @@ func (MetricsReceiverFlink) Type() string {
 
 const defaultFlinkEndpoint = "http://localhost:8081"
 
-func (r MetricsReceiverFlink) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverFlink) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultFlinkEndpoint
 	}

diff --git a/apps/hadoop.go b/apps/hadoop.go
@@ -35,7 +35,7 @@ func (r MetricsReceiverHadoop) Type() string {
 	return "hadoop"
 }
 
-func (r MetricsReceiverHadoop) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverHadoop) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "hadoop"
 	if r.MetricsReceiverSharedCollectJVM.ShouldCollectJVMMetrics() {
 		targetSystem = fmt.Sprintf("%s,%s", targetSystem, "jvm")

diff --git a/apps/hbase.go b/apps/hbase.go
@@ -35,7 +35,7 @@ func (r MetricsReceiverHbase) Type() string {
 	return "hbase"
 }
 
-func (r MetricsReceiverHbase) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverHbase) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "hbase"
 	if r.MetricsReceiverSharedCollectJVM.ShouldCollectJVMMetrics() {
 		targetSystem = fmt.Sprintf("%s,%s", targetSystem, "jvm")

diff --git a/apps/hostmetrics.go b/apps/hostmetrics.go
@@ -15,6 +15,8 @@
 package apps
 
 import (
+	"context"
+
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 )
@@ -29,7 +31,7 @@ func (r MetricsReceiverHostmetrics) Type() string {
 	return "hostmetrics"
 }
 
-func (r MetricsReceiverHostmetrics) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverHostmetrics) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	return []otel.ReceiverPipeline{{
 		Receiver: otel.Component{
 			Type: "hostmetrics",

diff --git a/apps/iis.go b/apps/iis.go
@@ -36,7 +36,7 @@ func (r MetricsReceiverIis) Type() string {
 	return "iis"
 }
 
-func (r MetricsReceiverIis) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverIis) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.ReceiverVersion == "2" {
 		return []otel.ReceiverPipeline{{
 			Receiver: otel.Component{

diff --git a/apps/jetty.go b/apps/jetty.go
@@ -35,7 +35,7 @@ func (r MetricsReceiverJetty) Type() string {
 	return "jetty"
 }
 
-func (r MetricsReceiverJetty) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverJetty) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "jetty"
 	if r.MetricsReceiverSharedCollectJVM.ShouldCollectJVMMetrics() {
 		targetSystem = fmt.Sprintf("%s,%s", targetSystem, "jvm")

diff --git a/apps/jvm.go b/apps/jvm.go
@@ -15,6 +15,8 @@
 package apps
 
 import (
+	"context"
+
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 )
@@ -31,7 +33,7 @@ func (r MetricsReceiverJVM) Type() string {
 	return "jvm"
 }
 
-func (r MetricsReceiverJVM) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverJVM) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	return r.MetricsReceiverSharedJVM.
 		WithDefaultEndpoint(defaultJVMEndpoint).
 		ConfigurePipelines(

diff --git a/apps/kafka.go b/apps/kafka.go
@@ -35,7 +35,7 @@ func (r MetricsReceiverKafka) Type() string {
 	return "kafka"
 }
 
-func (r MetricsReceiverKafka) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverKafka) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "kafka"
 	return r.MetricsReceiverSharedJVM.
 		WithDefaultEndpoint(defaultKafkaEndpoint).

diff --git a/apps/memcached.go b/apps/memcached.go
@@ -15,6 +15,8 @@
 package apps
 
 import (
+	"context"
+
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 )
@@ -33,7 +35,7 @@ func (r MetricsReceiverMemcached) Type() string {
 	return "memcached"
 }
 
-func (r MetricsReceiverMemcached) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverMemcached) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultMemcachedTCPEndpoint
 	}

diff --git a/apps/mongodb.go b/apps/mongodb.go
@@ -46,7 +46,7 @@ func (r MetricsReceiverMongoDB) Type() string {
 	return "mongodb"
 }
 
-func (r MetricsReceiverMongoDB) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverMongoDB) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	transport := "tcp"
 	if r.Endpoint == "" {
 		r.Endpoint = defaultMongodbEndpoint

diff --git a/apps/mssql.go b/apps/mssql.go
@@ -15,6 +15,8 @@
 package apps
 
 import (
+	"context"
+
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 	"github.com/GoogleCloudPlatform/ops-agent/internal/platform"
@@ -32,7 +34,7 @@ func (MetricsReceiverMssql) Type() string {
 	return "mssql"
 }
 
-func (m MetricsReceiverMssql) Pipelines() []otel.ReceiverPipeline {
+func (m MetricsReceiverMssql) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if m.ReceiverVersion == "2" {
 		return []otel.ReceiverPipeline{{
 			Receiver: otel.Component{

diff --git a/apps/mysql.go b/apps/mysql.go
@@ -16,16 +16,15 @@ package apps
 
 import (
 	"context"
+	"fmt"
+	"strings"
 
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 	"github.com/GoogleCloudPlatform/ops-agent/internal/secret"
 
 	"github.com/go-sql-driver/mysql"
-
-	"fmt"
-	"strings"
 )
 
 type MetricsReceiverMySql struct {
@@ -45,7 +44,7 @@ func (r MetricsReceiverMySql) Type() string {
 	return "mysql"
 }
 
-func (r MetricsReceiverMySql) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverMySql) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	transport := "tcp"
 	if r.Endpoint == "" {
 		transport = "unix"

diff --git a/apps/nginx.go b/apps/nginx.go
@@ -36,7 +36,7 @@ func (r MetricsReceiverNginx) Type() string {
 	return "nginx"
 }
 
-func (r MetricsReceiverNginx) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverNginx) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.StubStatusURL == "" {
 		r.StubStatusURL = defaultStubStatusURL
 	}

diff --git a/apps/oracledb.go b/apps/oracledb.go
@@ -49,7 +49,7 @@ func (r MetricsReceiverOracleDB) Type() string {
 	return "oracledb"
 }
 
-func (r MetricsReceiverOracleDB) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverOracleDB) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	endpoint := r.Endpoint
 	if r.Endpoint == "" {
 		endpoint = defaultOracleDBEndpoint

diff --git a/apps/otlp.go b/apps/otlp.go
@@ -15,6 +15,7 @@
 package apps
 
 import (
+	"context"
 	"fmt"
 	"regexp"
 	"strings"
@@ -119,7 +120,7 @@ func (r ReceiverOTLP) metricsProcessors() (otel.ExporterType, otel.ResourceDetec
 	}
 }
 
-func (r ReceiverOTLP) Pipelines() []otel.ReceiverPipeline {
+func (r ReceiverOTLP) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	endpoint := r.GRPCEndpoint
 	if endpoint == "" {
 		endpoint = defaultGRPCEndpoint

diff --git a/apps/postgresql.go b/apps/postgresql.go
@@ -16,13 +16,12 @@ package apps
 
 import (
 	"context"
+	"strings"
 
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 	"github.com/GoogleCloudPlatform/ops-agent/internal/secret"
-
-	"strings"
 )
 
 type MetricsReceiverPostgresql struct {
@@ -46,7 +45,7 @@ func (r MetricsReceiverPostgresql) Type() string {
 	return "postgresql"
 }
 
-func (r MetricsReceiverPostgresql) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverPostgresql) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	transport := "tcp"
 	if r.Endpoint == "" {
 		transport = "unix"

diff --git a/apps/rabbitmq.go b/apps/rabbitmq.go
@@ -134,7 +134,7 @@ func (r MetricsReceiverRabbitmq) Type() string {
 	return "rabbitmq"
 }
 
-func (r MetricsReceiverRabbitmq) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverRabbitmq) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultRabbitmqTCPEndpoint
 	}

diff --git a/apps/redis.go b/apps/redis.go
@@ -40,7 +40,7 @@ func (r MetricsReceiverRedis) Type() string {
 	return "redis"
 }
 
-func (r MetricsReceiverRedis) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverRedis) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Address == "" {
 		r.Address = defaultRedisEndpoint
 	}

diff --git a/apps/saphana.go b/apps/saphana.go
@@ -154,7 +154,7 @@ func (s MetricsReceiverSapHana) Type() string {
 	return "saphana"
 }
 
-func (s MetricsReceiverSapHana) Pipelines() []otel.ReceiverPipeline {
+func (s MetricsReceiverSapHana) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if s.Endpoint == "" {
 		s.Endpoint = defaultSapHanaEndpoint
 	}

diff --git a/apps/solr.go b/apps/solr.go
@@ -34,7 +34,7 @@ func (r MetricsReceiverSolr) Type() string {
 	return "solr"
 }
 
-func (r MetricsReceiverSolr) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverSolr) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "solr"
 
 	return r.MetricsReceiverSharedJVM.

diff --git a/apps/tomcat.go b/apps/tomcat.go
@@ -36,7 +36,7 @@ func (r MetricsReceiverTomcat) Type() string {
 	return "tomcat"
 }
 
-func (r MetricsReceiverTomcat) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverTomcat) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "tomcat"
 
 	return r.MetricsReceiverSharedJVM.

diff --git a/apps/varnish.go b/apps/varnish.go
@@ -33,7 +33,7 @@ func (MetricsReceiverVarnish) Type() string {
 	return "varnish"
 }
 
-func (r MetricsReceiverVarnish) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverVarnish) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	return []otel.ReceiverPipeline{{
 		Receiver: otel.Component{
 			Type: "varnish",

diff --git a/apps/vault.go b/apps/vault.go
@@ -75,7 +75,7 @@ func (r MetricsReceiverVault) Type() string {
 	return "vault"
 }
 
-func (r MetricsReceiverVault) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverVault) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultVaultEndpoint
 	}

diff --git a/apps/wildfly.go b/apps/wildfly.go
@@ -35,7 +35,7 @@ func (r MetricsReceiverWildfly) Type() string {
 	return "wildfly"
 }
 
-func (r MetricsReceiverWildfly) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverWildfly) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	targetSystem := "wildfly"
 
 	if r.MetricsReceiverSharedJVM.Endpoint != "" && !strings.HasPrefix(r.MetricsReceiverSharedJVM.Endpoint, "service:jmx") {

diff --git a/apps/zookeeper.go b/apps/zookeeper.go
@@ -40,7 +40,7 @@ func (MetricsReceiverZookeeper) Type() string {
 	return "zookeeper"
 }
 
-func (r MetricsReceiverZookeeper) Pipelines() []otel.ReceiverPipeline {
+func (r MetricsReceiverZookeeper) Pipelines(_ context.Context) []otel.ReceiverPipeline {
 	if r.Endpoint == "" {
 		r.Endpoint = defaultZookeeperEndpoint
 	}