Skip to content

Commit

Permalink
update opencensus imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@mutianf
mutianf committed Nov 17, 2021
1 parent 490787f commit 9b5283c
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 54 deletions.
12 changes: 6 additions & 6 deletions ...ain/java/com/google/cloud/bigtable/data/v2/stub/metrics/builtin/BuiltinViewConstants.java
View file
Expand Up @@ -15,9 +15,9 @@
*/
package com.google.cloud.bigtable.data.v2.stub.metrics.builtin;

import static com.google.bigtable.repackaged.io.opencensus.stats.Aggregation.Count;
import static com.google.bigtable.repackaged.io.opencensus.stats.Aggregation.Distribution;
import static com.google.bigtable.repackaged.io.opencensus.stats.Aggregation.Sum;
import static com.google.bigtable.veneer.repackaged.io.opencensus.stats.Aggregation.Count;
import static com.google.bigtable.veneer.repackaged.io.opencensus.stats.Aggregation.Distribution;
import static com.google.bigtable.veneer.repackaged.io.opencensus.stats.Aggregation.Sum;
import static com.google.cloud.bigtable.data.v2.stub.metrics.builtin.BuiltinMeasureConstants.APPLICATION_LATENCIES;
import static com.google.cloud.bigtable.data.v2.stub.metrics.builtin.BuiltinMeasureConstants.APP_PROFILE;
import static com.google.cloud.bigtable.data.v2.stub.metrics.builtin.BuiltinMeasureConstants.ATTEMPT_LATENCIES;
Expand All @@ -39,9 +39,9 @@
import static com.google.cloud.bigtable.data.v2.stub.metrics.builtin.BuiltinMeasureConstants.ZONE;

import com.google.api.core.InternalApi;
import com.google.bigtable.repackaged.io.opencensus.stats.Aggregation;
import com.google.bigtable.repackaged.io.opencensus.stats.BucketBoundaries;
import com.google.bigtable.repackaged.io.opencensus.stats.View;
import com.google.bigtable.veneer.repackaged.io.opencensus.stats.Aggregation;
import com.google.bigtable.veneer.repackaged.io.opencensus.stats.BucketBoundaries;
import com.google.bigtable.veneer.repackaged.io.opencensus.stats.View;
import com.google.common.collect.ImmutableList;

@InternalApi("For internal use only")
Expand Down
6 changes: 3 additions & 3 deletions ...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/builtin/BuiltinViews.java
View file
Expand Up @@ -16,9 +16,9 @@
package com.google.cloud.bigtable.data.v2.stub.metrics.builtin;

import com.google.api.core.InternalApi;
import com.google.bigtable.repackaged.io.opencensus.stats.Stats;
import com.google.bigtable.repackaged.io.opencensus.stats.View;
import com.google.bigtable.repackaged.io.opencensus.stats.ViewManager;
import com.google.bigtable.veneer.repackaged.io.opencensus.stats.Stats;
import com.google.bigtable.veneer.repackaged.io.opencensus.stats.View;
import com.google.bigtable.veneer.repackaged.io.opencensus.stats.ViewManager;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSet;

Expand Down
23 changes: 12 additions & 11 deletions ...rc/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java
View file
Expand Up @@ -101,8 +101,8 @@ public class BuiltinMetricsTracerTest {
private EnhancedBigtableStub stub;

private StatsComponentImpl clientStats = new StatsComponentImpl();
private com.google.bigtable.repackaged.io.opencensus.impl.stats.StatsComponentImpl builtinStats =
new com.google.bigtable.repackaged.io.opencensus.impl.stats.StatsComponentImpl();
private com.google.bigtable.veneer.repackaged.io.opencensus.impl.stats.StatsComponentImpl builtinStats =
new com.google.bigtable.veneer.repackaged.io.opencensus.impl.stats.StatsComponentImpl();

@Before
public void setUp() throws Exception {
Expand All @@ -127,8 +127,9 @@ public void sendHeaders(Metadata headers) {

@Override
public void close(Status status, Metadata trailers) {
trailers.put(HeaderTracer.BIGTABLE_ZONE_HEADER_KEY, ZONE);
trailers.put(HeaderTracer.BIGTABLE_CLUSTER_HEADER_KEY, CLUSTER);
//TODO
// trailers.put(HeaderTracer.BIGTABLE_ZONE_HEADER_KEY, ZONE);
// trailers.put(HeaderTracer.BIGTABLE_CLUSTER_HEADER_KEY, CLUSTER);
super.close(status, trailers);
}
},
Expand Down Expand Up @@ -216,21 +217,21 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
BuiltinViewConstants.OPERATION_LATENCIES_VIEW,
ImmutableMap.of(
BuiltinMeasureConstants.METHOD,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(
"Bigtable.ReadRows"),
BuiltinMeasureConstants.STATUS,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create("OK"),
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create("OK"),
BuiltinMeasureConstants.TABLE,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(TABLE_ID),
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(TABLE_ID),
BuiltinMeasureConstants.ZONE,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(ZONE),
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(ZONE),
BuiltinMeasureConstants.CLUSTER,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(CLUSTER),
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(CLUSTER),
BuiltinMeasureConstants.CLIENT_NAME,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(
"java-bigtable"),
BuiltinMeasureConstants.STREAMING,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create("true")),
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create("true")),
PROJECT_ID,
INSTANCE_ID,
APP_PROFILE_ID);
Expand Down
68 changes: 34 additions & 34 deletions ...bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/StatsTestUtils.java
View file
Expand Up @@ -346,104 +346,104 @@ public Long apply(AggregationData arg) {
}

