cleanup

marcalff · marcalff · commit 24816a8a0786 · 2024-11-27T17:09:27.000+01:00
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
@@ -85,7 +85,7 @@ struct OtlpHttpClientOptions
   std::string user_agent;
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 
   inline OtlpHttpClientOptions(
       nostd::string_view input_url,
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
@@ -105,7 +105,7 @@ struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
   std::string compression;
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace otlp
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h
@@ -105,7 +105,7 @@ struct OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterOptions
   std::string compression;
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace otlp
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
@@ -108,7 +108,7 @@ struct OPENTELEMETRY_EXPORT OtlpHttpMetricExporterOptions
   std::string compression;
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace otlp
diff --git a/exporters/otlp/src/otlp_http_exporter.cc b/exporters/otlp/src/otlp_http_exporter.cc
@@ -78,6 +78,7 @@ OtlpHttpExporter::OtlpHttpExporter(std::unique_ptr<OtlpHttpClient> http_client)
   options.console_debug            = http_client_->GetOptions().console_debug;
   options.timeout                  = http_client_->GetOptions().timeout;
   options.http_headers             = http_client_->GetOptions().http_headers;
+  options.thread_instrumentation   = http_client_->GetOptions().thread_instrumentation;
 #ifdef ENABLE_ASYNC_EXPORT
   options.max_concurrent_requests     = http_client_->GetOptions().max_concurrent_requests;
   options.max_requests_per_connection = http_client_->GetOptions().max_requests_per_connection;
diff --git a/exporters/otlp/src/otlp_http_log_record_exporter.cc b/exporters/otlp/src/otlp_http_log_record_exporter.cc
@@ -75,13 +75,14 @@ OtlpHttpLogRecordExporter::OtlpHttpLogRecordExporter(std::unique_ptr<OtlpHttpCli
 {
   OtlpHttpLogRecordExporterOptions &options =
       const_cast<OtlpHttpLogRecordExporterOptions &>(options_);
-  options.url                = http_client_->GetOptions().url;
-  options.content_type       = http_client_->GetOptions().content_type;
-  options.json_bytes_mapping = http_client_->GetOptions().json_bytes_mapping;
-  options.use_json_name      = http_client_->GetOptions().use_json_name;
-  options.console_debug      = http_client_->GetOptions().console_debug;
-  options.timeout            = http_client_->GetOptions().timeout;
-  options.http_headers       = http_client_->GetOptions().http_headers;
+  options.url                    = http_client_->GetOptions().url;
+  options.content_type           = http_client_->GetOptions().content_type;
+  options.json_bytes_mapping     = http_client_->GetOptions().json_bytes_mapping;
+  options.use_json_name          = http_client_->GetOptions().use_json_name;
+  options.console_debug          = http_client_->GetOptions().console_debug;
+  options.timeout                = http_client_->GetOptions().timeout;
+  options.http_headers           = http_client_->GetOptions().http_headers;
+  options.thread_instrumentation = http_client_->GetOptions().thread_instrumentation;
 #ifdef ENABLE_ASYNC_EXPORT
   options.max_concurrent_requests     = http_client_->GetOptions().max_concurrent_requests;
   options.max_requests_per_connection = http_client_->GetOptions().max_requests_per_connection;
diff --git a/exporters/otlp/src/otlp_http_metric_exporter.cc b/exporters/otlp/src/otlp_http_metric_exporter.cc
@@ -85,6 +85,7 @@ OtlpHttpMetricExporter::OtlpHttpMetricExporter(std::unique_ptr<OtlpHttpClient> h
   options.console_debug                  = http_client_->GetOptions().console_debug;
   options.timeout                        = http_client_->GetOptions().timeout;
   options.http_headers                   = http_client_->GetOptions().http_headers;
+  options.thread_instrumentation         = http_client_->GetOptions().thread_instrumentation;
 #ifdef ENABLE_ASYNC_EXPORT
   options.max_concurrent_requests     = http_client_->GetOptions().max_concurrent_requests;
   options.max_requests_per_connection = http_client_->GetOptions().max_requests_per_connection;
diff --git a/exporters/otlp/test/otlp_http_metric_exporter_test.cc b/exporters/otlp/test/otlp_http_metric_exporter_test.cc
@@ -28,6 +28,7 @@
 #include "opentelemetry/ext/http/client/http_client.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/metrics/data/metric_data.h"
 #include "opentelemetry/sdk/metrics/data/point_data.h"
diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc
@@ -21,6 +21,7 @@
 #include "opentelemetry/ext/http/common/url_parser.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/version.h"
 
 #ifdef ENABLE_OTLP_COMPRESSION_PREVIEW
diff --git a/ext/src/http/client/curl/http_client_factory_curl.cc b/ext/src/http/client/curl/http_client_factory_curl.cc
@@ -6,6 +6,7 @@
 #include "opentelemetry/ext/http/client/curl/http_client_curl.h"
 #include "opentelemetry/ext/http/client/http_client.h"
 #include "opentelemetry/ext/http/client/http_client_factory.h"
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
 
 namespace http_client = opentelemetry::ext::http::client;
 
diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h
@@ -157,8 +157,8 @@ class BatchLogRecordProcessor : public LogRecordProcessor
   std::shared_ptr<SynchronizationData> synchronization_data_;
 
   /* The background worker thread */
-  std::thread worker_thread_;
   std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
+  std::thread worker_thread_;
 };
 
 }  // namespace logs
diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h
@@ -37,7 +37,7 @@ struct BatchLogRecordProcessorOptions
   size_t max_export_batch_size = 512;
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace logs
diff --git a/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h b/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h
@@ -48,17 +48,17 @@ class PeriodicExportingMetricReader : public MetricReader
   void DoBackgroundWork();
   bool CollectAndExportOnce();
 
-  /* The background worker thread */
-  std::thread worker_thread_;
-  std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
-  std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation_;
-
   /* Synchronization primitives */
   std::atomic<bool> is_force_wakeup_background_worker_{false};
   std::atomic<uint64_t> force_flush_pending_sequence_{0};
   std::atomic<uint64_t> force_flush_notified_sequence_{0};
   std::condition_variable cv_, force_flush_cv_;
   std::mutex cv_m_, force_flush_m_;
+
+  /* The background worker thread */
+  std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
+  std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation_;
+  std::thread worker_thread_;
 };
 
 }  // namespace metrics
