Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make client side metrics tag in sync with server #2401

Merged
merged 4 commits into from
Nov 19, 2024
Merged

fix: make client side metrics tag in sync with server #2401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa7a38b
fix: make client side metrics tag in sync with server
mutianf Nov 4, 2024
66f9e47
fix test
mutianf Nov 13, 2024
6a5f27a
Merge branch 'main' into sync_with_server
mutianf Nov 13, 2024
e1d9f13
update test from previously merged pr
igorbernstein2 Nov 19, 2024
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
4 changes: 2 additions & 2 deletions ...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ class BuiltinMetricsTracer extends BigtableTracer {
private final AtomicInteger requestLeft = new AtomicInteger(0);

// Monitored resource labels
private String tableId = "unspecified";
private String tableId = "<unspecified>";
private String zone = "global";
private String cluster = "unspecified";
private String cluster = "<unspecified>";

private final AtomicLong totalClientBlockingTime = new AtomicLong(0);

Expand Down
14 changes: 10 additions & 4 deletions google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
import com.google.api.gax.rpc.StatusCode.Code;
import com.google.bigtable.v2.AuthorizedViewName;
import com.google.bigtable.v2.CheckAndMutateRowRequest;
import com.google.bigtable.v2.GenerateInitialChangeStreamPartitionsRequest;
import com.google.bigtable.v2.MutateRowRequest;
import com.google.bigtable.v2.MutateRowsRequest;
import com.google.bigtable.v2.ReadChangeStreamRequest;
import com.google.bigtable.v2.ReadModifyWriteRowRequest;
import com.google.bigtable.v2.ReadRowsRequest;
import com.google.bigtable.v2.ResponseParams;
Expand Down Expand Up @@ -127,14 +129,18 @@ static String extractTableId(Object request) {
} else if (request instanceof ReadModifyWriteRowRequest) {
tableName = ((ReadModifyWriteRowRequest) request).getTableName();
authorizedViewName = ((ReadModifyWriteRowRequest) request).getAuthorizedViewName();
} else if (request instanceof GenerateInitialChangeStreamPartitionsRequest) {
tableName = ((GenerateInitialChangeStreamPartitionsRequest) request).getTableName();
} else if (request instanceof ReadChangeStreamRequest) {
tableName = ((ReadChangeStreamRequest) request).getTableName();
}
if (tableName == null && authorizedViewName == null) return "undefined";
if (tableName.isEmpty() && authorizedViewName.isEmpty()) return "undefined";
if (!tableName.isEmpty()) {
if (tableName != null && !tableName.isEmpty()) {
return TableName.parse(tableName).getTable();
} else {
}
if (authorizedViewName != null && !authorizedViewName.isEmpty()) {
return AuthorizedViewName.parse(authorizedViewName).getTable();
}
return "<unspecified>";
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...gtable/src/test/java/com/google/cloud/bigtable/data/v2/it/StreamingMetricsMetadataIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ public void testFailure() {

assertThat(pointData)
.comparingElementsUsing(POINT_DATA_CLUSTER_ID_CONTAINS)
.contains("unspecified");
.contains("<unspecified>");
assertThat(pointData).comparingElementsUsing(POINT_DATA_ZONE_ID_CONTAINS).contains("global");
assertThat(clusterAttributes).contains("unspecified");
assertThat(clusterAttributes).contains("<unspecified>");
assertThat(zoneAttributes).contains("global");
}
}
4 changes: 2 additions & 2 deletions ...d-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void testFailure() throws Exception {

assertThat(pointData)
.comparingElementsUsing(POINT_DATA_CLUSTER_ID_CONTAINS)
.contains("unspecified");
.contains("<unspecified>");
assertThat(pointData).comparingElementsUsing(POINT_DATA_ZONE_ID_CONTAINS).contains("global");
List<String> clusterAttributes =
pointData.stream()
Expand All @@ -193,7 +193,7 @@ public void testFailure() throws Exception {
.map(pd -> pd.getAttributes().get(BuiltinMetricsConstants.ZONE_ID_KEY))
.collect(Collectors.toList());

assertThat(clusterAttributes).contains("unspecified");
assertThat(clusterAttributes).contains("<unspecified>");
assertThat(zoneAttributes).contains("global");
}
}
12 changes: 6 additions & 6 deletions ...rc/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public void testGfeMetrics() {
.put(STATUS_KEY, "UNAVAILABLE")
.put(TABLE_ID_KEY, TABLE)
.put(ZONE_ID_KEY, "global")
.put(CLUSTER_ID_KEY, "unspecified")
.put(CLUSTER_ID_KEY, "<unspecified>")
.put(METHOD_KEY, "Bigtable.ReadRows")
.put(CLIENT_NAME_KEY, CLIENT_NAME)
.build();
Expand Down Expand Up @@ -550,7 +550,7 @@ public void testMutateRowAttemptsTagValues() {
.put(STATUS_KEY, "UNAVAILABLE")
.put(TABLE_ID_KEY, TABLE)
.put(ZONE_ID_KEY, "global")
.put(CLUSTER_ID_KEY, "unspecified")
.put(CLUSTER_ID_KEY, "<unspecified>")
.put(METHOD_KEY, "Bigtable.MutateRow")
.put(CLIENT_NAME_KEY, CLIENT_NAME)
.put(STREAMING_KEY, false)
Expand Down Expand Up @@ -620,7 +620,7 @@ public void testMutateRowsRpcError() {
.put(STATUS_KEY, "NOT_FOUND")
.put(TABLE_ID_KEY, BAD_TABLE_ID)
.put(ZONE_ID_KEY, "global")
.put(CLUSTER_ID_KEY, "unspecified")
.put(CLUSTER_ID_KEY, "<unspecified>")
.put(METHOD_KEY, "Bigtable.MutateRows")
.put(CLIENT_NAME_KEY, CLIENT_NAME)
.put(STREAMING_KEY, false)
Expand All @@ -641,7 +641,7 @@ public void testReadRowsAttemptsTagValues() {
.put(STATUS_KEY, "UNAVAILABLE")
.put(TABLE_ID_KEY, TABLE)
.put(ZONE_ID_KEY, "global")
.put(CLUSTER_ID_KEY, "unspecified")
.put(CLUSTER_ID_KEY, "<unspecified>")
.put(METHOD_KEY, "Bigtable.ReadRows")
.put(CLIENT_NAME_KEY, CLIENT_NAME)
.put(STREAMING_KEY, true)
Expand Down Expand Up @@ -752,7 +752,7 @@ public void testPermanentFailure() {
.toBuilder()
.put(STATUS_KEY, "NOT_FOUND")
.put(TABLE_ID_KEY, BAD_TABLE_ID)
.put(CLUSTER_ID_KEY, "unspecified")
.put(CLUSTER_ID_KEY, "<unspecified>")
.put(ZONE_ID_KEY, "global")
.put(STREAMING_KEY, true)
.put(METHOD_KEY, "Bigtable.ReadRows")
Expand All @@ -777,7 +777,7 @@ public void testRemainingDeadline() {
.put(TABLE_ID_KEY, TABLE)
.put(METHOD_KEY, "Bigtable.ReadRows")
.put(ZONE_ID_KEY, "global")
.put(CLUSTER_ID_KEY, "unspecified")
.put(CLUSTER_ID_KEY, "<unspecified>")
.put(STREAMING_KEY, true)
.put(CLIENT_NAME_KEY, CLIENT_NAME)
.build();
Expand Down
Loading