[CSM] De-experimentalize CSM OTel Plugin Option (#35526)

Closes #35526

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35526 from yashykt:DeexperimentalizeCsmPluginOption 441eccb8579e8687aad13aa7b21db3d40c201a65
PiperOrigin-RevId: 597675383

5 files changed, 8 insertions, 8 deletions

diff --git a/include/grpcpp/ext/csm_observability.h b/include/grpcpp/ext/csm_observability.h
index 104f81a97c..238078202c 100644
--- a/include/grpcpp/ext/csm_observability.h
+++ b/include/grpcpp/ext/csm_observability.h
@@ -90,6 +90,8 @@ class CsmObservabilityBuilder {
   std::unique_ptr<grpc::internal::OpenTelemetryPluginBuilderImpl> builder_;
 };
 
+}  // namespace experimental
+
 /// Creates an OpenTelemetryPluginOption that would add additional labels on
 /// gRPC metrics to enhance observability for CSM users.
 ///
@@ -98,10 +100,8 @@ class CsmObservabilityBuilder {
 ///     .SetMeterProvider(provider)
 ///     .AddPluginOption(MakeCsmOpenTelemetryPluginOption())
 ///     .BuildAndRegisterGlobal();
-std::unique_ptr<grpc::OpenTelemetryPluginOption>
-MakeCsmOpenTelemetryPluginOption();
+std::unique_ptr<OpenTelemetryPluginOption> MakeCsmOpenTelemetryPluginOption();
 
-}  // namespace experimental
 }  // namespace grpc
 
 #endif  // GRPCPP_EXT_CSM_OBSERVABILITY_H
diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc
index de55e1e9d7..11ea288017 100644
--- a/src/cpp/ext/csm/csm_observability.cc
+++ b/src/cpp/ext/csm/csm_observability.cc
@@ -141,10 +141,10 @@ absl::StatusOr<CsmObservability> CsmObservabilityBuilder::BuildAndRegister() {
   return CsmObservability();
 }
 
+}  // namespace experimental
+
 std::unique_ptr<OpenTelemetryPluginOption> MakeCsmOpenTelemetryPluginOption() {
   return std::make_unique<grpc::internal::CsmOpenTelemetryPluginOption>();
 }
 
-}  // namespace experimental
-
 }  // namespace grpc
diff --git a/test/cpp/ext/csm/csm_observability_test.cc b/test/cpp/ext/csm/csm_observability_test.cc
index 520c6f4f3c..6ca73969bc 100644
--- a/test/cpp/ext/csm/csm_observability_test.cc
+++ b/test/cpp/ext/csm/csm_observability_test.cc
@@ -65,7 +65,7 @@ TEST(CsmChannelTargetSelectorTest, XdsTargetsWithTDAuthority) {
 
 TEST(CsmPluginOptionTest, Basic) {
   OpenTelemetryPluginBuilder()
-      .AddPluginOption(experimental::MakeCsmOpenTelemetryPluginOption())
+      .AddPluginOption(MakeCsmOpenTelemetryPluginOption())
       .BuildAndRegisterGlobal();
 }
 
diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc
index a896e07b5c..82d660d057 100644
--- a/test/cpp/interop/xds_interop_client.cc
+++ b/test/cpp/interop/xds_interop_client.cc
@@ -404,7 +404,7 @@ void EnableCsmObservability() {
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
   grpc::OpenTelemetryPluginBuilder()
-      .AddPluginOption(grpc::experimental::MakeCsmOpenTelemetryPluginOption())
+      .AddPluginOption(grpc::MakeCsmOpenTelemetryPluginOption())
       .SetMeterProvider(std::move(meter_provider))
       .BuildAndRegisterGlobal();
 }
diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc
index cba981621f..15fe10d141 100644
--- a/test/cpp/interop/xds_interop_server.cc
+++ b/test/cpp/interop/xds_interop_server.cc
@@ -55,7 +55,7 @@ void EnableCsmObservability() {
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
   grpc::OpenTelemetryPluginBuilder()
-      .AddPluginOption(grpc::experimental::MakeCsmOpenTelemetryPluginOption())
+      .AddPluginOption(grpc::MakeCsmOpenTelemetryPluginOption())
       .SetMeterProvider(std::move(meter_provider))
       .BuildAndRegisterGlobal();
 }