Skip to content

Commit 62cf842

Browse files
committed
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.
1 parent 9792c9f commit 62cf842

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ private void setExchange(Metadata metadata) {
280280

281281
@Override
282282
public void addLabels(AttributesBuilder to) {
283-
put(to, "csm.service_name", serviceName);
284-
put(to, "csm.service_namespace", serviceNamespace);
283+
put(to, "csm.service_name", serviceName);
284+
put(to, "csm.service_namespace_name", serviceNamespace);
285285
Struct exchange = receivedExchange;
286286
if (exchange == null) {
287287
exchange = Struct.getDefaultInstance();

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void unknownDataExchange() throws Exception {
114114
.put(stringKey("csm.remote_workload_canonical_service"), "unknown")
115115
.put(stringKey("csm.remote_workload_type"), "unknown")
116116
.put(stringKey("csm.service_name"), "unknown")
117-
.put(stringKey("csm.service_namespace"), "unknown")
117+
.put(stringKey("csm.service_namespace_name"), "unknown")
118118
.put(stringKey("csm.workload_canonical_service"), "unknown")
119119
.put(stringKey("csm.mesh_id"), "unknown")
120120
.build();
@@ -170,7 +170,7 @@ public void nonCsmServer() throws Exception {
170170
.put(stringKey("csm.remote_workload_canonical_service"), "unknown")
171171
.put(stringKey("csm.remote_workload_type"), "unknown")
172172
.put(stringKey("csm.service_name"), "unknown")
173-
.put(stringKey("csm.service_namespace"), "unknown")
173+
.put(stringKey("csm.service_namespace_name"), "unknown")
174174
.put(stringKey("csm.workload_canonical_service"), "unknown")
175175
.put(stringKey("csm.mesh_id"), "unknown")
176176
.build();
@@ -335,7 +335,7 @@ public void k8sExchange() throws Exception {
335335
.put(stringKey("csm.remote_workload_namespace_name"), "namespace-1e43c")
336336
.put(stringKey("csm.remote_workload_name"), "fast-server")
337337
.put(stringKey("csm.service_name"), "second-server-name")
338-
.put(stringKey("csm.service_namespace"), "namespace-0001")
338+
.put(stringKey("csm.service_namespace_name"), "namespace-0001")
339339
.put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client")
340340
.put(stringKey("csm.mesh_id"), "mymesh")
341341
.build();
@@ -427,7 +427,7 @@ public void gceExchange() throws Exception {
427427
.put(stringKey("csm.remote_workload_location"), "us-east2-c")
428428
.put(stringKey("csm.remote_workload_name"), "fast-server")
429429
.put(stringKey("csm.service_name"), "unknown")
430-
.put(stringKey("csm.service_namespace"), "unknown")
430+
.put(stringKey("csm.service_namespace_name"), "unknown")
431431
.put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client")
432432
.put(stringKey("csm.mesh_id"), "mymesh")
433433
.build();
@@ -517,7 +517,7 @@ public void trailersOnly() throws Exception {
517517
.put(stringKey("csm.remote_workload_location"), "us-east2-c")
518518
.put(stringKey("csm.remote_workload_name"), "fast-server")
519519
.put(stringKey("csm.service_name"), "unknown")
520-
.put(stringKey("csm.service_namespace"), "unknown")
520+
.put(stringKey("csm.service_namespace_name"), "unknown")
521521
.put(stringKey("csm.workload_canonical_service"), "canon-service-is-a-client")
522522
.put(stringKey("csm.mesh_id"), "mymesh")
523523
.build();

0 commit comments

Comments
 (0)