fixup! Update OTEL dependencies to latest release candidates

GoogleCloudPlatform · May 15, 2023 · 2d66fd4 · 2d66fd4
1 parent 9292c82
commit 2d66fd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/exporter/collector/googlemanagedprometheus/naming_test.go b/exporter/collector/googlemanagedprometheus/naming_test.go
@@ -45,16 +45,6 @@ func TestGetMetricName(t *testing.T) {
 		expected  string
 		expectErr bool
 	}{
-		{
-			desc:     "sum without total",
-			baseName: "foo",
-			metric: func(m pmetric.Metric) {
-				m.SetName("foo")
-				sum := m.SetEmptySum()
-				sum.SetIsMonotonic(true)
-			},
-			expected: "foo/counter",
-		},
 		{
 			desc:     "sum with total",
 			baseName: "foo_total",
@@ -74,7 +64,7 @@ func TestGetMetricName(t *testing.T) {
 				sum := m.SetEmptySum()
 				sum.SetIsMonotonic(true)
 			},
-			expected: "foo_total/counter",
+			expected: "foo_seconds_total/counter",
 		},
 		{
 			desc:     "gauge",

diff --git a/...collector/integrationtest/testdata/fixtures/metrics/google_managed_prometheus_expect.json b/...collector/integrationtest/testdata/fixtures/metrics/google_managed_prometheus_expect.json
@@ -706,7 +706,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/otlp_test_gauge/gauge"
+            "type": "prometheus.googleapis.com/otlp_test_gauge_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",
@@ -734,7 +734,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/workload_googleapis_com_otlp_test_prefix1/gauge"
+            "type": "prometheus.googleapis.com/workload_googleapis_com_otlp_test_prefix1_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",
@@ -762,7 +762,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/invalid_googleapis_com_otlp_test_prefix2/gauge"
+            "type": "prometheus.googleapis.com/invalid_googleapis_com_otlp_test_prefix2_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",
@@ -790,7 +790,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/otlp_test_prefix3_workload_googleapis_com_abc/gauge"
+            "type": "prometheus.googleapis.com/otlp_test_prefix3_workload_googleapis_com_abc_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",
@@ -818,7 +818,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/WORKLOAD_GOOGLEAPIS_COM_otlp_test_prefix4/gauge"
+            "type": "prometheus.googleapis.com/WORKLOAD_GOOGLEAPIS_COM_otlp_test_prefix4_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",
@@ -846,7 +846,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/WORKLOAD_googleapis_com_otlp_test_prefix5/gauge"
+            "type": "prometheus.googleapis.com/WORKLOAD_googleapis_com_otlp_test_prefix5_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",
@@ -874,7 +874,7 @@
         },
         {
           "metric": {
-            "type": "prometheus.googleapis.com/prometheus_googleapis_com_otlp_test_prefix6_gauge/gauge"
+            "type": "prometheus.googleapis.com/prometheus_googleapis_com_otlp_test_prefix6_gauge_seconds/gauge"
           },
           "resource": {
             "type": "prometheus_target",