diff --git a/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h b/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h
@@ -31,9 +31,9 @@ struct PeriodicExportingMetricReaderOptions
   std::chrono::milliseconds export_timeout_millis = std::chrono::milliseconds(kExportTimeOutMillis);
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> periodic_thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
   std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace metrics
diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
@@ -158,9 +158,8 @@ class BatchSpanProcessor : public SpanProcessor
   std::shared_ptr<SynchronizationData> synchronization_data_;
 
   /* The background worker thread */
-  std::thread worker_thread_;
-
   std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
+  std::thread worker_thread_;
 };
 
 }  // namespace trace
diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h
@@ -36,7 +36,7 @@ struct BatchSpanProcessorOptions
   size_t max_export_batch_size = 512;
 
   std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>{};
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace trace
diff --git a/sdk/src/logs/batch_log_record_processor.cc b/sdk/src/logs/batch_log_record_processor.cc
@@ -19,6 +19,7 @@
 #include "opentelemetry/sdk/common/atomic_unique_ptr.h"
 #include "opentelemetry/sdk/common/circular_buffer.h"
 #include "opentelemetry/sdk/common/circular_buffer_range.h"
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/sdk/logs/batch_log_record_processor.h"
 #include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
 #include "opentelemetry/sdk/logs/exporter.h"
@@ -44,9 +45,12 @@ BatchLogRecordProcessor::BatchLogRecordProcessor(
       max_export_batch_size_(max_export_batch_size),
       buffer_(max_queue_size_),
       synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_(&BatchLogRecordProcessor::DoBackgroundWork, this),
-      worker_thread_instrumentation_(nullptr)
-{}
+      worker_thread_instrumentation_(nullptr),
+      worker_thread_()
+{
+  // Make sure the constructor is complete before giving 'this' to a thread.
+  worker_thread_ = std::thread(&BatchLogRecordProcessor::DoBackgroundWork, this);
+}
 
 BatchLogRecordProcessor::BatchLogRecordProcessor(std::unique_ptr<LogRecordExporter> &&exporter,
                                                  const BatchLogRecordProcessorOptions &options)
@@ -56,9 +60,12 @@ BatchLogRecordProcessor::BatchLogRecordProcessor(std::unique_ptr<LogRecordExport
       max_export_batch_size_(options.max_export_batch_size),
       buffer_(options.max_queue_size),
       synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_(&BatchLogRecordProcessor::DoBackgroundWork, this),
-      worker_thread_instrumentation_(options.thread_instrumentation)
-{}
+      worker_thread_instrumentation_(options.thread_instrumentation),
+      worker_thread_()
+{
+  // Make sure the constructor is complete before giving 'this' to a thread.
+  worker_thread_ = std::thread(&BatchLogRecordProcessor::DoBackgroundWork, this);
+}
 
 std::unique_ptr<Recordable> BatchLogRecordProcessor::MakeRecordable() noexcept
 {
diff --git a/sdk/src/metrics/export/periodic_exporting_metric_reader.cc b/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
@@ -14,6 +14,7 @@
 
 #include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc
@@ -20,6 +20,7 @@
 #include "opentelemetry/sdk/common/circular_buffer.h"
 #include "opentelemetry/sdk/common/circular_buffer_range.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/sdk/trace/batch_span_processor.h"
 #include "opentelemetry/sdk/trace/batch_span_processor_options.h"
 #include "opentelemetry/sdk/trace/exporter.h"
@@ -46,9 +47,12 @@ BatchSpanProcessor::BatchSpanProcessor(std::unique_ptr<SpanExporter> &&exporter,
       max_export_batch_size_(options.max_export_batch_size),
       buffer_(max_queue_size_),
       synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_(&BatchSpanProcessor::DoBackgroundWork, this),
-      worker_thread_instrumentation_(options.thread_instrumentation)
-{}
+      worker_thread_instrumentation_(options.thread_instrumentation),
+      worker_thread_()
+{
+  // Make sure the constructor is complete before giving 'this' to a thread.
+  worker_thread_ = std::thread(&BatchSpanProcessor::DoBackgroundWork, this);
+}
 
 std::unique_ptr<Recordable> BatchSpanProcessor::MakeRecordable() noexcept
 {