public static long getAggregationValueAsLong(
com.google.bigtable.repackaged.io.opencensus.stats.StatsComponent stats,
com.google.bigtable.repackaged.io.opencensus.stats.View view,
com.google.bigtable.veneer.repackaged.io.opencensus.stats.StatsComponent stats,
com.google.bigtable.veneer.repackaged.io.opencensus.stats.View view,
ImmutableMap<
com.google.bigtable.repackaged.io.opencensus.tags.TagKey,
com.google.bigtable.repackaged.io.opencensus.tags.TagValue>
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagKey,
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue>
tags,
String projectId,
String instanceId,
String appProfileId) {
com.google.bigtable.repackaged.io.opencensus.stats.ViewData viewData =
com.google.bigtable.veneer.repackaged.io.opencensus.stats.ViewData viewData =
stats.getViewManager().getView(view.getName());
Map<
List<com.google.bigtable.repackaged.io.opencensus.tags.TagValue>,
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData>
List<com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue>,
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData>
aggregationMap = Objects.requireNonNull(viewData).getAggregationMap();

List<com.google.bigtable.repackaged.io.opencensus.tags.TagValue> tagValues = new ArrayList<>();
List<com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue> tagValues = new ArrayList<>();

for (com.google.bigtable.repackaged.io.opencensus.tags.TagKey column : view.getColumns()) {
for (com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagKey column : view.getColumns()) {
if (BuiltinMeasureConstants.PROJECT_ID == column) {
tagValues.add(com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(projectId));
tagValues.add(com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(projectId));
} else if (BuiltinMeasureConstants.INSTANCE_ID == column) {
tagValues.add(
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(instanceId));
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(instanceId));
} else if (BuiltinMeasureConstants.APP_PROFILE == column) {
tagValues.add(
com.google.bigtable.repackaged.io.opencensus.tags.TagValue.create(appProfileId));
com.google.bigtable.veneer.repackaged.io.opencensus.tags.TagValue.create(appProfileId));
} else {
tagValues.add(tags.get(column));
}
}

com.google.bigtable.repackaged.io.opencensus.stats.AggregationData aggregationData =
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData aggregationData =
aggregationMap.get(tagValues);

return aggregationData.match(
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.SumDataDouble,
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.SumDataDouble,
Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.SumDataDouble
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.SumDataDouble
arg) {
return (long) arg.getSum();
}
},
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.SumDataLong,
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.SumDataLong,
Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.SumDataLong arg) {
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.SumDataLong arg) {
return arg.getSum();
}
},
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.CountData, Long>() {
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.CountData, Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.CountData arg) {
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.CountData arg) {
return arg.getCount();
}
},
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.DistributionData,
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.DistributionData,
Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.DistributionData
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.DistributionData
arg) {
return (long) arg.getMean();
}
},
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.LastValueDataDouble,
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.LastValueDataDouble,
Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.LastValueDataDouble
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.LastValueDataDouble
arg) {
return (long) arg.getLastValue();
}
},
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.LastValueDataLong,
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.LastValueDataLong,
Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData.LastValueDataLong
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData.LastValueDataLong
arg) {
return arg.getLastValue();
}
},
new com.google.bigtable.repackaged.io.opencensus.common.Function<
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData, Long>() {
new com.google.bigtable.veneer.repackaged.io.opencensus.common.Function<
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData, Long>() {
@Override
public Long apply(
com.google.bigtable.repackaged.io.opencensus.stats.AggregationData arg) {
com.google.bigtable.veneer.repackaged.io.opencensus.stats.AggregationData arg) {
throw new UnsupportedOperationException();
}
});
Expand Down

0 comments on commit 9b5283c

Please sign in to comment.