Re-enable workload metrics integration tests

GoogleCloudPlatform · Jan 11, 2022 · 162bd01 · 162bd01
1 parent 0a1405b
commit 162bd01
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 29 deletions.
diff --git a/exporter/collector/breaking-changes.md b/exporter/collector/breaking-changes.md
@@ -13,6 +13,11 @@ Additionally, the previous exporter had a hardcoded list of known metric domains
 where this "prefix" would not be used. The new exporter allows full configuration
 of this list via the `metric.known_domains` property.
 
+The previous exporter would by default only call CreateMetricDescriptor for metrics with domain
+`custom.googleapis.com` or `external.googleapis.com`. The new exporter will try to call
+CreateMetricDescriptor regardless of domain, unless `metric.skip_create_descriptor` or
+`metric.create_service_timeseries` are true.
+
 Additionally, the DisplayName for a metric used to be exactly the
 `{metric_name}`. Now, the metric name is chosen as the full-path after the
 domain name of the metric type.  E.g. if a metric called

diff --git a/exporter/collector/internal/integrationtest/testcases.go b/exporter/collector/internal/integrationtest/testcases.go
@@ -80,9 +80,9 @@ var (
 			Name:                 "GKE Workload Metrics",
 			OTLPInputFixturePath: "testdata/fixtures/workload_metrics.json",
 			ExpectFixturePath:    "testdata/fixtures/workload_metrics_expect.json",
-			Skip:                 true,
 			Configure: func(cfg *collector.Config) {
 				cfg.MetricConfig.Prefix = "workload.googleapis.com/"
+				cfg.MetricConfig.SkipCreateMetricDescriptor = true
 			},
 		},
 		{

diff --git a/exporter/collector/testdata/fixtures/workload_metrics.json b/exporter/collector/testdata/fixtures/workload_metrics.json
@@ -4,19 +4,19 @@
           "resource":{
              "attributes":[
                 {
-                   "key":"cloud.zone",
+                   "key":"cloud.availability_zone",
                    "value":{
                       "stringValue":"us-central1-c"
                    }
                 },
                 {
-                   "key":"container.name",
+                   "key":"k8s.container.name",
                    "value":{
                       "stringValue":"rabbitmq"
                    }
                 },
                 {
-                   "key":"host.name",
+                   "key":"k8s.node.name",
                    "value":{
                       "stringValue":"10.92.5.2"
                    }
@@ -50,6 +50,12 @@
                    "value":{
                       "stringValue":"rabbitmq-server-0"
                    }
+                },
+                {
+                   "key":"cloud.platform",
+                   "value":{
+                      "stringValue":"gcp_kubernetes_engine"
+                   }
                 }
              ]
           },

diff --git a/exporter/collector/testdata/fixtures/workload_metrics_expect.json b/exporter/collector/testdata/fixtures/workload_metrics_expect.json
@@ -1379,7 +1379,8 @@
                 "doubleValue": 192868352
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -1409,7 +1410,8 @@
                 "doubleValue": 10141614080
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -1622,7 +1624,8 @@
                 "doubleValue": 687194767
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -1652,7 +1655,8 @@
                 "doubleValue": 2000000000
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -1742,7 +1746,8 @@
                 "doubleValue": 60
               }
             }
-          ]
+          ],
+          "unit": "s"
         },
         {
           "metric": {
@@ -1772,7 +1777,8 @@
                 "doubleValue": 3625.239
               }
             }
-          ]
+          ],
+          "unit": "s"
         },
         {
           "metric": {
@@ -2573,7 +2579,8 @@
                 "doubleValue": 0
               }
             }
-          ]
+          ],
+          "unit": "s"
         },
         {
           "metric": {
@@ -2784,7 +2791,8 @@
                 "doubleValue": 2927472
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -2844,7 +2852,8 @@
                 "doubleValue": 2772
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -2964,7 +2973,8 @@
                 "doubleValue": 2772
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -2994,7 +3004,8 @@
                 "doubleValue": 0
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3024,7 +3035,8 @@
                 "doubleValue": 2772
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3084,7 +3096,8 @@
                 "doubleValue": 0
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3462,7 +3475,8 @@
                 "doubleValue": 114277
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3496,7 +3510,8 @@
                 "int64Value": "10"
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3529,7 +3544,8 @@
                 "doubleValue": 1486743
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3562,7 +3578,8 @@
                 "int64Value": "10"
               }
             }
-          ]
+          ],
+          "unit": "By"
         },
         {
           "metric": {
@@ -3595,7 +3612,8 @@
                 "doubleValue": 1.297912543
               }
             }
-          ]
+          ],
+          "unit": "s"
         },
         {
           "metric": {
@@ -3628,7 +3646,8 @@
                 "int64Value": "10"
               }
             }
-          ]
+          ],
+          "unit": "s"
         },
         {
           "metric": {
@@ -6307,11 +6326,7 @@
               }
             }
           ]
-        }
-      ]
-    },
-    {
-      "timeSeries": [
+        },
         {
           "metric": {
             "type": "workload.googleapis.com/erlang_vm_msacc_emulator_seconds_total",
@@ -6452,7 +6467,7 @@
     },
     {
       "name": "googlecloudmonitoring/point_count",
-      "val": "200",
+      "val": "203",
       "labels": {
         "status": "OK"
       }