Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

fix: enable integration test for google-cloud-bigtable-stats #1311

Merged
mutianf merged 3 commits into from
Jul 15, 2022
Merged

fix: enable integration test for google-cloud-bigtable-stats #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8740ec4
fix: enable integration test for graal
mutianf Jul 15, 2022
eee9cd6
update
mutianf Jul 15, 2022
5ffc68c
add more comments
mutianf Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/StatsWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(
Expand All @@ -49,4 +51,19 @@ public static List<String> getOperationLatencyViewTagValueStrings() {
.map(x -> x.asString())
.collect(Collectors.toCollection(ArrayList::new));
}

// A workaround to run ITBuiltinViewConstantsTest as integration test. Integration test runs after
// the packaging step. Opencensus classes will be relocated when they are packaged but the
// integration test files will not be. So the integration tests can't reference any transitive
// dependencies that have been relocated.
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;
}
}
23 changes: 11 additions & 12 deletions ...table/stats/BuiltinViewConstantsTest.java → ...ble/stats/ITBuiltinViewConstantsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,22 @@

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;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

public class BuiltinViewConstantsTest {
@RunWith(JUnit4.class)
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()) {
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");
}
}
}
7 changes: 7 additions & 0 deletions ...igtable-stats/src/test/java/com/google/cloud/bigtable/stats/StatsRecorderWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,14 @@
import java.util.Objects;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

// Can only be run as a unit test. Opencensus classes will be relocated when they are packaged but
// the integration test files will not be. So the integration tests can't reference any transitive
// dependencies that have been relocated. To work around this, we'll have to move all the reference
// to opencensus to StatsWrapper.
@RunWith(JUnit4.class)
public class StatsRecorderWrapperTest {

private final String PROJECT_ID = "fake-project";
Expand Down