[xds interop] Use new CSM Observability APIs (#35508)

Closes #35508 COPYBARA_INTEGRATE_REVIEW=#35508 from yashykt:XdsInteropNewCsm 09d408c PiperOrigin-RevId: 597588033
grpc · Jan 11, 2024 · 6741e20 · 6741e20
1 parent 1ec0559
commit 6741e20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc
@@ -403,9 +403,10 @@ void EnableCsmObservability() {
   auto meter_provider =
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
-  grpc::experimental::CsmObservabilityBuilder observability;
-  observability.SetMeterProvider(std::move(meter_provider));
-  auto status = observability.BuildAndRegister();
+  grpc::experimental::OpenTelemetryPluginBuilder()
+      .AddPluginOption(grpc::experimental::MakeCsmOpenTelemetryPluginOption())
+      .SetMeterProvider(std::move(meter_provider))
+      .BuildAndRegisterGlobal();
 }
 
 void RunServer(const int port, StatsWatchers* stats_watchers,

diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc
@@ -54,9 +54,10 @@ void EnableCsmObservability() {
   auto meter_provider =
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
-  grpc::experimental::CsmObservabilityBuilder observability;
-  observability.SetMeterProvider(std::move(meter_provider));
-  auto status = observability.BuildAndRegister();
+  grpc::experimental::OpenTelemetryPluginBuilder()
+      .AddPluginOption(grpc::experimental::MakeCsmOpenTelemetryPluginOption())
+      .SetMeterProvider(std::move(meter_provider))
+      .BuildAndRegisterGlobal();
 }
 
 int main(int argc, char** argv) {