Code review comments, registry.

marcalff · marcalff · commit ff04475f6d20 · 2025-07-15T23:27:24.000+02:00
diff --git a/.github/workflows/clang-tidy.yaml b/.github/workflows/clang-tidy.yaml
@@ -17,9 +17,9 @@ jobs:
       matrix:
         include:
           - cmake_options: all-options-abiv1-preview
-            warning_limit: 61
+            warning_limit: 66
           - cmake_options: all-options-abiv2-preview
-            warning_limit: 61
+            warning_limit: 66
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
diff --git a/examples/yaml/custom_log_record_exporter_builder.cc b/examples/yaml/custom_log_record_exporter_builder.cc
@@ -22,9 +22,9 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CustomLogRecordExpo
   return sdk;
 }
 
-static CustomLogRecordExporterBuilder singleton;
-
 void CustomLogRecordExporterBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionLogRecordExporterBuilder("my_custom_log_record_exporter", &singleton);
+  auto builder = std::make_unique<CustomLogRecordExporterBuilder>();
+  registry->AddExtensionLogRecordExporterBuilder("my_custom_log_record_exporter",
+                                                 std::move(builder));
 }
diff --git a/examples/yaml/custom_log_record_processor_builder.cc b/examples/yaml/custom_log_record_processor_builder.cc
@@ -23,10 +23,10 @@ CustomLogRecordProcessorBuilder::Build(
   return sdk;
 }
 
-static CustomLogRecordProcessorBuilder singleton;
-
 void CustomLogRecordProcessorBuilder::Register(
     opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionLogRecordProcessorBuilder("my_custom_log_record_processor", &singleton);
+  auto builder = std::make_unique<CustomLogRecordProcessorBuilder>();
+  registry->AddExtensionLogRecordProcessorBuilder("my_custom_log_record_processor",
+                                                  std::move(builder));
 }
diff --git a/examples/yaml/custom_pull_metric_exporter_builder.cc b/examples/yaml/custom_pull_metric_exporter_builder.cc
@@ -22,10 +22,10 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> CustomPullMetricExpor
   return sdk;
 }
 
-static CustomPullMetricExporterBuilder singleton;
-
 void CustomPullMetricExporterBuilder::Register(
     opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionPullMetricExporterBuilder("my_custom_pull_metric_exporter", &singleton);
+  auto builder = std::make_unique<CustomPullMetricExporterBuilder>();
+  registry->AddExtensionPullMetricExporterBuilder("my_custom_pull_metric_exporter",
+                                                  std::move(builder));
 }
diff --git a/examples/yaml/custom_push_metric_exporter_builder.cc b/examples/yaml/custom_push_metric_exporter_builder.cc
@@ -23,10 +23,10 @@ CustomPushMetricExporterBuilder::Build(
   return sdk;
 }
 
-static CustomPushMetricExporterBuilder singleton;
-
 void CustomPushMetricExporterBuilder::Register(
     opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionPushMetricExporterBuilder("my_custom_push_metric_exporter", &singleton);
+  auto builder = std::make_unique<CustomPushMetricExporterBuilder>();
+  registry->AddExtensionPushMetricExporterBuilder("my_custom_push_metric_exporter",
+                                                  std::move(builder));
 }
diff --git a/examples/yaml/custom_sampler_builder.cc b/examples/yaml/custom_sampler_builder.cc
@@ -20,9 +20,8 @@ std::unique_ptr<opentelemetry::sdk::trace::Sampler> CustomSamplerBuilder::Build(
   return sdk;
 }
 
-static CustomSamplerBuilder singleton;
-
 void CustomSamplerBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionSamplerBuilder("my_custom_sampler", &singleton);
+  auto builder = std::make_unique<CustomSamplerBuilder>();
+  registry->AddExtensionSamplerBuilder("my_custom_sampler", std::move(builder));
 }
diff --git a/examples/yaml/custom_span_exporter_builder.cc b/examples/yaml/custom_span_exporter_builder.cc
@@ -22,9 +22,8 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CustomSpanExporterBuild
   return sdk;
 }
 
-static CustomSpanExporterBuilder singleton;
-
 void CustomSpanExporterBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionSpanExporterBuilder("my_custom_span_exporter", &singleton);
