Merge pull request #4910 from MrAnno/fix-otel-config-revert

Fix otel config revert

modules/grpc/otel/otel-source.cpp

@@ -96,9 +96,13 @@ syslogng::grpc::otel::SourceDriver::init()
   for (auto nv : string_extra_channel_args)
     builder.AddChannelArgument(nv.first, nv.second);
 
-  builder.RegisterService(&trace_service);
-  builder.RegisterService(&logs_service);
-  builder.RegisterService(&metrics_service);
+  trace_service = std::make_unique<TraceService::AsyncService>();
+  logs_service = std::make_unique<LogsService::AsyncService>();
+  metrics_service = std::make_unique<MetricsService::AsyncService>();
+
+  builder.RegisterService(trace_service.get());
+  builder.RegisterService(logs_service.get());
+  builder.RegisterService(metrics_service.get());
 
   for (int i = 0; i < super->super.num_workers; i++)
     cqs.push_back(builder.AddCompletionQueue());
@@ -123,6 +127,10 @@ syslogng::grpc::otel::SourceDriver::init()
 gboolean
 syslogng::grpc::otel::SourceDriver::deinit()
 {
+  trace_service = nullptr;
+  logs_service = nullptr;
+  metrics_service = nullptr;
+
   return log_threaded_source_driver_deinit_method(&super->super.super.super.super);
 }
 
@@ -161,9 +169,9 @@ syslogng::grpc::otel::SourceWorker::run()
    */
   for (int i = 0; i < driver.concurrent_requests - 1; i++)
     {
-      new TraceServiceCall(*this, &driver.trace_service, cq.get());
-      new LogsServiceCall(*this, &driver.logs_service, cq.get());
-      new MetricsServiceCall(*this, &driver.metrics_service, cq.get());
+      new TraceServiceCall(*this, driver.trace_service.get(), cq.get());
+      new LogsServiceCall(*this, driver.logs_service.get(), cq.get());
+      new MetricsServiceCall(*this, driver.metrics_service.get(), cq.get());
     }
 
   void *tag;

modules/grpc/otel/otel-source.hpp

@@ -57,9 +57,9 @@ class SourceDriver
   void add_extra_channel_arg(std::string name, std::string value);
   GrpcServerCredentialsBuilderW *get_credentials_builder_wrapper();
 
-  TraceService::AsyncService trace_service;
-  LogsService::AsyncService logs_service;
-  MetricsService::AsyncService metrics_service;
+  std::unique_ptr<TraceService::AsyncService> trace_service;
+  std::unique_ptr<LogsService::AsyncService> logs_service;
+  std::unique_ptr<MetricsService::AsyncService> metrics_service;
 
 private:
   friend SourceWorker;

news/bugfix-4910.md

@@ -0,0 +1 @@
+`opentelemetry()`: fix crash when an invalid configuration needs to be reverted