From 9e28767d9d5a09fec2984a92c96c7fc07c986521 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Tue, 18 Jul 2023 14:47:03 +0000 Subject: [PATCH] try fixing integrationtests --- .../testcases/testcases_metrics.go | 12 +-- .../fixtures/metrics/counter_gmp_expect.json | 29 +------ .../metrics/delta_counter_gmp_expect.json | 29 +------ .../testdata/fixtures/metrics/gauge.json | 2 +- .../fixtures/metrics/gauge_expect.json | 5 +- .../fixtures/metrics/gauge_gmp_expect.json | 31 +------- .../google_managed_prometheus_expect.json | 75 +------------------ .../metrics/histogram_gmp_expect.json | 29 +------ .../metrics/nonmonotonic_counter.json | 23 +++++- .../metrics/nonmonotonic_counter_expect.json | 7 +- .../nonmonotonic_counter_gmp_expect.json | 35 +-------- .../fixtures/metrics/summary_gmp_expect.json | 29 +------ .../metrics/untyped_gauge_gmp_expect.json | 29 +------ 13 files changed, 43 insertions(+), 292 deletions(-) diff --git a/exporter/collector/integrationtest/testcases/testcases_metrics.go b/exporter/collector/integrationtest/testcases/testcases_metrics.go index 7e5cd9b48..492560385 100644 --- a/exporter/collector/integrationtest/testcases/testcases_metrics.go +++ b/exporter/collector/integrationtest/testcases/testcases_metrics.go @@ -373,14 +373,6 @@ var MetricsTestCases = []TestCase{ // prometheus_target is not supported by the SDK SkipForSDK: true, }, - { - Name: "Google Managed Prometheus Exponential Histogram", - OTLPInputFixturePath: "testdata/fixtures/metrics/exponential_histogram.json", - ExpectFixturePath: "testdata/fixtures/metrics/exponential_histogram_gmp_expect.json", - ConfigureCollector: configureGMPCollector, - // prometheus_target is not supported by the SDK - SkipForSDK: true, - }, // Tests for specific distributions of the collector { Name: "Ops Agent Self-Reported metrics", @@ -462,8 +454,8 @@ func configureGMPCollector(cfg *collector.Config) { cfg.MetricConfig.ExtraMetrics = func(m pmetric.Metrics) pmetric.ResourceMetricsSlice { // This should not add any change without the featuregate enabled (from Ops Agent) googlemanagedprometheus.AddUntypedMetrics(m) - googlemanagedprometheus.AddScopeInfoMetric(m) - googlemanagedprometheus.AddTargetInfoMetric(m) + // googlemanagedprometheus.AddScopeInfoMetric(m) + // googlemanagedprometheus.AddTargetInfoMetric(m) return m.ResourceMetrics() } cfg.MetricConfig.InstrumentationLibraryLabels = false diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/counter_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/counter_gmp_expect.json index 217594407..d5533d07f 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/counter_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/counter_gmp_expect.json @@ -34,33 +34,6 @@ } ], "unit": "s" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -87,7 +60,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "2" + "int64Value": "1" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/delta_counter_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/delta_counter_gmp_expect.json index 18b15b8d8..985d66f79 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/delta_counter_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/delta_counter_gmp_expect.json @@ -34,33 +34,6 @@ } ], "unit": "s" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -87,7 +60,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "2" + "int64Value": "1" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge.json index e9e3f99f1..e71fd3aa6 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge.json @@ -47,7 +47,7 @@ { "attributes": [ { - "key": "A", + "key": "some.lemons", "value": { "stringValue": "1" } diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_expect.json index 2383736f9..d8dfdae4d 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_expect.json @@ -37,7 +37,7 @@ "metric": { "type": "workload.googleapis.com/simple.gauge", "labels": { - "A": "1" + "some_lemons": "1" } }, "resource": { @@ -73,9 +73,6 @@ "name": "simple.gauge", "type": "workload.googleapis.com/simple.gauge", "labels": [ - { - "key": "A" - }, { "key": "some_lemons" } diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_gmp_expect.json index 8e9202fc6..9e2ce2f37 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/gauge_gmp_expect.json @@ -38,7 +38,7 @@ "metric": { "type": "prometheus.googleapis.com/simple_gauge_seconds/gauge", "labels": { - "A": "1" + "some_lemons": "1" } }, "resource": { @@ -64,33 +64,6 @@ } ], "unit": "s" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -117,7 +90,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "3" + "int64Value": "2" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/google_managed_prometheus_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/google_managed_prometheus_expect.json index 7153295f7..503fd7db5 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/google_managed_prometheus_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/google_managed_prometheus_expect.json @@ -5,11 +5,7 @@ "timeSeries": [ { "metric": { - "type": "prometheus.googleapis.com/metric_with_a_scope/gauge", - "labels": { - "otel_scope_name": "very_real_scope", - "otel_scope_version": "0.0.2" - } + "type": "prometheus.googleapis.com/metric_with_a_scope/gauge" }, "resource": { "type": "prometheus_target", @@ -34,37 +30,6 @@ } ] }, - { - "metric": { - "type": "prometheus.googleapis.com/otel_scope_info/gauge", - "labels": { - "otel_scope_name": "very_real_scope", - "otel_scope_version": "0.0.2" - } - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "rabbitmq-test-dev", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "default" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] - }, { "metric": { "type": "prometheus.googleapis.com/scrape_series_added/gauge" @@ -933,42 +898,6 @@ } ], "unit": "seconds" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge", - "labels": { - "cloud_platform": "gcp_kubernetes_engine", - "http_scheme": "http", - "k8s_container_name": "rabbitmq", - "k8s_node_name": "10.92.5.2", - "k8s_pod_name": "rabbitmq-server-0", - "net_host_ip": "10.92.5.2", - "net_host_port": "15692" - } - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "rabbitmq-test-dev", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "default" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -995,7 +924,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "30" + "int64Value": "28" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/histogram_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/histogram_gmp_expect.json index a1419500b..689c42b0d 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/histogram_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/histogram_gmp_expect.json @@ -116,33 +116,6 @@ } ], "unit": "s" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -169,7 +142,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "3" + "int64Value": "2" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter.json index 4fc74fa64..f85f34b2a 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter.json @@ -1,7 +1,28 @@ { "resourceMetrics": [ { - "resource": {}, + "resource": { + "attributes": [ + { + "key": "cloud.availability_zone", + "value": { + "stringValue": "us-central1-c" + } + }, + { + "key": "service.name", + "value": { + "stringValue": "demo" + } + }, + { + "key": "service.instance.id", + "value": { + "stringValue": "10.92.5.2:15692" + } + } + ] + }, "scopeMetrics": [ { "scope": {}, diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_expect.json index 46660f6bb..0698ae569 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_expect.json @@ -11,11 +11,12 @@ } }, "resource": { - "type": "generic_node", + "type": "generic_task", "labels": { - "location": "global", + "job": "demo", + "location": "us-central1-c", "namespace": "", - "node_id": "" + "task_id": "10.92.5.2:15692" } }, "metricKind": "GAUGE", diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_gmp_expect.json index 6c0b7303a..ec41fa24c 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/nonmonotonic_counter_gmp_expect.json @@ -14,9 +14,9 @@ "type": "prometheus_target", "labels": { "cluster": "", - "instance": "", - "job": "", - "location": "", + "instance": "10.92.5.2:15692", + "job": "demo", + "location": "us-central1-c", "namespace": "" } }, @@ -33,33 +33,6 @@ } ], "unit": "By" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "", - "job": "", - "location": "", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -86,7 +59,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "2" + "int64Value": "1" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/summary_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/summary_gmp_expect.json index 0b1eab28e..3c58518af 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/summary_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/summary_gmp_expect.json @@ -162,33 +162,6 @@ } ], "unit": "s" - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "10.92.5.2:15692", - "job": "demo", - "location": "us-central1-c", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -215,7 +188,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "6" + "int64Value": "5" } } ] diff --git a/exporter/collector/integrationtest/testdata/fixtures/metrics/untyped_gauge_gmp_expect.json b/exporter/collector/integrationtest/testdata/fixtures/metrics/untyped_gauge_gmp_expect.json index 68800c444..faad131fd 100644 --- a/exporter/collector/integrationtest/testdata/fixtures/metrics/untyped_gauge_gmp_expect.json +++ b/exporter/collector/integrationtest/testdata/fixtures/metrics/untyped_gauge_gmp_expect.json @@ -63,33 +63,6 @@ } } ] - }, - { - "metric": { - "type": "prometheus.googleapis.com/target_info/gauge" - }, - "resource": { - "type": "prometheus_target", - "labels": { - "cluster": "", - "instance": "", - "job": "", - "location": "", - "namespace": "" - } - }, - "metricKind": "GAUGE", - "valueType": "INT64", - "points": [ - { - "interval": { - "endTime": "1970-01-01T00:00:00Z" - }, - "value": { - "int64Value": "1" - } - } - ] } ] } @@ -116,7 +89,7 @@ "startTime": "1970-01-01T00:00:00Z" }, "value": { - "int64Value": "3" + "int64Value": "2" } } ]