grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcp-csm-o11y: s/csm.service_namespace/csm.service_namespace_name/ 

Just a typo, maybe because service_namespace is used in filter metadata
from CDS.
This commit is contained in:
Eric Anderson 2024-06-03 13:08:11 -07:00
parent 9792c9f106
commit 62cf8427be
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcp-csm-observability/src/main/java/io/grpc/gcp/csm/observability/MetadataExchanger.java
View File

@ -281,7 +281,7 @@ final class MetadataExchanger implements InternalOpenTelemetryPlugin {
@Override @Override
public void addLabels(AttributesBuilder to) { public void addLabels(AttributesBuilder to) {
put(to, "csm.service_name", serviceName); put(to, "csm.service_name", serviceName);
put(to, "csm.service_namespace", serviceNamespace); put(to, "csm.service_namespace_name", serviceNamespace);
Struct exchange = receivedExchange; Struct exchange = receivedExchange;
if (exchange == null) { if (exchange == null) {
exchange = Struct.getDefaultInstance(); exchange = Struct.getDefaultInstance();

10
gcp-csm-observability/src/test/java/io/grpc/gcp/csm/observability/CsmObservabilityTest.java
View File

@ -114,7 +114,7 @@ public final class CsmObservabilityTest {
.put(stringKey("csm.remote_workload_canonical_service"), "unknown") .put(stringKey("csm.remote_workload_canonical_service"), "unknown")
.put(stringKey("csm.remote_workload_type"), "unknown") .put(stringKey("csm.remote_workload_type"), "unknown")
.put(stringKey("csm.service_name"), "unknown") .put(stringKey("csm.service_name"), "unknown")
.put(stringKey("csm.service_namespace"), "unknown") .put(stringKey("csm.service_namespace_name"), "unknown")
.put(stringKey("csm.workload_canonical_service"), "unknown") .put(stringKey("csm.workload_canonical_service"), "unknown")
.put(stringKey("csm.mesh_id"), "unknown") .put(stringKey("csm.mesh_id"), "unknown")
.build(); .build();
@ -170,7 +170,7 @@ public final class CsmObservabilityTest {
.put(stringKey("csm.remote_workload_canonical_service"), "unknown") .put(stringKey("csm.remote_workload_canonical_service"), "unknown")
.put(stringKey("csm.remote_workload_type"), "unknown") .put(stringKey("csm.remote_workload_type"), "unknown")
.put(stringKey("csm.service_name"), "unknown") .put(stringKey("csm.service_name"), "unknown")
.put(stringKey("csm.service_namespace"), "unknown") .put(stringKey("csm.service_namespace_name"), "unknown")
.put(stringKey("csm.workload_canonical_service"), "unknown") .put(stringKey("csm.workload_canonical_service"), "unknown")
.put(stringKey("csm.mesh_id"), "unknown") .put(stringKey("csm.mesh_id"), "unknown")
.build(); .build();
@ -335,7 +335,7 @@ public final class CsmObservabilityTest {
.put(stringKey("csm.remote_workload_namespace_name"), "namespace-1e43c") .put(stringKey("csm.remote_workload_namespace_name"), "namespace-1e43c")
.put(stringKey("csm.remote_workload_name"), "fast-server") .put(stringKey("csm.remote_workload_name"), "fast-server")
.put(stringKey("csm.service_name"), "second-server-name") .put(stringKey("csm.service_name"), "second-server-name")
.put(stringKey("csm.service_namespace"), "namespace-0001") .put(stringKey("csm.service_namespace_name"), "namespace-0001")
.put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client") .put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client")
.put(stringKey("csm.mesh_id"), "mymesh") .put(stringKey("csm.mesh_id"), "mymesh")
.build(); .build();
@ -427,7 +427,7 @@ public final class CsmObservabilityTest {
.put(stringKey("csm.remote_workload_location"), "us-east2-c") .put(stringKey("csm.remote_workload_location"), "us-east2-c")
.put(stringKey("csm.remote_workload_name"), "fast-server") .put(stringKey("csm.remote_workload_name"), "fast-server")
.put(stringKey("csm.service_name"), "unknown") .put(stringKey("csm.service_name"), "unknown")
.put(stringKey("csm.service_namespace"), "unknown") .put(stringKey("csm.service_namespace_name"), "unknown")
.put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client") .put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client")
.put(stringKey("csm.mesh_id"), "mymesh") .put(stringKey("csm.mesh_id"), "mymesh")
.build(); .build();
@ -517,7 +517,7 @@ public final class CsmObservabilityTest {
.put(stringKey("csm.remote_workload_location"), "us-east2-c") .put(stringKey("csm.remote_workload_location"), "us-east2-c")
.put(stringKey("csm.remote_workload_name"), "fast-server") .put(stringKey("csm.remote_workload_name"), "fast-server")
.put(stringKey("csm.service_name"), "unknown") .put(stringKey("csm.service_name"), "unknown")
.put(stringKey("csm.service_namespace"), "unknown") .put(stringKey("csm.service_namespace_name"), "unknown")
.put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client") .put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client")
.put(stringKey("csm.mesh_id"), "mymesh") .put(stringKey("csm.mesh_id"), "mymesh")
.build(); .build();