fix

googleapis · Jul 15, 2022 · 142df1d · 142df1d
1 parent 5ab424c
commit 142df1d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/StatsWrapper.java b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/StatsWrapper.java
@@ -20,7 +20,10 @@
 import com.google.api.core.InternalApi;
 import com.google.api.gax.tracing.SpanName;
 import io.opencensus.stats.Stats;
+import io.opencensus.stats.View;
+import io.opencensus.tags.TagKey;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -31,7 +34,6 @@
  */
 @InternalApi("For internal use only")
 public class StatsWrapper {
-
   public static StatsRecorderWrapper createRecorder(
       OperationType operationType, SpanName spanName, Map<String, String> statsAttributes) {
     return new StatsRecorderWrapper(
@@ -49,4 +51,16 @@ public static List<String> getOperationLatencyViewTagValueStrings() {
         .map(x -> x.asString())
         .collect(Collectors.toCollection(ArrayList::new));
   }
+
+  // A workaround to run BuiltinViewConstantsTest as integration test
+  static Map<String, List<String>> getViewToTagMap() {
+    Map<String, List<String>> map = new HashMap<>();
+    for (View view : BuiltinViews.BIGTABLE_BUILTIN_VIEWS) {
+      List<TagKey> tagKeys = view.getColumns();
+      map.put(
+          view.getName().asString(),
+          tagKeys.stream().map(tagKey -> tagKey.getName()).collect(Collectors.toList()));
+    }
+    return map;
+  }
 }
diff --git a/...table/stats/BuiltinViewConstantsTest.java → ...ble/stats/ITBuiltinViewConstantsTest.java b/...table/stats/BuiltinViewConstantsTest.java → ...ble/stats/ITBuiltinViewConstantsTest.java
@@ -17,23 +17,21 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import io.opencensus.stats.View;
+import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 
-public class BuiltinViewConstantsTest {
+public class ITBuiltinViewConstantsTest {
   @Test
   public void testBasicTagsExistForAllViews() {
-    for (View v : BuiltinViews.BIGTABLE_BUILTIN_VIEWS) {
-      assertWithMessage(v.getName() + " should have all basic tags")
-          .that(v.getColumns())
+    Map<String, List<String>> viewToTagMap = StatsWrapper.getViewToTagMap();
+    for (String view : viewToTagMap.keySet()) {
+      System.out.println(view);
+      System.out.println(viewToTagMap.get(view));
+      assertWithMessage(view + " should have all basic tags")
+          .that(viewToTagMap.get(view))
           .containsAtLeast(
-              BuiltinMeasureConstants.PROJECT_ID,
-              BuiltinMeasureConstants.INSTANCE_ID,
-              BuiltinMeasureConstants.APP_PROFILE,
-              BuiltinMeasureConstants.METHOD,
-              BuiltinMeasureConstants.ZONE,
-              BuiltinMeasureConstants.CLUSTER,
-              BuiltinMeasureConstants.TABLE);
+              "project_id", "instance_id", "app_profile", "method", "zone", "cluster", "table");
     }
   }
 }
diff --git a/...igtable-stats/src/test/java/com/google/cloud/bigtable/stats/StatsRecorderWrapperTest.java b/...igtable-stats/src/test/java/com/google/cloud/bigtable/stats/StatsRecorderWrapperTest.java
@@ -60,11 +60,11 @@ public void testStreamingOperation() throws InterruptedException {
             ApiTracerFactory.OperationType.ServerStreaming,
             SpanName.of("Bigtable", "ReadRows"),
             ImmutableMap.of(
-                BuiltinMeasureConstants.PROJECT_ID.getName(),
+                "project_id",
                 PROJECT_ID,
-                BuiltinMeasureConstants.INSTANCE_ID.getName(),
+                "instance_id",
                 INSTANCE_ID,
-                BuiltinMeasureConstants.APP_PROFILE.getName(),
+                "app_profile",
                 APP_PROFILE_ID),
             statsComponent.getStatsRecorder());