diff --git a/apps/active_directory_ds.go b/apps/active_directory_ds.go index 2d552f5f9e..c1ebb4bd5b 100644 --- a/apps/active_directory_ds.go +++ b/apps/active_directory_ds.go @@ -49,6 +49,7 @@ func (r MetricsReceiverActiveDirectoryDS) Pipelines(_ context.Context) ([]otel.R otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/activemq.go b/apps/activemq.go index 2a97efaca7..56c463e834 100644 --- a/apps/activemq.go +++ b/apps/activemq.go @@ -51,6 +51,7 @@ func (r MetricsReceiverActivemq) Pipelines(_ context.Context) ([]otel.ReceiverPi otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/aerospike.go b/apps/aerospike.go index d4fc4145d1..3a24a89dad 100644 --- a/apps/aerospike.go +++ b/apps/aerospike.go @@ -99,6 +99,7 @@ func (r MetricsReceiverAerospike) Pipelines(_ context.Context) ([]otel.ReceiverP otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/apache.go b/apps/apache.go index 2962cbf454..c0b2f904f6 100644 --- a/apps/apache.go +++ b/apps/apache.go @@ -62,6 +62,7 @@ func (r MetricsReceiverApache) Pipelines(_ context.Context) ([]otel.ReceiverPipe otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/cassandra.go b/apps/cassandra.go index 1fb3e64bb9..44567a915a 100644 --- a/apps/cassandra.go +++ b/apps/cassandra.go @@ -51,6 +51,7 @@ func (r MetricsReceiverCassandra) Pipelines(_ context.Context) ([]otel.ReceiverP otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/couchbase.go b/apps/couchbase.go index 6e26c36a57..95a5c5a534 100644 --- a/apps/couchbase.go +++ b/apps/couchbase.go @@ -167,6 +167,7 @@ func (r MetricsReceiverCouchbase) Pipelines(_ context.Context) ([]otel.ReceiverP otel.SetScopeVersion("1.0"), )..., ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/couchdb.go b/apps/couchdb.go index bd7a71ff0d..cb3a786fa8 100644 --- a/apps/couchdb.go +++ b/apps/couchdb.go @@ -62,6 +62,7 @@ func (r MetricsReceiverCouchdb) Pipelines(_ context.Context) ([]otel.ReceiverPip otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/elasticsearch.go b/apps/elasticsearch.go index 4cb2366e82..c3de718394 100644 --- a/apps/elasticsearch.go +++ b/apps/elasticsearch.go @@ -92,6 +92,7 @@ func (r MetricsReceiverElasticsearch) Pipelines(_ context.Context) ([]otel.Recei otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/flink.go b/apps/flink.go index 46714bf6bb..edae9557b9 100644 --- a/apps/flink.go +++ b/apps/flink.go @@ -64,6 +64,7 @@ func (r MetricsReceiverFlink) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/hadoop.go b/apps/hadoop.go index f955c189d0..2f4ffda875 100644 --- a/apps/hadoop.go +++ b/apps/hadoop.go @@ -53,6 +53,7 @@ func (r MetricsReceiverHadoop) Pipelines(_ context.Context) ([]otel.ReceiverPipe otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/hbase.go b/apps/hbase.go index 91a07bde7a..409720fd81 100644 --- a/apps/hbase.go +++ b/apps/hbase.go @@ -56,6 +56,7 @@ func (r MetricsReceiverHbase) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/iis.go b/apps/iis.go index b54d7f1fbb..cd8e454dd3 100644 --- a/apps/iis.go +++ b/apps/iis.go @@ -52,6 +52,7 @@ func (r MetricsReceiverIis) Pipelines(_ context.Context) ([]otel.ReceiverPipelin otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("2.0"), ), + otel.MetricsRemoveServiceAttributes(), // Drop all resource keys; Must be done in a separate transform, // otherwise the above flatten resource attribute queries will only // work for the first datapoint diff --git a/apps/jetty.go b/apps/jetty.go index 632af2176e..bd20411f62 100644 --- a/apps/jetty.go +++ b/apps/jetty.go @@ -53,6 +53,7 @@ func (r MetricsReceiverJetty) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/jvm.go b/apps/jvm.go index 13418254a3..a7ea3ac20d 100644 --- a/apps/jvm.go +++ b/apps/jvm.go @@ -47,6 +47,7 @@ func (r MetricsReceiverJVM) Pipelines(_ context.Context) ([]otel.ReceiverPipelin otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/kafka.go b/apps/kafka.go index 915d0b5e05..6a6ce8d86e 100644 --- a/apps/kafka.go +++ b/apps/kafka.go @@ -66,6 +66,7 @@ func (r MetricsReceiverKafka) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/memcached.go b/apps/memcached.go index c37ba47316..fda7f45269 100644 --- a/apps/memcached.go +++ b/apps/memcached.go @@ -63,6 +63,7 @@ func (r MetricsReceiverMemcached) Pipelines(_ context.Context) ([]otel.ReceiverP otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/mongodb.go b/apps/mongodb.go index 84ba39f97e..a0992b5b4a 100644 --- a/apps/mongodb.go +++ b/apps/mongodb.go @@ -86,6 +86,7 @@ func (r MetricsReceiverMongoDB) Pipelines(_ context.Context) ([]otel.ReceiverPip otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/mssql.go b/apps/mssql.go index ee06b13ae6..3d6cbe5aea 100644 --- a/apps/mssql.go +++ b/apps/mssql.go @@ -56,6 +56,7 @@ func (m MetricsReceiverMssql) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+m.Type()), otel.SetScopeVersion("2.0"), ), + otel.MetricsRemoveServiceAttributes(), otel.NormalizeSums(), }}, }}, nil diff --git a/apps/mysql.go b/apps/mysql.go index 0ef87efd8e..86b378d3e3 100644 --- a/apps/mysql.go +++ b/apps/mysql.go @@ -123,6 +123,7 @@ func (r MetricsReceiverMySql) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }, }, nil diff --git a/apps/nginx.go b/apps/nginx.go index 9a2848155a..3de0f8ff78 100644 --- a/apps/nginx.go +++ b/apps/nginx.go @@ -56,6 +56,7 @@ func (r MetricsReceiverNginx) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/oracledb.go b/apps/oracledb.go index 13c0f69155..135972fc82 100644 --- a/apps/oracledb.go +++ b/apps/oracledb.go @@ -123,6 +123,7 @@ func (r MetricsReceiverOracleDB) Pipelines(_ context.Context) ([]otel.ReceiverPi otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } @@ -132,11 +133,11 @@ var oracleQueries = []sqlReceiverQuery{ query: `SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS, (select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE, (select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE - FROM sys.dba_tablespaces ts + FROM sys.dba_tablespaces ts WHERE ts.contents <> 'TEMPORARY' UNION ALL SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS, - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, + SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, SUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE FROM SYS.V_$$sort_segment ss JOIN sys.v_$$tablespace ts @@ -232,7 +233,7 @@ var oracleQueries = []sqlReceiverQuery{ }, { query: `SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -424,8 +425,8 @@ var oracleQueries = []sqlReceiverQuery{ }, }, { - query: `SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + query: `SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -480,8 +481,8 @@ var oracleQueries = []sqlReceiverQuery{ }, }, { - query: `SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + query: `SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) diff --git a/apps/postgresql.go b/apps/postgresql.go index 903f06e970..9b96d899d2 100644 --- a/apps/postgresql.go +++ b/apps/postgresql.go @@ -100,6 +100,7 @@ func (r MetricsReceiverPostgresql) Pipelines(_ context.Context) ([]otel.Receiver ), otel.AddPrefix("workload.googleapis.com"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/rabbitmq.go b/apps/rabbitmq.go index c21e03695b..b04a77881d 100644 --- a/apps/rabbitmq.go +++ b/apps/rabbitmq.go @@ -153,6 +153,7 @@ func (r MetricsReceiverRabbitmq) Pipelines(_ context.Context) ([]otel.ReceiverPi otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/redis.go b/apps/redis.go index 97a4dc4aac..720da4bcd5 100644 --- a/apps/redis.go +++ b/apps/redis.go @@ -77,6 +77,7 @@ func (r MetricsReceiverRedis) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/saphana.go b/apps/saphana.go index db0ffa8d26..bf5515e8e1 100644 --- a/apps/saphana.go +++ b/apps/saphana.go @@ -168,6 +168,7 @@ func (s MetricsReceiverSapHana) Pipelines(_ context.Context) ([]otel.ReceiverPip otel.SetScopeName("agent.googleapis.com/"+s.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/solr.go b/apps/solr.go index 97ce816dda..23b8f7931b 100644 --- a/apps/solr.go +++ b/apps/solr.go @@ -49,6 +49,7 @@ func (r MetricsReceiverSolr) Pipelines(_ context.Context) ([]otel.ReceiverPipeli otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/tomcat.go b/apps/tomcat.go index 375e0eed1f..2e9d921a45 100644 --- a/apps/tomcat.go +++ b/apps/tomcat.go @@ -51,6 +51,7 @@ func (r MetricsReceiverTomcat) Pipelines(_ context.Context) ([]otel.ReceiverPipe otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/varnish.go b/apps/varnish.go index 9fbdd9c236..3c92e92ba0 100644 --- a/apps/varnish.go +++ b/apps/varnish.go @@ -51,6 +51,7 @@ func (r MetricsReceiverVarnish) Pipelines(_ context.Context) ([]otel.ReceiverPip otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/vault.go b/apps/vault.go index 38a055c471..60ce399863 100644 --- a/apps/vault.go +++ b/apps/vault.go @@ -178,6 +178,7 @@ func (r MetricsReceiverVault) Pipelines(_ context.Context) ([]otel.ReceiverPipel otel.MetricsTransform( otel.AddPrefix("workload.googleapis.com"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/apps/wildfly.go b/apps/wildfly.go index a9d1e3fe80..ca857389c3 100644 --- a/apps/wildfly.go +++ b/apps/wildfly.go @@ -55,6 +55,7 @@ func (r MetricsReceiverWildfly) Pipelines(_ context.Context) ([]otel.ReceiverPip otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }, ) } diff --git a/apps/zookeeper.go b/apps/zookeeper.go index 41b7098851..38a4ee682e 100644 --- a/apps/zookeeper.go +++ b/apps/zookeeper.go @@ -61,6 +61,7 @@ func (r MetricsReceiverZookeeper) Pipelines(_ context.Context) ([]otel.ReceiverP otel.SetScopeName("agent.googleapis.com/"+r.Type()), otel.SetScopeVersion("1.0"), ), + otel.MetricsRemoveServiceAttributes(), }}, }}, nil } diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go index e7058c4c0e..a50b1602b8 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go @@ -34,7 +34,7 @@ import ( "github.com/GoogleCloudPlatform/ops-agent/internal/platform" ) -func googleCloudExporter(userAgent string, instrumentationLabels bool) otel.Component { +func googleCloudExporter(userAgent string, instrumentationLabels bool, serviceResourceLabels bool) otel.Component { return otel.Component{ Type: "googlecloud", Config: map[string]interface{}{ @@ -50,8 +50,7 @@ func googleCloudExporter(userAgent string, instrumentationLabels bool) otel.Comp // Omit instrumentation labels, which break agent metrics. "instrumentation_library_labels": instrumentationLabels, // Omit service labels, which break agent metrics. - // TODO: Enable with instrumentationLabels when values are sane. - "service_resource_labels": false, + "service_resource_labels": serviceResourceLabels, "resource_filters": []map[string]interface{}{}, }, }, @@ -127,8 +126,8 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir string) Pipelines: pipelines, Extensions: extensions, Exporters: map[otel.ExporterType]otel.Component{ - otel.System: googleCloudExporter(userAgent, false), - otel.OTel: googleCloudExporter(userAgent, true), + otel.System: googleCloudExporter(userAgent, false, false), + otel.OTel: googleCloudExporter(userAgent, true, true), otel.GMP: googleManagedPrometheusExporter(userAgent), }, }.Generate(ctx) diff --git a/confgenerator/otel/processors.go b/confgenerator/otel/processors.go index 27d6885456..c243619109 100644 --- a/confgenerator/otel/processors.go +++ b/confgenerator/otel/processors.go @@ -233,6 +233,36 @@ func TransformationMetrics(queries ...TransformQuery) Component { } } +// MetricsRemoveServiceAttributes will remove any service attributes that the +// googlecloudexporter attempts to promote from resource to metric attributes. +// The attributes it removes are specified at: +// https://opentelemetry.io/docs/specs/semconv/registry/attributes/service/ +// +// This does not use the typical TransformQuery API because it needs to have +// a silent error_mode and use the resource context. The latter would have been +// easily fixable, but the error_mode would have required a major refactor for +// this to be the only TransformQuery making use of it. +// - @braydonk +func MetricsRemoveServiceAttributes() Component { + return Component{ + Type: "transform", + Config: map[string]any{ + "metric_statements": []map[string]any{ + { + "context": "resource", + "error_mode": "silent", + "statements": []string{ + `delete_key(attributes, "service.name")`, + `delete_key(attributes, "service.instance.id")`, + `delete_key(attributes, "service.namespace")`, + `delete_key(attributes, "service.version")`, + }, + }, + }, + }, + } +} + // TransformQueryContext is a type wrapper for the context of a query expression within the transoform processor type TransformQueryContext string diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml index 77b8d92b3c..24942ea1e5 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml index e6746ab62a..813e330f2c 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml index 219df401de..d097bb5b8a 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml index 219df401de..d097bb5b8a 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml index 8d059a9a0c..58d11acf59 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml index 2ce6b9e1b5..1b571e64f3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml index 8da63e31fa..6d72ce7209 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml index 8da63e31fa..6d72ce7209 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml index e438987ebb..0b491c4db7 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml index 654db43f34..b04cf11366 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml index d082ee6b20..d116bb247e 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml index d082ee6b20..d116bb247e 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml index e438987ebb..0b491c4db7 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml index 654db43f34..b04cf11366 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml index d082ee6b20..d116bb247e 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml index d082ee6b20..d116bb247e 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml index 3e6014496b..3e5c25fbac 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml index 85a8d6dc96..fb70ab27e6 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml index 336aa8eced..84661dcc85 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml index 336aa8eced..84661dcc85 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) googlemanagedprometheus: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml index 981857b983..029aaf2c52 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml index e998b96236..0549acd790 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml index bc8fd96bfd..b5599b670c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml index bc8fd96bfd..b5599b670c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml index 33b6f0b840..d48d899b39 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml index 062dcb2385..1d8e5ba711 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml index 0d1cafbb70..2e8367a227 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml index 0d1cafbb70..2e8367a227 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml index bbc34a3b6c..ee47447db5 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml index 6c89fcfba4..00c4825c0b 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml index 0af4ebd9ab..553a3f2e30 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml index 0af4ebd9ab..553a3f2e30 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index de8b1b3656..a13731aa18 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml index 36a7d09bc0..f73eaad382 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 327206239e..b1f317bd9e 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml index 327206239e..b1f317bd9e 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml index 9341578b2a..d67150c4eb 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml index ed902971a7..52c6e8c772 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml index b2fe685364..1f2672353d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml index 149b04e807..96af743f1d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml index 4ced253aca..45cf13360e 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml index 4ced253aca..45cf13360e 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml index b869b0855c..a0352c1ce2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -547,6 +556,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml index 64a1dad972..8f24a40dbc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -516,6 +525,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml index 36d7b0d448..032e143ae6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml index 36d7b0d448..032e143ae6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml index b869b0855c..a0352c1ce2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -547,6 +556,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml index 64a1dad972..8f24a40dbc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -516,6 +525,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml index 36d7b0d448..032e143ae6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml index 36d7b0d448..032e143ae6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/activemq") - set(version, "1.0") + transform/activemq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/activemq_0 - metricstransform/activemq_1 - transform/activemq_2 + - transform/activemq_3 - resourcedetection/_global_0 receivers: - jmx/activemq diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml index 206794c29b..93073660e6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/aerospike") - set(version, "1.0") + transform/aerospike_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -551,6 +560,7 @@ service: - normalizesums/aerospike_0 - metricstransform/aerospike_1 - transform/aerospike_2 + - transform/aerospike_3 - resourcedetection/_global_0 receivers: - aerospike/aerospike diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml index c8b2ddd838..5ed492c83a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/aerospike") - set(version, "1.0") + transform/aerospike_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -520,6 +529,7 @@ service: - normalizesums/aerospike_0 - metricstransform/aerospike_1 - transform/aerospike_2 + - transform/aerospike_3 - resourcedetection/_global_0 receivers: - aerospike/aerospike diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml index 7ffe9eeaf8..3be9661d68 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/aerospike") - set(version, "1.0") + transform/aerospike_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -633,6 +642,7 @@ service: - normalizesums/aerospike_0 - metricstransform/aerospike_1 - transform/aerospike_2 + - transform/aerospike_3 - resourcedetection/_global_0 receivers: - aerospike/aerospike diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml index 7ffe9eeaf8..3be9661d68 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/aerospike") - set(version, "1.0") + transform/aerospike_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -633,6 +642,7 @@ service: - normalizesums/aerospike_0 - metricstransform/aerospike_1 - transform/aerospike_2 + - transform/aerospike_3 - resourcedetection/_global_0 receivers: - aerospike/aerospike diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml index c0ee42d21b..5c7e1e62b5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -487,6 +487,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -553,6 +562,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml index 669c11edbc..1039332439 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -458,6 +458,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -522,6 +531,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml index 5fae547858..8245b05ac4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -524,6 +524,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -635,6 +644,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml index 5fae547858..8245b05ac4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -524,6 +524,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -635,6 +644,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml index 5af447e8de..bdd60edbfb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -487,6 +487,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -553,6 +562,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml index 03dad4a32a..1beb7f57a1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -458,6 +458,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -522,6 +531,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml index c7419ee68e..3088b00269 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -524,6 +524,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -635,6 +644,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml index c7419ee68e..3088b00269 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -524,6 +524,15 @@ processors: statements: - set(name, "agent.googleapis.com/apache") - set(version, "1.0") + transform/apache_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -635,6 +644,7 @@ service: - normalizesums/apache_1 - metricstransform/apache_2 - transform/apache_3 + - transform/apache_4 - resourcedetection/_global_0 receivers: - apache/apache diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml index 3e167dd833..9d4a340097 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -547,6 +556,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml index 315ceafa84..490483109f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -516,6 +525,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml index 6d012e027f..5c7bb30891 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml index 6d012e027f..5c7bb30891 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml index 8c87192d4c..95d8333599 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -547,6 +556,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml index 092f3a87ad..c41885639b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -516,6 +525,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml index a6ab48a33a..ea4b9ac01a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml index a6ab48a33a..ea4b9ac01a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/cassandra") - set(version, "1.0") + transform/cassandra_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -629,6 +638,7 @@ service: - normalizesums/cassandra_0 - metricstransform/cassandra_1 - transform/cassandra_2 + - transform/cassandra_3 - resourcedetection/_global_0 receivers: - jmx/cassandra diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml index 7f94cf8456..d2e53ea900 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -591,6 +591,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchbase") - set(version, "1.0") + transform/couchbase_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -670,6 +679,7 @@ service: - filter/couchbase_1 - metricstransform/couchbase_2 - transform/couchbase_3 + - transform/couchbase_4 - resourcedetection/_global_0 receivers: - prometheus/couchbase diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml index 17d83b68de..e00efe20a3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -562,6 +562,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchbase") - set(version, "1.0") + transform/couchbase_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -639,6 +648,7 @@ service: - filter/couchbase_1 - metricstransform/couchbase_2 - transform/couchbase_3 + - transform/couchbase_4 - resourcedetection/_global_0 receivers: - prometheus/couchbase diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml index fa7894dd3e..8968fa22c1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -628,6 +628,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchbase") - set(version, "1.0") + transform/couchbase_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -752,6 +761,7 @@ service: - filter/couchbase_1 - metricstransform/couchbase_2 - transform/couchbase_3 + - transform/couchbase_4 - resourcedetection/_global_0 receivers: - prometheus/couchbase diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml index fa7894dd3e..8968fa22c1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -628,6 +628,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchbase") - set(version, "1.0") + transform/couchbase_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -752,6 +761,7 @@ service: - filter/couchbase_1 - metricstransform/couchbase_2 - transform/couchbase_3 + - transform/couchbase_4 - resourcedetection/_global_0 receivers: - prometheus/couchbase diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml index e943e33404..3931de5946 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchdb") - set(version, "1.0") + transform/couchdb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -545,6 +554,7 @@ service: - normalizesums/couchdb_0 - metricstransform/couchdb_1 - transform/couchdb_2 + - transform/couchdb_3 - resourcedetection/_global_0 receivers: - couchdb/couchdb diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml index 74b6e242fb..f775ee0ca0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchdb") - set(version, "1.0") + transform/couchdb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -514,6 +523,7 @@ service: - normalizesums/couchdb_0 - metricstransform/couchdb_1 - transform/couchdb_2 + - transform/couchdb_3 - resourcedetection/_global_0 receivers: - couchdb/couchdb diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml index c56e378e36..46b5160ee1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchdb") - set(version, "1.0") + transform/couchdb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -627,6 +636,7 @@ service: - normalizesums/couchdb_0 - metricstransform/couchdb_1 - transform/couchdb_2 + - transform/couchdb_3 - resourcedetection/_global_0 receivers: - couchdb/couchdb diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml index c56e378e36..46b5160ee1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/couchdb") - set(version, "1.0") + transform/couchdb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -627,6 +636,7 @@ service: - normalizesums/couchdb_0 - metricstransform/couchdb_1 - transform/couchdb_2 + - transform/couchdb_3 - resourcedetection/_global_0 receivers: - couchdb/couchdb diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml index dc99fd1cd4..fcb6308cd1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml index fbb8de2453..83ebeb4af6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml index a1428ebf51..fbd2dda2cc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml index afb9ad10e1..709cc8b511 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml index a396b7150f..7713a7c023 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -604,6 +613,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml index 67d4c1db22..337ffb6d0d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -564,6 +573,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml index 88305bb0e9..947b34529d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml index 88305bb0e9..947b34529d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml index fe05500cdf..420ea9985b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -604,6 +613,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml index 2b65a818da..a3807891cb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -564,6 +573,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml index 001c112c24..27205977d9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml index 001c112c24..27205977d9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml index 6067f2a915..bff5fa0610 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -604,6 +613,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml index bbb5251c84..f1a31ea9bd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -564,6 +573,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml index ffcdd0db30..6c0406db75 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml index ffcdd0db30..6c0406db75 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml index 5d5bb4e977..9ba54348b0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -604,6 +613,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml index d57f0062e2..21cfa713f1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -564,6 +573,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml index 4fe482c3c9..c71ce3f58e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml index 4fe482c3c9..c71ce3f58e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -699,6 +708,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml index 6bdaf3040d..20fb54c301 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -626,6 +635,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml index 953ea3b271..20484f745e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -586,6 +595,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml index 9ae179bb69..ca786885f6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -721,6 +730,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml index 9ae179bb69..ca786885f6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -721,6 +730,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml index f4cce0a5cf..fc959a4b67 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -482,6 +482,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -606,6 +615,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml index 382c98e774..c734a15f2e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -453,6 +453,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -566,6 +575,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml index 5dfc7a09f1..d160c5a14c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -701,6 +710,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml index 5dfc7a09f1..d160c5a14c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -519,6 +519,15 @@ processors: statements: - set(name, "agent.googleapis.com/elasticsearch") - set(version, "1.0") + transform/elasticsearch_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -701,6 +710,7 @@ service: - filter/elasticsearch_1 - metricstransform/elasticsearch_2 - transform/elasticsearch_3 + - transform/elasticsearch_4 - resourcedetection/_global_0 receivers: - elasticsearch/elasticsearch diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml index 36fb76db00..cdd3881a54 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -510,6 +510,15 @@ processors: statements: - set(name, "agent.googleapis.com/flink") - set(version, "1.0") + transform/flink_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -595,6 +604,7 @@ service: - normalizesums/flink_0 - metricstransform/flink_1 - transform/flink_2 + - transform/flink_3 - resourcedetection/_global_0 receivers: - flinkmetrics/flink diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml index 59b4dfbea2..728ae87f99 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -481,6 +481,15 @@ processors: statements: - set(name, "agent.googleapis.com/flink") - set(version, "1.0") + transform/flink_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -555,6 +564,7 @@ service: - normalizesums/flink_0 - metricstransform/flink_1 - transform/flink_2 + - transform/flink_3 - resourcedetection/_global_0 receivers: - flinkmetrics/flink diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml index a2342ba85c..4da69d128d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -547,6 +547,15 @@ processors: statements: - set(name, "agent.googleapis.com/flink") - set(version, "1.0") + transform/flink_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -690,6 +699,7 @@ service: - normalizesums/flink_0 - metricstransform/flink_1 - transform/flink_2 + - transform/flink_3 - resourcedetection/_global_0 receivers: - flinkmetrics/flink diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml index a2342ba85c..4da69d128d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -547,6 +547,15 @@ processors: statements: - set(name, "agent.googleapis.com/flink") - set(version, "1.0") + transform/flink_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -690,6 +699,7 @@ service: - normalizesums/flink_0 - metricstransform/flink_1 - transform/flink_2 + - transform/flink_3 - resourcedetection/_global_0 receivers: - flinkmetrics/flink diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml index a24f8386ca..7d9c29b0aa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -576,6 +585,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml index d8cedde7c5..4d8b7a515d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -536,6 +545,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml index bea2d1e1b5..1aaf55d575 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml index bea2d1e1b5..1aaf55d575 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml index e44dc61f64..2cee51e235 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -576,6 +585,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml index 6ecd82d474..58b134632d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -536,6 +545,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml index 0ad880524b..f8d8e3864f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml index 0ad880524b..f8d8e3864f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/hadoop") - set(version, "1.0") + transform/hadoop_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/hadoop_0 - metricstransform/hadoop_1 - transform/hadoop_2 + - transform/hadoop_3 - resourcedetection/_global_0 receivers: - jmx/hadoop diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml index e56528217f..56b5bd170c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -485,6 +485,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -583,6 +592,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml index fe76241679..95dca3fa13 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -456,6 +456,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -543,6 +552,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml index 7ce8781ab0..1a417dbc9b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -522,6 +522,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -678,6 +687,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml index 7ce8781ab0..1a417dbc9b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -522,6 +522,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -678,6 +687,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml index deaf1284cd..3135c7c107 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -485,6 +485,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -583,6 +592,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml index 23f3aff5ba..89bc51510b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -456,6 +456,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -543,6 +552,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml index e0b6d01d35..11c6ef3a82 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -522,6 +522,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -678,6 +687,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml index e0b6d01d35..11c6ef3a82 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -522,6 +522,15 @@ processors: statements: - set(name, "agent.googleapis.com/hbase") - set(version, "1.0") + transform/hbase__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -678,6 +687,7 @@ service: - normalizesums/hbase__metrics_0 - metricstransform/hbase__metrics_1 - transform/hbase__metrics_2 + - transform/hbase__metrics_3 - resourcedetection/_global_0 receivers: - jmx/hbase__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml index 5e908bfec5..2fc059bb0d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -574,6 +583,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml index bd1efe60ea..64dbb6e4ce 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -534,6 +543,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml index bdf04e2907..686208a1b6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml index bdf04e2907..686208a1b6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml index 0b4c30cf58..4a0126ea34 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -576,6 +585,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml index fb320f7db5..631c2c7a33 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -536,6 +545,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml index 8b37081011..1a667aa773 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml index 8b37081011..1a667aa773 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jetty") - set(version, "1.0") + transform/jetty__metrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/jetty__metrics_0 - metricstransform/jetty__metrics_1 - transform/jetty__metrics_2 + - transform/jetty__metrics_3 - resourcedetection/_global_0 receivers: - jmx/jetty__metrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml index 9e9545b7ce..26b6813c95 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -574,6 +583,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml index 9b9f81a28e..204b5d8850 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -534,6 +543,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml index 9e68baa309..be7e8b9f05 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml index 9e68baa309..be7e8b9f05 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml index 35102e64ed..45ce09658b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -576,6 +585,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml index 9ca50d01e4..f18ceaef4e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -536,6 +545,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml index 059d6e3d27..b6d49b7544 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml index 059d6e3d27..b6d49b7544 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml index 0ff7d6e0c9..10cb9afbfd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -574,6 +583,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml index 7cfd08df98..e1be5c814a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -534,6 +543,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml index 3ef71b0a5e..d0ce623191 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml index 3ef71b0a5e..d0ce623191 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvm_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jvm_0 - metricstransform/jvm_1 - transform/jvm_2 + - transform/jvm_3 - resourcedetection/_global_0 receivers: - jmx/jvm diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml index 7e867d9d51..ce396d6cca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -493,6 +493,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -592,6 +601,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml index 854586731a..1eb663c7b6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -464,6 +464,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -552,6 +561,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml index 1e7fe2c112..b6e31aa149 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -536,6 +536,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -687,6 +696,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml index 1e7fe2c112..b6e31aa149 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -536,6 +536,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -687,6 +696,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml index 6a98d0972b..e577fa0425 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -493,6 +493,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -592,6 +601,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml index 48c78c998a..b2785474b2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -464,6 +464,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -552,6 +561,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml index 8a2e515d9e..30409b899e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -536,6 +536,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -687,6 +696,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml index 8a2e515d9e..30409b899e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -536,6 +536,15 @@ processors: statements: - set(name, "agent.googleapis.com/kafka") - set(version, "1.0") + transform/kafka_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -687,6 +696,7 @@ service: - normalizesums/kafka_1 - metricstransform/kafka_2 - transform/kafka_3 + - transform/kafka_4 - resourcedetection/_global_0 receivers: - jmx/kafka diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml index b1e530879a..ff6ac7c5ee 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -484,6 +484,15 @@ processors: statements: - set(name, "agent.googleapis.com/memcached") - set(version, "1.0") + transform/memcached_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -580,6 +589,7 @@ service: - normalizesums/memcached_1 - metricstransform/memcached_2 - transform/memcached_3 + - transform/memcached_4 - resourcedetection/_global_0 receivers: - memcached/memcached diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml index da22d068c8..39ccdbcb63 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -455,6 +455,15 @@ processors: statements: - set(name, "agent.googleapis.com/memcached") - set(version, "1.0") + transform/memcached_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -540,6 +549,7 @@ service: - normalizesums/memcached_1 - metricstransform/memcached_2 - transform/memcached_3 + - transform/memcached_4 - resourcedetection/_global_0 receivers: - memcached/memcached diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml index 2a86a00beb..4a13aeee2a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -527,6 +527,15 @@ processors: statements: - set(name, "agent.googleapis.com/memcached") - set(version, "1.0") + transform/memcached_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -675,6 +684,7 @@ service: - normalizesums/memcached_1 - metricstransform/memcached_2 - transform/memcached_3 + - transform/memcached_4 - resourcedetection/_global_0 receivers: - memcached/memcached diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml index 2a86a00beb..4a13aeee2a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -527,6 +527,15 @@ processors: statements: - set(name, "agent.googleapis.com/memcached") - set(version, "1.0") + transform/memcached_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -675,6 +684,7 @@ service: - normalizesums/memcached_1 - metricstransform/memcached_2 - transform/memcached_3 + - transform/memcached_4 - resourcedetection/_global_0 receivers: - memcached/memcached diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml index 1fd3edf65a..110f9f8610 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -578,6 +587,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml index b5547daf5c..d7b5aaf681 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -538,6 +547,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml index 046ad0f505..a3b7edee58 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -673,6 +682,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml index 046ad0f505..a3b7edee58 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -673,6 +682,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml index 79c7a0a19a..df4af3f711 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -576,6 +585,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml index 407be59bec..d3e54c975d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -536,6 +545,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml index 0c742fd116..a3989b41b9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml index 0c742fd116..a3989b41b9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/mongodb") - set(version, "1.0") + transform/mongodb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -671,6 +680,7 @@ service: - normalizesums/mongodb_0 - metricstransform/mongodb_1 - transform/mongodb_2 + - transform/mongodb_3 - resourcedetection/_global_0 receivers: - mongodb/mongodb diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml index 4d39406f61..f9d6125324 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -498,6 +498,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -618,6 +627,7 @@ service: - normalizesums/mysql_0 - metricstransform/mysql_1 - transform/mysql_2 + - transform/mysql_3 - resourcedetection/_global_0 receivers: - mysql/mysql diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml index ba6b1971f1..636d47ec26 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -469,6 +469,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -578,6 +587,7 @@ service: - normalizesums/mysql_0 - metricstransform/mysql_1 - transform/mysql_2 + - transform/mysql_3 - resourcedetection/_global_0 receivers: - mysql/mysql diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml index 196034fa13..5b6490a397 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -547,6 +547,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -713,6 +722,7 @@ service: - normalizesums/mysql_0 - metricstransform/mysql_1 - transform/mysql_2 + - transform/mysql_3 - resourcedetection/_global_0 receivers: - mysql/mysql diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml index 196034fa13..5b6490a397 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -547,6 +547,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -713,6 +722,7 @@ service: - normalizesums/mysql_0 - metricstransform/mysql_1 - transform/mysql_2 + - transform/mysql_3 - resourcedetection/_global_0 receivers: - mysql/mysql diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml index d8a87f7038..ce6b04d67c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -498,6 +498,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysqlmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -618,6 +627,7 @@ service: - normalizesums/mysqlmetrics_0 - metricstransform/mysqlmetrics_1 - transform/mysqlmetrics_2 + - transform/mysqlmetrics_3 - resourcedetection/_global_0 receivers: - mysql/mysqlmetrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml index 09f9d03265..d41fd6ba4e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -469,6 +469,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysqlmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -578,6 +587,7 @@ service: - normalizesums/mysqlmetrics_0 - metricstransform/mysqlmetrics_1 - transform/mysqlmetrics_2 + - transform/mysqlmetrics_3 - resourcedetection/_global_0 receivers: - mysql/mysqlmetrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml index 07c416c990..d8ace80449 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -547,6 +547,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysqlmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -713,6 +722,7 @@ service: - normalizesums/mysqlmetrics_0 - metricstransform/mysqlmetrics_1 - transform/mysqlmetrics_2 + - transform/mysqlmetrics_3 - resourcedetection/_global_0 receivers: - mysql/mysqlmetrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml index 07c416c990..d8ace80449 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -547,6 +547,15 @@ processors: statements: - set(name, "agent.googleapis.com/mysql") - set(version, "1.0") + transform/mysqlmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -713,6 +722,7 @@ service: - normalizesums/mysqlmetrics_0 - metricstransform/mysqlmetrics_1 - transform/mysqlmetrics_2 + - transform/mysqlmetrics_3 - resourcedetection/_global_0 receivers: - mysql/mysqlmetrics diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml index 2b7ccf8f12..22a7236055 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -572,6 +581,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml index b09fa2b736..ec1e1d297e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -532,6 +541,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml index ed7c6667be..85f6d79ea6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -527,6 +527,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -667,6 +676,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml index ed7c6667be..85f6d79ea6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -527,6 +527,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -667,6 +676,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml index 9519eec99b..7f698fcf82 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -572,6 +581,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml index fbbdb22261..457f3368fd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -532,6 +541,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml index c37592e7b7..311af54e0a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -527,6 +527,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -667,6 +676,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml index c37592e7b7..311af54e0a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -527,6 +527,15 @@ processors: statements: - set(name, "agent.googleapis.com/nginx") - set(version, "1.0") + transform/nginx_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -667,6 +676,7 @@ service: - normalizesums/nginx_0 - metricstransform/nginx_1 - transform/nginx_2 + - transform/nginx_3 - resourcedetection/_global_0 receivers: - nginx/nginx diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml index 4c0eb6771b..4ab6df3fdb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -509,6 +509,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -592,7 +601,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -678,7 +687,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -854,8 +863,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1120,8 +1129,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1197,6 +1206,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml index eb68dadb81..29a150113d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -480,6 +480,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -561,7 +570,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -647,7 +656,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -823,8 +832,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1089,8 +1098,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1157,6 +1166,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml index b7e8c18a1f..fc5ca04ede 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -558,6 +558,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -642,7 +651,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -728,7 +737,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -904,8 +913,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1170,8 +1179,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1292,6 +1301,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml index b7e8c18a1f..fc5ca04ede 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -558,6 +558,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -642,7 +651,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -728,7 +737,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -904,8 +913,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1170,8 +1179,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1292,6 +1301,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml index 1ed4c0715f..81e1b2c378 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -509,6 +509,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -592,7 +601,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -678,7 +687,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -854,8 +863,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1120,8 +1129,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1197,6 +1206,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml index 889fc3d80d..8741506508 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -480,6 +480,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -561,7 +570,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -647,7 +656,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -823,8 +832,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1089,8 +1098,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1157,6 +1166,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml index 1f8a179c8f..1930702ae2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -558,6 +558,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -642,7 +651,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -728,7 +737,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -904,8 +913,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1170,8 +1179,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1292,6 +1301,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml index 1f8a179c8f..1930702ae2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -558,6 +558,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -642,7 +651,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -728,7 +737,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -904,8 +913,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1170,8 +1179,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1292,6 +1301,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml index 9c118cc96f..c9bcae39c6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -509,6 +509,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -592,7 +601,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -678,7 +687,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -854,8 +863,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1120,8 +1129,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1197,6 +1206,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml index 034490d941..f8e0e43cb7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -480,6 +480,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -561,7 +570,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -647,7 +656,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -823,8 +832,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1089,8 +1098,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1157,6 +1166,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml index 257b3ca01e..2004d1989b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -558,6 +558,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -642,7 +651,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -728,7 +737,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -904,8 +913,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1170,8 +1179,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1292,6 +1301,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml index 257b3ca01e..2004d1989b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -558,6 +558,15 @@ processors: statements: - set(name, "agent.googleapis.com/oracledb") - set(version, "1.0") + transform/oracledb_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/otel_1: error_mode: ignore metric_statements: @@ -642,7 +651,7 @@ receivers: unit: by value_column: USED_SPACE value_type: int - sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts \n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE, \n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" + sql: "SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.TABLESPACE_NAME, ts.CONTENTS,\n\t\t\t\t(select sum(df.bytes) from sys.dba_data_files df where df.tablespace_name=ts.tablespace_name)-(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS USED_SPACE,\n\t\t\t\t(select sum(fs.bytes) from sys.dba_free_space fs where fs.tablespace_name=ts.tablespace_name) AS FREE_SPACE\n\t\t\tFROM sys.dba_tablespaces ts\n\t\t\tWHERE ts.contents <> 'TEMPORARY'\n\t\t\tUNION ALL\n\t\t\tSELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, ts.NAME TABLESPACE_NAME, 'TEMPORARY' as CONTENTS,\n\t\t\t\t\tSUM(ss.USED_BLOCKS * t.BLOCK_SIZE) USED_SPACE,\n\t\t\t\t\tSUM(t.BYTES) - SUM(ss.USED_BLOCKS * t.BLOCK_SIZE) FREE_SPACE\n\t\t\tFROM SYS.V_$$sort_segment ss\n\t\t\tJOIN sys.v_$$tablespace ts\n\t\t\tON ss.TABLESPACE_NAME = ts.NAME\n\t\t\tJOIN sys.v_$$tempfile t\n\t\t\tON t.TS# = ss.TS#\n\t\t\tGROUP BY ts.NAME" - metrics: - attribute_columns: - DATABASE_ID @@ -728,7 +737,7 @@ receivers: value_type: int sql: |- SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(PROCESSES_UTIL) PROCESSES_UTIL, MAX(PROCESSES_LIMIT_VAL) PROCESSES_LIMIT_VAL, MAX(SESSIONS_UTIL) SESSIONS_UTIL, MAX(SESSIONS_LIMIT_VAL) SESSIONS_LIMIT_VAL - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, PROCESSES_UTIL, PROCESSES_LIMIT_VAL, SESSIONS_UTIL, SESSIONS_LIMIT_VAL FROM (SELECT * FROM SYS.GV_$$resource_limit WHERE RESOURCE_NAME IN ('processes', 'sessions')) PIVOT( @@ -904,8 +913,8 @@ receivers: value_column: ROW_HIT_RATIO value_type: double sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(RESPONSE_TIME) RESPONSE_TIME, MAX(BUFFER_HIT_RATIO) BUFFER_HIT_RATIO, MAX(ROW_HIT_RATIO) ROW_HIT_RATIO + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, END_TIME, RESPONSE_TIME, BUFFER_HIT_RATIO, ROW_HIT_RATIO FROM (SELECT * FROM SYS.GV_$$sysmetric WHERE METRIC_NAME IN ('SQL Service Response Time', 'Buffer Cache Hit Ratio', 'Row Cache Hit Ratio') AND GROUP_ID = 2) @@ -1170,8 +1179,8 @@ receivers: value_column: USER_ROLLBACKS value_type: int sql: |- - SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS - FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS + SELECT DATABASE_ID, GLOBAL_NAME, INST_ID INSTANCE_ID, MAX(CURSORS_CUMULATIVE) CURSORS_CUMULATIVE, MAX(CURSORS_CURRENT) CURSORS_CURRENT, MAX(SORTS_MEM) SORTS_MEM, MAX(SORTS_DISK) SORTS_DISK, MAX(SORTS_ROWS) SORTS_ROWS, MAX(READ_TOTAL) READ_TOTAL, MAX(WRITE_TOTAL) WRITE_TOTAL, MAX(READ_TOTAL_BY) READ_TOTAL_BY, MAX(WRITE_TOTAL_BY) WRITE_TOTAL_BY, MAX(LOGONS_CURRENT) LOGONS_CURRENT, MAX(CLIENT_RECV_BY) CLIENT_RECV_BY, MAX(DBLINK_RECV_BY) DBLINK_RECV_BY, MAX(CLIENT_SENT_BY) CLIENT_SENT_BY, MAX(DBLINK_SENT_BY) DBLINK_SENT_BY, MAX(LOGONS_CUMULATIVE) LOGONS_CUMULATIVE, MAX(USER_CALLS) USER_CALLS, MAX(USER_COMMITS) USER_COMMITS, MAX(USER_ROLLBACKS) USER_ROLLBACKS + FROM (SELECT (SELECT DBID FROM SYS.GV_$$DATABASE) DATABASE_ID, (SELECT GLOBAL_NAME FROM sys.GLOBAL_NAME) GLOBAL_NAME, INST_ID, CURSORS_CUMULATIVE, CURSORS_CURRENT, SORTS_MEM, SORTS_DISK, SORTS_ROWS, READ_TOTAL, WRITE_TOTAL, READ_TOTAL_BY, WRITE_TOTAL_BY, LOGONS_CURRENT, CLIENT_RECV_BY, DBLINK_RECV_BY, CLIENT_SENT_BY, DBLINK_SENT_BY, LOGONS_CUMULATIVE, USER_CALLS, USER_COMMITS, USER_ROLLBACKS FROM (SELECT * FROM SYS.GV_$$sysstat WHERE NAME IN ('opened cursors cumulative', 'opened cursors current', 'sorts (memory)', 'sorts (disk)', 'sorts (rows)', 'physical read total IO requests', 'physical write total IO requests', 'physical read total bytes', 'physical write total bytes', 'logons current', 'bytes received via SQL*Net from client', 'bytes received via SQL*Net from dblink', 'bytes sent via SQL*Net to client', 'bytes sent via SQL*Net to dblink', 'logons cumulative', 'user calls', 'user commits', 'user rollbacks') ) @@ -1292,6 +1301,7 @@ service: - normalizesums/oracledb_0 - metricstransform/oracledb_1 - transform/oracledb_2 + - transform/oracledb_3 - resourcedetection/_global_0 receivers: - sqlquery/oracledb diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml index 4080eff397..9c20d6cf96 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -501,6 +501,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -610,6 +619,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml index 1fc432d31d..8e4f0e2fa6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -472,6 +472,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -570,6 +579,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml index bd23cc402d..f30fa5cf4d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -705,6 +714,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml index bd23cc402d..f30fa5cf4d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -705,6 +714,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml index e517f84693..840c2fca96 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -501,6 +501,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,6 +621,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml index a99cd8e553..13877c04d4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -472,6 +472,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -572,6 +581,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml index a66fc9ee4f..91f178b902 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -707,6 +716,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml index a66fc9ee4f..91f178b902 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -707,6 +716,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml index ed4d7b7648..46436c077c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -501,6 +501,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -613,6 +622,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml index 7a2e8f34f3..11b3a61a33 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -472,6 +472,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -573,6 +582,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml index f7b7aecab7..9d33d79b2b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -708,6 +717,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml index f7b7aecab7..9d33d79b2b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -708,6 +717,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml index c51f48a1d6..5b51a7d5cf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -501,6 +501,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -616,6 +625,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml index 3c882d402f..74ef101840 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -472,6 +472,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -576,6 +585,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml index 60f3cf5223..6181e2aafb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -711,6 +720,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml index 60f3cf5223..6181e2aafb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -550,6 +550,15 @@ processors: statements: - set(name, "agent.googleapis.com/postgresql") - set(version, "1.0") + transform/postgresql_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -711,6 +720,7 @@ service: - normalizesums/postgresql_0 - transform/postgresql_1 - metricstransform/postgresql_2 + - transform/postgresql_3 - resourcedetection/_global_0 receivers: - postgresql/postgresql diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml index 757bd2f021..7548db2f58 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -495,6 +495,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -600,6 +609,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml index 324f1e37d5..7643ee2795 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -466,6 +466,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -560,6 +569,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml index 9395b8af2e..88b3a4888e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -695,6 +704,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml index 9395b8af2e..88b3a4888e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -695,6 +704,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml index baf6be47cc..9e3ecdfa32 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -495,6 +495,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -600,6 +609,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml index 1a9cb68641..77321f11d0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -466,6 +466,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -560,6 +569,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml index 65b8b61240..365439a25f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -695,6 +704,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml index 65b8b61240..365439a25f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -695,6 +704,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml index bff27253f9..37d5c52053 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -495,6 +495,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -601,6 +610,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml index a62d2db939..9c91989614 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -466,6 +466,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -561,6 +570,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml index 0383f08795..98538413fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -696,6 +705,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml index 0383f08795..98538413fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -696,6 +705,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml index 0468e07118..5a57b69366 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -495,6 +495,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -604,6 +613,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml index 1c26a80ce6..1166060691 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -466,6 +466,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -564,6 +573,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml index dd2e9abf70..6dde2d61d1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -699,6 +708,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml index dd2e9abf70..6dde2d61d1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -544,6 +544,15 @@ processors: statements: - set(name, "agent.googleapis.com/rabbitmq") - set(version, "1.0") + transform/rabbitmq_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -699,6 +708,7 @@ service: - normalizesums/rabbitmq_0 - metricstransform/rabbitmq_1 - transform/rabbitmq_2 + - transform/rabbitmq_3 - resourcedetection/_global_0 receivers: - rabbitmq/rabbitmq diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml index 96a6e83306..fc5da6076b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -497,6 +497,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -603,6 +612,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml index 350d773757..e6ded8b26c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -468,6 +468,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -563,6 +572,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml index d5117b6cf0..f718247859 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -546,6 +546,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -698,6 +707,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml index d5117b6cf0..f718247859 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -546,6 +546,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -698,6 +707,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml index b5dc7d185e..62352314d3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -497,6 +497,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -603,6 +612,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml index 2ead273d53..6bec228721 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -468,6 +468,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -563,6 +572,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml index 94818558f5..d1e7234e89 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -546,6 +546,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -698,6 +707,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml index 94818558f5..d1e7234e89 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -546,6 +546,15 @@ processors: statements: - set(name, "agent.googleapis.com/redis") - set(version, "1.0") + transform/redis_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -698,6 +707,7 @@ service: - normalizesums/redis_1 - metricstransform/redis_2 - transform/redis_3 + - transform/redis_4 - resourcedetection/_global_0 receivers: - redis/redis diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml index 6734c16224..582397a6a5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -499,6 +499,15 @@ processors: statements: - set(name, "agent.googleapis.com/saphana") - set(version, "1.0") + transform/saphana_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -605,6 +614,7 @@ service: - normalizesums/saphana_1 - metricstransform/saphana_2 - transform/saphana_3 + - transform/saphana_4 - resourcedetection/_global_0 receivers: - saphana/saphana diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml index 20f723eeb4..df94b8482a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -470,6 +470,15 @@ processors: statements: - set(name, "agent.googleapis.com/saphana") - set(version, "1.0") + transform/saphana_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -565,6 +574,7 @@ service: - normalizesums/saphana_1 - metricstransform/saphana_2 - transform/saphana_3 + - transform/saphana_4 - resourcedetection/_global_0 receivers: - saphana/saphana diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml index 05af28de45..69cc532517 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -548,6 +548,15 @@ processors: statements: - set(name, "agent.googleapis.com/saphana") - set(version, "1.0") + transform/saphana_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -700,6 +709,7 @@ service: - normalizesums/saphana_1 - metricstransform/saphana_2 - transform/saphana_3 + - transform/saphana_4 - resourcedetection/_global_0 receivers: - saphana/saphana diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml index 05af28de45..69cc532517 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -548,6 +548,15 @@ processors: statements: - set(name, "agent.googleapis.com/saphana") - set(version, "1.0") + transform/saphana_4: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -700,6 +709,7 @@ service: - normalizesums/saphana_1 - metricstransform/saphana_2 - transform/saphana_3 + - transform/saphana_4 - resourcedetection/_global_0 receivers: - saphana/saphana diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml index da29e92b56..2e262658d9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/solr") - set(version, "1.0") + transform/solr_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -595,6 +604,7 @@ service: - normalizesums/solr_0 - metricstransform/solr_1 - transform/solr_2 + - transform/solr_3 - resourcedetection/_global_0 receivers: - jmx/solr diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml index d274def23b..67426935d5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/solr") - set(version, "1.0") + transform/solr_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,6 +564,7 @@ service: - normalizesums/solr_0 - metricstransform/solr_1 - transform/solr_2 + - transform/solr_3 - resourcedetection/_global_0 receivers: - jmx/solr diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml index 34656c361f..268591d165 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/solr") - set(version, "1.0") + transform/solr_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -690,6 +699,7 @@ service: - normalizesums/solr_0 - metricstransform/solr_1 - transform/solr_2 + - transform/solr_3 - resourcedetection/_global_0 receivers: - jmx/solr diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml index 34656c361f..268591d165 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/solr") - set(version, "1.0") + transform/solr_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -690,6 +699,7 @@ service: - normalizesums/solr_0 - metricstransform/solr_1 - transform/solr_2 + - transform/solr_3 - resourcedetection/_global_0 receivers: - jmx/solr diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml index 92dd7df142..16de66687a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -595,6 +604,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml index cf9920be79..fa0291a55b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,6 +564,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml index b48dfe9a7b..2366b06007 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -690,6 +699,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml index b48dfe9a7b..2366b06007 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -690,6 +699,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml index a7d2053c00..7022c1b6ca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -595,6 +604,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml index db57759e7d..ece36c82dd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,6 +564,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml index abb41087fb..b8d9c8bb78 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -690,6 +699,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml index abb41087fb..b8d9c8bb78 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/tomcat") - set(version, "1.0") + transform/tomcat_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -690,6 +699,7 @@ service: - normalizesums/tomcat_0 - metricstransform/tomcat_1 - transform/tomcat_2 + - transform/tomcat_3 - resourcedetection/_global_0 receivers: - jmx/tomcat diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml index 07836ef286..7d749981ff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/varnish") - set(version, "1.0") + transform/varnish_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -592,6 +601,7 @@ service: - normalizesums/varnish_0 - metricstransform/varnish_1 - transform/varnish_2 + - transform/varnish_3 - resourcedetection/_global_0 receivers: - varnish/varnish diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml index aa9fb027c9..eca815faad 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/varnish") - set(version, "1.0") + transform/varnish_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -552,6 +561,7 @@ service: - normalizesums/varnish_0 - metricstransform/varnish_1 - transform/varnish_2 + - transform/varnish_3 - resourcedetection/_global_0 receivers: - varnish/varnish diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml index 8e2327ec47..472defabd2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/varnish") - set(version, "1.0") + transform/varnish_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -687,6 +696,7 @@ service: - normalizesums/varnish_0 - metricstransform/varnish_1 - transform/varnish_2 + - transform/varnish_3 - resourcedetection/_global_0 receivers: - varnish/varnish diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml index 8e2327ec47..472defabd2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/varnish") - set(version, "1.0") + transform/varnish_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -687,6 +696,7 @@ service: - normalizesums/varnish_0 - metricstransform/varnish_1 - transform/varnish_2 + - transform/varnish_3 - resourcedetection/_global_0 receivers: - varnish/varnish diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml index 619cbfa4b1..43456b8e2b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -1166,6 +1166,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1277,6 +1286,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml index 47a4ba956b..536dad8020 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -1137,6 +1137,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1237,6 +1246,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml index 7914382d80..c7249c833d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -1215,6 +1215,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1372,6 +1381,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml index 7914382d80..c7249c833d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -1215,6 +1215,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1372,6 +1381,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml index 6dc2fc0bf9..ed3456a002 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -1166,6 +1166,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1277,6 +1286,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml index 4a935b69b3..4d3bf21a56 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -1137,6 +1137,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1237,6 +1246,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml index 8fbf7e9e04..a4f4a057ac 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -1215,6 +1215,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1372,6 +1381,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml index 8fbf7e9e04..a4f4a057ac 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -1215,6 +1215,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1372,6 +1381,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml index eb314d3f93..fdc213722e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -1166,6 +1166,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1281,6 +1290,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml index 961609ccec..b97ee22e2f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -1137,6 +1137,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1241,6 +1250,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml index ad7f669d48..fcb430f3fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -1215,6 +1215,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1376,6 +1385,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml index ad7f669d48..fcb430f3fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -1215,6 +1215,15 @@ processors: statements: - set(name, "agent.googleapis.com/vault") - set(version, "1.0") + transform/vault_5: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -1376,6 +1385,7 @@ service: - metricstransform/vault_2 - normalizesums/vault_3 - metricstransform/vault_4 + - transform/vault_5 - resourcedetection/_global_0 receivers: - prometheus/vault diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml index 1bcb44e4ce..c431b43d79 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -597,6 +606,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml index 54c33401fd..e9af2dc90b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -557,6 +566,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml index bacf3b76a6..a749b1e242 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -692,6 +701,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml index bacf3b76a6..a749b1e242 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -692,6 +701,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml index 1bcb44e4ce..c431b43d79 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -597,6 +606,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml index 54c33401fd..e9af2dc90b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -557,6 +566,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml index bacf3b76a6..a749b1e242 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -692,6 +701,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml index bacf3b76a6..a749b1e242 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/wildfly") - set(version, "1.0") + transform/wildfly_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -692,6 +701,7 @@ service: - normalizesums/wildfly_0 - metricstransform/wildfly_1 - transform/wildfly_2 + - transform/wildfly_3 - resourcedetection/_global_0 receivers: - jmx/wildfly diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml index 7e37e595b7..5e99b0e7bc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -591,6 +600,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml index b407d33191..3c0e3d7969 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -551,6 +560,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml index ea12e6c3e0..9835116aca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -686,6 +695,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml index ea12e6c3e0..9835116aca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -686,6 +695,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml index 7e37e595b7..5e99b0e7bc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -490,6 +490,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -591,6 +600,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml index b407d33191..3c0e3d7969 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -461,6 +461,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -551,6 +560,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml index ea12e6c3e0..9835116aca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -686,6 +695,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml index ea12e6c3e0..9835116aca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -539,6 +539,15 @@ processors: statements: - set(name, "agent.googleapis.com/zookeeper") - set(version, "1.0") + transform/zookeeper_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -686,6 +695,7 @@ service: - normalizesums/zookeeper_0 - metricstransform/zookeeper_1 - transform/zookeeper_2 + - transform/zookeeper_3 - resourcedetection/_global_0 receivers: - zookeeper/zookeeper diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml index 4ab7b2d89e..12cae96d29 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/active_directory_ds") - set(version, "1.0") + transform/active__directory__ds_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -624,6 +633,7 @@ service: - normalizesums/active__directory__ds_0 - metricstransform/active__directory__ds_1 - transform/active__directory__ds_2 + - transform/active__directory__ds_3 - resourcedetection/_global_0 receivers: - active_directory_ds/active__directory__ds diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml index 4ab7b2d89e..12cae96d29 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -515,6 +515,15 @@ processors: statements: - set(name, "agent.googleapis.com/active_directory_ds") - set(version, "1.0") + transform/active__directory__ds_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/iis_3: metric_statements: - context: scope @@ -624,6 +633,7 @@ service: - normalizesums/active__directory__ds_0 - metricstransform/active__directory__ds_1 - transform/active__directory__ds_2 + - transform/active__directory__ds_3 - resourcedetection/_global_0 receivers: - active_directory_ds/active__directory__ds diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml index b99a5567cd..89d1d4606f 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -75,7 +75,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - groupbyattrs/iis__v2_2: {} + groupbyattrs/iis__v2_3: {} metricstransform/fluentbit_1: transforms: - action: update @@ -439,7 +439,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/iis__v2_3: + metricstransform/iis__v2_4: transforms: - action: update include: ^iis @@ -515,7 +515,7 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} normalizesums/iis_2: {} - normalizesums/iis__v2_4: {} + normalizesums/iis__v2_5: {} resourcedetection/_global_0: detectors: - gcp @@ -536,6 +536,15 @@ processors: - set(name, "agent.googleapis.com/iis") - set(version, "2.0") transform/iis__v2_1: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") + transform/iis__v2_2: metric_statements: - context: datapoint statements: @@ -684,9 +693,10 @@ service: processors: - transform/iis__v2_0 - transform/iis__v2_1 - - groupbyattrs/iis__v2_2 - - metricstransform/iis__v2_3 - - normalizesums/iis__v2_4 + - transform/iis__v2_2 + - groupbyattrs/iis__v2_3 + - metricstransform/iis__v2_4 + - normalizesums/iis__v2_5 - resourcedetection/_global_0 receivers: - iis/iis__v2 diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml index b99a5567cd..89d1d4606f 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -75,7 +75,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - groupbyattrs/iis__v2_2: {} + groupbyattrs/iis__v2_3: {} metricstransform/fluentbit_1: transforms: - action: update @@ -439,7 +439,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/iis__v2_3: + metricstransform/iis__v2_4: transforms: - action: update include: ^iis @@ -515,7 +515,7 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} normalizesums/iis_2: {} - normalizesums/iis__v2_4: {} + normalizesums/iis__v2_5: {} resourcedetection/_global_0: detectors: - gcp @@ -536,6 +536,15 @@ processors: - set(name, "agent.googleapis.com/iis") - set(version, "2.0") transform/iis__v2_1: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") + transform/iis__v2_2: metric_statements: - context: datapoint statements: @@ -684,9 +693,10 @@ service: processors: - transform/iis__v2_0 - transform/iis__v2_1 - - groupbyattrs/iis__v2_2 - - metricstransform/iis__v2_3 - - normalizesums/iis__v2_4 + - transform/iis__v2_2 + - groupbyattrs/iis__v2_3 + - metricstransform/iis__v2_4 + - normalizesums/iis__v2_5 - resourcedetection/_global_0 receivers: - iis/iis__v2 diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml index b56ecf8a0d..d2be424cde 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -70,7 +70,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - groupbyattrs/iis_2: {} + groupbyattrs/iis_3: {} metricstransform/fluentbit_1: transforms: - action: update @@ -406,7 +406,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/iis_3: + metricstransform/iis_4: transforms: - action: update include: ^iis @@ -481,7 +481,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - normalizesums/iis_4: {} + normalizesums/iis_5: {} resourcedetection/_global_0: detectors: - gcp @@ -496,6 +496,15 @@ processors: - set(name, "agent.googleapis.com/iis") - set(version, "2.0") transform/iis_1: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") + transform/iis_2: metric_statements: - context: datapoint statements: @@ -595,9 +604,10 @@ service: processors: - transform/iis_0 - transform/iis_1 - - groupbyattrs/iis_2 - - metricstransform/iis_3 - - normalizesums/iis_4 + - transform/iis_2 + - groupbyattrs/iis_3 + - metricstransform/iis_4 + - normalizesums/iis_5 - filter/default__pipeline_iis_0 - resourcedetection/_global_0 receivers: @@ -627,9 +637,10 @@ service: processors: - transform/iis_0 - transform/iis_1 - - groupbyattrs/iis_2 - - metricstransform/iis_3 - - normalizesums/iis_4 + - transform/iis_2 + - groupbyattrs/iis_3 + - metricstransform/iis_4 + - normalizesums/iis_5 - resourcedetection/_global_0 receivers: - iis/iis diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml index b56ecf8a0d..d2be424cde 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -70,7 +70,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - groupbyattrs/iis_2: {} + groupbyattrs/iis_3: {} metricstransform/fluentbit_1: transforms: - action: update @@ -406,7 +406,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/iis_3: + metricstransform/iis_4: transforms: - action: update include: ^iis @@ -481,7 +481,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - normalizesums/iis_4: {} + normalizesums/iis_5: {} resourcedetection/_global_0: detectors: - gcp @@ -496,6 +496,15 @@ processors: - set(name, "agent.googleapis.com/iis") - set(version, "2.0") transform/iis_1: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") + transform/iis_2: metric_statements: - context: datapoint statements: @@ -595,9 +604,10 @@ service: processors: - transform/iis_0 - transform/iis_1 - - groupbyattrs/iis_2 - - metricstransform/iis_3 - - normalizesums/iis_4 + - transform/iis_2 + - groupbyattrs/iis_3 + - metricstransform/iis_4 + - normalizesums/iis_5 - filter/default__pipeline_iis_0 - resourcedetection/_global_0 receivers: @@ -627,9 +637,10 @@ service: processors: - transform/iis_0 - transform/iis_1 - - groupbyattrs/iis_2 - - metricstransform/iis_3 - - normalizesums/iis_4 + - transform/iis_2 + - groupbyattrs/iis_3 + - metricstransform/iis_4 + - normalizesums/iis_5 - resourcedetection/_global_0 receivers: - iis/iis diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml index 1fdf727bfc..cf120f6f16 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -478,6 +478,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvmmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -574,6 +583,7 @@ service: - normalizesums/jvmmetrics_0 - metricstransform/jvmmetrics_1 - transform/jvmmetrics_2 + - transform/jvmmetrics_3 - resourcedetection/_global_0 receivers: - jmx/jvmmetrics diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml index 02f5a7d8da..58a3fa74a9 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: @@ -449,6 +449,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvmmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -534,6 +543,7 @@ service: - normalizesums/jvmmetrics_0 - metricstransform/jvmmetrics_1 - transform/jvmmetrics_2 + - transform/jvmmetrics_3 - resourcedetection/_global_0 receivers: - jmx/jvmmetrics diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml index 97a9425884..eda99e9a2a 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvmmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jvmmetrics_0 - metricstransform/jvmmetrics_1 - transform/jvmmetrics_2 + - transform/jvmmetrics_3 - resourcedetection/_global_0 receivers: - jmx/jvmmetrics diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml index 97a9425884..eda99e9a2a 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -521,6 +521,15 @@ processors: statements: - set(name, "agent.googleapis.com/jvm") - set(version, "1.0") + transform/jvmmetrics_3: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/mssql_1: metric_statements: - context: scope @@ -669,6 +678,7 @@ service: - normalizesums/jvmmetrics_0 - metricstransform/jvmmetrics_1 - transform/jvmmetrics_2 + - transform/jvmmetrics_3 - resourcedetection/_global_0 receivers: - jmx/jvmmetrics diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml index 09ecb190fb..186d25aa99 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -508,7 +508,7 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} normalizesums/iis_2: {} - normalizesums/mssql__v2_2: {} + normalizesums/mssql__v2_3: {} resourcedetection/_global_0: detectors: - gcp @@ -533,6 +533,15 @@ processors: statements: - set(name, "agent.googleapis.com/mssql") - set(version, "2.0") + transform/mssql__v2_2: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -671,7 +680,8 @@ service: processors: - metricstransform/mssql__v2_0 - transform/mssql__v2_1 - - normalizesums/mssql__v2_2 + - transform/mssql__v2_2 + - normalizesums/mssql__v2_3 - resourcedetection/_global_0 receivers: - sqlserver/mssql__v2 diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml index 09ecb190fb..186d25aa99 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -508,7 +508,7 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} normalizesums/iis_2: {} - normalizesums/mssql__v2_2: {} + normalizesums/mssql__v2_3: {} resourcedetection/_global_0: detectors: - gcp @@ -533,6 +533,15 @@ processors: statements: - set(name, "agent.googleapis.com/mssql") - set(version, "2.0") + transform/mssql__v2_2: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -671,7 +680,8 @@ service: processors: - metricstransform/mssql__v2_0 - transform/mssql__v2_1 - - normalizesums/mssql__v2_2 + - transform/mssql__v2_2 + - normalizesums/mssql__v2_3 - resourcedetection/_global_0 receivers: - sqlserver/mssql__v2 diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml index cfda094774..036fef28ff 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -493,7 +493,7 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} normalizesums/iis_2: {} - normalizesums/mssql_2: {} + normalizesums/mssql_3: {} resourcedetection/_global_0: detectors: - gcp @@ -512,6 +512,15 @@ processors: statements: - set(name, "agent.googleapis.com/mssql") - set(version, "2.0") + transform/mssql_2: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -617,7 +626,8 @@ service: processors: - metricstransform/mssql_0 - transform/mssql_1 - - normalizesums/mssql_2 + - transform/mssql_2 + - normalizesums/mssql_3 - filter/default__pipeline_mssql_0 - resourcedetection/_global_0 receivers: @@ -637,7 +647,8 @@ service: processors: - metricstransform/mssql_0 - transform/mssql_1 - - normalizesums/mssql_2 + - transform/mssql_2 + - normalizesums/mssql_3 - resourcedetection/_global_0 receivers: - sqlserver/mssql diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml index cfda094774..036fef28ff 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml @@ -12,7 +12,7 @@ exporters: instrumentation_library_labels: true prefix: "" resource_filters: [] - service_resource_labels: false + service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) processors: @@ -493,7 +493,7 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} normalizesums/iis_2: {} - normalizesums/mssql_2: {} + normalizesums/mssql_3: {} resourcedetection/_global_0: detectors: - gcp @@ -512,6 +512,15 @@ processors: statements: - set(name, "agent.googleapis.com/mssql") - set(version, "2.0") + transform/mssql_2: + metric_statements: + - context: resource + error_mode: silent + statements: + - delete_key(attributes, "service.name") + - delete_key(attributes, "service.instance.id") + - delete_key(attributes, "service.namespace") + - delete_key(attributes, "service.version") transform/ops_agent_0: error_mode: ignore metric_statements: @@ -617,7 +626,8 @@ service: processors: - metricstransform/mssql_0 - transform/mssql_1 - - normalizesums/mssql_2 + - transform/mssql_2 + - normalizesums/mssql_3 - filter/default__pipeline_mssql_0 - resourcedetection/_global_0 receivers: @@ -637,7 +647,8 @@ service: processors: - metricstransform/mssql_0 - transform/mssql_1 - - normalizesums/mssql_2 + - transform/mssql_2 + - normalizesums/mssql_3 - resourcedetection/_global_0 receivers: - sqlserver/mssql diff --git a/integration_test/ops_agent_test/main_test.go b/integration_test/ops_agent_test/main_test.go index fc75cd6fdd..d66b2ed634 100644 --- a/integration_test/ops_agent_test/main_test.go +++ b/integration_test/ops_agent_test/main_test.go @@ -4579,7 +4579,7 @@ func goPathCommandForImage(imageSpec string) string { return "export PATH=/usr/local/go/bin:$PATH" } -func runGoCode(ctx context.Context, logger *log.Logger, vm *gce.VM, content io.Reader) error { +func runGoCode(ctx context.Context, logger *log.Logger, vm *gce.VM, content io.Reader, programArgs ...string) error { workDir := path.Join(workDirForImage(vm.ImageSpec), "gocode") if err := makeDirectory(ctx, logger, vm, workDir); err != nil { return err @@ -4592,7 +4592,8 @@ func runGoCode(ctx context.Context, logger *log.Logger, vm *gce.VM, content io.R cd %s go mod init main go get ./... - go run main.go`, goPathCommandForImage(vm.ImageSpec), workDir) + go run main.go %s`, + goPathCommandForImage(vm.ImageSpec), workDir, strings.Join(programArgs, " ")) _, err := gce.RunRemotely(ctx, logger, vm, goInitAndRun) return err } @@ -4636,7 +4637,17 @@ traces: if err := installGolang(ctx, logger, vm); err != nil { t.Fatal(err) } - if err = runGoCode(ctx, logger, vm, metricFile); err != nil { + serviceName := "otlp-metric-googlecloudmonitoring-test" + serviceNamespace := "otlp-metric-googlecloudmonitoring" + serviceVersion := "0.0" + serviceInstanceID := "localhost" + if err = runGoCode( + ctx, logger, vm, metricFile, + "-service_name", serviceName, + "-service_namespace", serviceNamespace, + "-service_instance_id", serviceInstanceID, + "-service_version", serviceVersion, + ); err != nil { t.Fatal(err) } @@ -4650,9 +4661,33 @@ traces: "workload.googleapis.com/WORKLOAD.GOOGLEAPIS.COM/otlp.test.prefix4", "workload.googleapis.com/WORKLOAD.googleapis.com/otlp.test.prefix5", } { - if _, err = gce.WaitForMetric(ctx, logger, vm, name, time.Hour, nil, false); err != nil { + ts, err := gce.WaitForMetric(ctx, logger, vm, name, time.Hour, nil, false) + if err != nil { t.Error(err) } + + expectedServiceAttributes := map[string]string{ + "service_name": serviceName, + "service_namespace": serviceNamespace, + "service_instance_id": serviceInstanceID, + // TODO: If/when https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/pull/1065 is merged and + // released in our exporter, add this to the expected attributes. + // {"service_version", serviceVersion}, + } + for serviceLabelKey, expectedValue := range expectedServiceAttributes { + serviceLabelValue, ok := ts.Metric.Labels[serviceLabelKey] + if !ok { + t.Errorf(`metric %s missing expected label "%s"`, name, serviceLabelKey) + } + if serviceLabelValue != expectedValue { + t.Errorf( + `metric label %s expected value "%s" but got "%s"`, + serviceLabelKey, + expectedValue, + serviceLabelValue, + ) + } + } } expectedFeatures := []*feature_tracking_metadata.FeatureTracking{ diff --git a/integration_test/ops_agent_test/testdata/otlp/metrics.go b/integration_test/ops_agent_test/testdata/otlp/metrics.go index eb8c15f3f2..2b23ab385d 100644 --- a/integration_test/ops_agent_test/testdata/otlp/metrics.go +++ b/integration_test/ops_agent_test/testdata/otlp/metrics.go @@ -2,14 +2,17 @@ package main import ( "context" + "flag" "log" "time" "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/metric" metricsdk "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" ) var renameMap = map[string]string{ @@ -20,14 +23,39 @@ var renameMap = map[string]string{ "otlp.test.prefix5": "WORKLOAD.googleapis.com/otlp.test.prefix5", } +var ( + flagServiceName = flag.String("service_name", "", "service.name attribute value") + flagServiceNamespace = flag.String("service_namespace", "", "service.namespace attribute value") + flagServiceInstanceID = flag.String("service_instance_id", "", "service.instance.id attribute value") + flagServiceVersion = flag.String("service_version", "", "service.version attribute value") +) + +func getServiceAttributes() []attribute.KeyValue { + attrs := []attribute.KeyValue{} + if *flagServiceName != "" { + attrs = append(attrs, semconv.ServiceNameKey.String(*flagServiceName)) + } + if *flagServiceNamespace != "" { + attrs = append(attrs, semconv.ServiceNamespaceKey.String(*flagServiceNamespace)) + } + if *flagServiceInstanceID != "" { + attrs = append(attrs, semconv.ServiceInstanceIDKey.String(*flagServiceInstanceID)) + } + if *flagServiceVersion != "" { + attrs = append(attrs, semconv.ServiceVersionKey.String(*flagServiceVersion)) + } + return attrs +} + func installMetricExportPipeline(ctx context.Context) (func(context.Context) error, error) { exporter, err := otlpmetricgrpc.New(ctx, otlpmetricgrpc.WithInsecure()) if err != nil { log.Fatal(err) } + metricResource := resource.NewWithAttributes("", getServiceAttributes()...) metricProvider := metricsdk.NewMeterProvider( metricsdk.WithReader(metricsdk.NewPeriodicReader(exporter)), - metricsdk.WithResource(resource.Default()), + metricsdk.WithResource(metricResource), metricsdk.WithView(func(i metricsdk.Instrument) (metricsdk.Stream, bool) { s := metricsdk.Stream{Name: i.Name, Description: i.Description, Unit: i.Unit} newName, ok := renameMap[i.Name] @@ -43,6 +71,7 @@ func installMetricExportPipeline(ctx context.Context) (func(context.Context) err } func main() { + flag.Parse() ctx := context.Background() shutdown, err := installMetricExportPipeline(ctx)