+  auto builder = std::make_unique<CustomSpanExporterBuilder>();
+  registry->AddExtensionSpanExporterBuilder("my_custom_span_exporter", std::move(builder));
 }
diff --git a/examples/yaml/custom_span_processor_builder.cc b/examples/yaml/custom_span_processor_builder.cc
@@ -22,9 +22,8 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor> CustomSpanProcessorBui
   return sdk;
 }
 
-static CustomSpanProcessorBuilder singleton;
-
 void CustomSpanProcessorBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->AddExtensionSpanProcessorBuilder("my_custom_span_processor", &singleton);
+  auto builder = std::make_unique<CustomSpanProcessorBuilder>();
+  registry->AddExtensionSpanProcessorBuilder("my_custom_span_processor", std::move(builder));
 }
diff --git a/exporters/ostream/src/console_log_record_builder.cc b/exporters/ostream/src/console_log_record_builder.cc
@@ -11,11 +11,10 @@ namespace exporter
 namespace logs
 {
 
-static ConsoleLogRecordBuilder singleton;
-
 void ConsoleLogRecordBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetConsoleLogRecordBuilder(&singleton);
+  auto builder = std::make_unique<ConsoleLogRecordBuilder>();
+  registry->SetConsoleLogRecordBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> ConsoleLogRecordBuilder::Build(
diff --git a/exporters/ostream/src/console_push_metric_builder.cc b/exporters/ostream/src/console_push_metric_builder.cc
@@ -11,11 +11,10 @@ namespace exporter
 namespace metrics
 {
 
-static ConsolePushMetricBuilder singleton;
-
 void ConsolePushMetricBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetConsolePushMetricExporterBuilder(&singleton);
+  auto builder = std::make_unique<ConsolePushMetricBuilder>();
+  registry->SetConsolePushMetricExporterBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> ConsolePushMetricBuilder::Build(
diff --git a/exporters/ostream/src/console_span_builder.cc b/exporters/ostream/src/console_span_builder.cc
@@ -11,11 +11,10 @@ namespace exporter
 namespace trace
 {
 
-static ConsoleSpanBuilder singleton;
-
 void ConsoleSpanBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetConsoleSpanBuilder(&singleton);
+  auto builder = std::make_unique<ConsoleSpanBuilder>();
+  registry->SetConsoleSpanBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> ConsoleSpanBuilder::Build(
diff --git a/exporters/otlp/src/otlp_file_log_record_builder.cc b/exporters/otlp/src/otlp_file_log_record_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpFileLogRecordBuilder singleton;
-
 void OtlpFileLogRecordBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpFileLogRecordBuilder(&singleton);
+  auto builder = std::make_unique<OtlpFileLogRecordBuilder>();
+  registry->SetOtlpFileLogRecordBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpFileLogRecordBuilder::Build(
diff --git a/exporters/otlp/src/otlp_file_push_metric_builder.cc b/exporters/otlp/src/otlp_file_push_metric_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpFilePushMetricBuilder singleton;
-
 void OtlpFilePushMetricBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpFilePushMetricExporterBuilder(&singleton);
+  auto builder = std::make_unique<OtlpFilePushMetricBuilder>();
+  registry->SetOtlpFilePushMetricExporterBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpFilePushMetricBuilder::Build(
diff --git a/exporters/otlp/src/otlp_file_span_builder.cc b/exporters/otlp/src/otlp_file_span_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpFileSpanBuilder singleton;
-
 void OtlpFileSpanBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpFileSpanBuilder(&singleton);
+  auto builder = std::make_unique<OtlpFileSpanBuilder>();
+  registry->SetOtlpFileSpanBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpFileSpanBuilder::Build(
diff --git a/exporters/otlp/src/otlp_grpc_log_record_builder.cc b/exporters/otlp/src/otlp_grpc_log_record_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpGrpcLogRecordBuilder singleton;
-
 void OtlpGrpcLogRecordBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpGrpcLogRecordBuilder(&singleton);
+  auto builder = std::make_unique<OtlpGrpcLogRecordBuilder>();
+  registry->SetOtlpGrpcLogRecordBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpGrpcLogRecordBuilder::Build(
diff --git a/exporters/otlp/src/otlp_grpc_push_metric_builder.cc b/exporters/otlp/src/otlp_grpc_push_metric_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpGrpcPushMetricBuilder singleton;
-
 void OtlpGrpcPushMetricBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpGrpcPushMetricExporterBuilder(&singleton);
+  auto builder = std::make_unique<OtlpGrpcPushMetricBuilder>();
+  registry->SetOtlpGrpcPushMetricExporterBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpGrpcPushMetricBuilder::Build(
diff --git a/exporters/otlp/src/otlp_grpc_span_builder.cc b/exporters/otlp/src/otlp_grpc_span_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpGrpcSpanBuilder singleton;
-
 void OtlpGrpcSpanBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpGrpcSpanBuilder(&singleton);
+  auto builder = std::make_unique<OtlpGrpcSpanBuilder>();
+  registry->SetOtlpGrpcSpanBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcSpanBuilder::Build(
diff --git a/exporters/otlp/src/otlp_http_log_record_builder.cc b/exporters/otlp/src/otlp_http_log_record_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpHttpLogRecordBuilder singleton;
-
 void OtlpHttpLogRecordBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpHttpLogRecordBuilder(&singleton);
+  auto builder = std::make_unique<OtlpHttpLogRecordBuilder>();
+  registry->SetOtlpHttpLogRecordBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBuilder::Build(
diff --git a/exporters/otlp/src/otlp_http_push_metric_builder.cc b/exporters/otlp/src/otlp_http_push_metric_builder.cc
@@ -12,11 +12,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpHttpPushMetricBuilder singleton;
-
 void OtlpHttpPushMetricBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpHttpPushMetricExporterBuilder(&singleton);
+  auto builder = std::make_unique<OtlpHttpPushMetricBuilder>();
+  registry->SetOtlpHttpPushMetricExporterBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMetricBuilder::Build(
diff --git a/exporters/otlp/src/otlp_http_span_builder.cc b/exporters/otlp/src/otlp_http_span_builder.cc
@@ -19,11 +19,10 @@ namespace exporter
 namespace otlp
 {
 
-static OtlpHttpSpanBuilder singleton;
-
 void OtlpHttpSpanBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetOtlpHttpSpanBuilder(&singleton);
+  auto builder = std::make_unique<OtlpHttpSpanBuilder>();
+  registry->SetOtlpHttpSpanBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Build(
diff --git a/exporters/prometheus/src/prometheus_pull_builder.cc b/exporters/prometheus/src/prometheus_pull_builder.cc
@@ -17,11 +17,10 @@ namespace exporter
 namespace metrics
 {
 
-static PrometheusPullBuilder singleton;
-
 void PrometheusPullBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetPrometheusPullMetricExporterBuilder(&singleton);
+  auto builder = std::make_unique<PrometheusPullBuilder>();
+  registry->SetPrometheusPullMetricExporterBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> PrometheusPullBuilder::Build(
diff --git a/exporters/zipkin/src/zipkin_builder.cc b/exporters/zipkin/src/zipkin_builder.cc
@@ -22,7 +22,8 @@ static ZipkinBuilder singleton;
 
 void ZipkinBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
 {
-  registry->SetZipkinSpanBuilder(&singleton);
+  auto builder = std::make_unique<ZipkinBuilder>();
+  registry->SetZipkinSpanBuilder(std::move(builder));
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> ZipkinBuilder::Build(
diff --git a/sdk/include/opentelemetry/sdk/configuration/registry.h b/sdk/include/opentelemetry/sdk/configuration/registry.h
diff --git a/sdk/src/configuration/registry.cc b/sdk/src/configuration/registry.cc
diff --git a/sdk/src/configuration/sdk_builder.cc b/sdk/src/configuration/sdk_builder.cc

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CustomLogRecordExpo`
`22`	`22`	`return sdk;`
`23`	`23`	`}`
`24`	`24`
`25`		`-static CustomLogRecordExporterBuilder singleton;`
`26`		`-`
`27`	`25`	`void CustomLogRecordExporterBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)`
`28`	`26`	`{`
`29`		`- registry->AddExtensionLogRecordExporterBuilder("my_custom_log_record_exporter", &singleton);`
	`27`	`+ auto builder = std::make_unique<CustomLogRecordExporterBuilder>();`
	`28`	`+ registry->AddExtensionLogRecordExporterBuilder("my_custom_log_record_exporter",`
	`29`	`+ std::move(builder));`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ CustomLogRecordProcessorBuilder::Build(`
`23`	`23`	`return sdk;`
`24`	`24`	`}`
`25`	`25`
`26`		`-static CustomLogRecordProcessorBuilder singleton;`
`27`		`-`
`28`	`26`	`void CustomLogRecordProcessorBuilder::Register(`
`29`	`27`	`opentelemetry::sdk::configuration::Registry *registry)`
`30`	`28`	`{`
`31`		`- registry->AddExtensionLogRecordProcessorBuilder("my_custom_log_record_processor", &singleton);`
	`29`	`+ auto builder = std::make_unique<CustomLogRecordProcessorBuilder>();`
	`30`	`+ registry->AddExtensionLogRecordProcessorBuilder("my_custom_log_record_processor",`
	`31`	`+ std::move(builder));`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> CustomPullMetricExpor`
`22`	`22`	`return sdk;`
`23`	`23`	`}`
`24`	`24`
`25`		`-static CustomPullMetricExporterBuilder singleton;`
`26`		`-`
`27`	`25`	`void CustomPullMetricExporterBuilder::Register(`
`28`	`26`	`opentelemetry::sdk::configuration::Registry *registry)`
`29`	`27`	`{`
`30`		`- registry->AddExtensionPullMetricExporterBuilder("my_custom_pull_metric_exporter", &singleton);`
	`28`	`+ auto builder = std::make_unique<CustomPullMetricExporterBuilder>();`
	`29`	`+ registry->AddExtensionPullMetricExporterBuilder("my_custom_pull_metric_exporter",`
	`30`	`+ std::move(builder));`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ CustomPushMetricExporterBuilder::Build(`
`23`	`23`	`return sdk;`
`24`	`24`	`}`
`25`	`25`
`26`		`-static CustomPushMetricExporterBuilder singleton;`
`27`		`-`
`28`	`26`	`void CustomPushMetricExporterBuilder::Register(`
`29`	`27`	`opentelemetry::sdk::configuration::Registry *registry)`
`30`	`28`	`{`
`31`		`- registry->AddExtensionPushMetricExporterBuilder("my_custom_push_metric_exporter", &singleton);`
	`29`	`+ auto builder = std::make_unique<CustomPushMetricExporterBuilder>();`
	`30`	`+ registry->AddExtensionPushMetricExporterBuilder("my_custom_push_metric_exporter",`
	`31`	`+ std::move(builder));`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,8 @@ std::unique_ptr<opentelemetry::sdk::trace::Sampler> CustomSamplerBuilder::Build(`
`20`	`20`	`return sdk;`
`21`	`21`	`}`
`22`	`22`
`23`		`-static CustomSamplerBuilder singleton;`
`24`		`-`
`25`	`23`	`void CustomSamplerBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)`
`26`	`24`	`{`
`27`		`- registry->AddExtensionSamplerBuilder("my_custom_sampler", &singleton);`
	`25`	`+ auto builder = std::make_unique<CustomSamplerBuilder>();`
	`26`	`+ registry->AddExtensionSamplerBuilder("my_custom_sampler", std::move(builder));`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CustomSpanExporterBuild`
`22`	`22`	`return sdk;`
`23`	`23`	`}`
`24`	`24`
`25`		`-static CustomSpanExporterBuilder singleton;`
`26`		`-`
`27`	`25`	`void CustomSpanExporterBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)`
`28`	`26`	`{`
`29`		`- registry->AddExtensionSpanExporterBuilder("my_custom_span_exporter", &singleton);`
	`27`	`+ auto builder = std::make_unique<CustomSpanExporterBuilder>();`
	`28`	`+ registry->AddExtensionSpanExporterBuilder("my_custom_span_exporter", std::move(builder));`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,10 @@ namespace exporter`
`11`	`11`	`namespace logs`
`12`	`12`	`{`
`13`	`13`
`14`		`-static ConsoleLogRecordBuilder singleton;`
`15`		`-`
`16`	`14`	`void ConsoleLogRecordBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)`
`17`	`15`	`{`
`18`		`- registry->SetConsoleLogRecordBuilder(&singleton);`
	`16`	`+ auto builder = std::make_unique<ConsoleLogRecordBuilder>();`
	`17`	`+ registry->SetConsoleLogRecordBuilder(std::move(builder));`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> ConsoleLogRecordBuilder::Build(`