diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 9e7fedd4080..8329d2b4cbc 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -70,23 +70,23 @@ constexpr absl::string_view kMetadataExchangeProjectIdKey = "project_id"; constexpr absl::string_view kMetadataExchangeCanonicalServiceKey = "canonical_service"; // The keys that will be used for the local attributes when recording metrics. -constexpr absl::string_view kMeshIdAttribute = "gsm.mesh_id"; +constexpr absl::string_view kMeshIdAttribute = "csm.mesh_id"; // The keys that will be used for the peer attributes when recording metrics. -constexpr absl::string_view kPeerTypeAttribute = "gsm.remote_workload_type"; +constexpr absl::string_view kPeerTypeAttribute = "csm.remote_workload_type"; constexpr absl::string_view kPeerPodNameAttribute = - "gsm.remote_workload_pod_name"; + "csm.remote_workload_pod_name"; constexpr absl::string_view kPeerContainerNameAttribute = - "gsm.remote_workload_container_name"; + "csm.remote_workload_container_name"; constexpr absl::string_view kPeerNamespaceNameAttribute = - "gsm.remote_workload_namespace_name"; + "csm.remote_workload_namespace_name"; constexpr absl::string_view kPeerClusterNameAttribute = - "gsm.remote_workload_cluster_name"; + "csm.remote_workload_cluster_name"; constexpr absl::string_view kPeerLocationAttribute = - "gsm.remote_workload_location"; + "csm.remote_workload_location"; constexpr absl::string_view kPeerProjectIdAttribute = - "gsm.remote_workload_project_id"; + "csm.remote_workload_project_id"; constexpr absl::string_view kPeerCanonicalServiceAttribute = - "gsm.remote_workload_canonical_service"; + "csm.remote_workload_canonical_service"; // Type values used by Google Cloud Resource Detector constexpr absl::string_view kGkeType = "gcp_kubernetes_engine"; diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index d39e89da0da..7f3a6ac15e7 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -150,37 +150,37 @@ class MetadataExchangeTest const std::map& attributes) { - EXPECT_EQ(absl::get(attributes.at("gsm.mesh_id")), "mesh-id"); + EXPECT_EQ(absl::get(attributes.at("csm.mesh_id")), "mesh-id"); switch (GetParam().type()) { case TestScenario::ResourceType::kGke: EXPECT_EQ( - absl::get(attributes.at("gsm.remote_workload_type")), + absl::get(attributes.at("csm.remote_workload_type")), "gcp_kubernetes_engine"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_pod_name")), + attributes.at("csm.remote_workload_pod_name")), "pod"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_container_name")), + attributes.at("csm.remote_workload_container_name")), "container"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_namespace_name")), + attributes.at("csm.remote_workload_namespace_name")), "namespace"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_cluster_name")), + attributes.at("csm.remote_workload_cluster_name")), "cluster"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_location")), + attributes.at("csm.remote_workload_location")), "region"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_project_id")), + attributes.at("csm.remote_workload_project_id")), "id"); EXPECT_EQ(absl::get( - attributes.at("gsm.remote_workload_canonical_service")), + attributes.at("csm.remote_workload_canonical_service")), "canonical_service"); break; case TestScenario::ResourceType::kUnknown: EXPECT_EQ( - absl::get(attributes.at("gsm.remote_workload_type")), + absl::get(attributes.at("csm.remote_workload_type")), "random"); break; } @@ -190,7 +190,7 @@ class MetadataExchangeTest const std::map& attributes) { - EXPECT_EQ(attributes.find("gsm.remote_workload_type"), attributes.end()); + EXPECT_EQ(attributes.find("csm.remote_workload_type"), attributes.end()); } private: