Refresh code from PR #2518, to fix review comments (clang-tidy)

marcalff · marcalff · commit 86dc419e1834 · 2025-06-27T17:20:21.000+02:00
diff --git a/sdk/include/opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h
@@ -19,9 +19,6 @@ namespace configuration
 class ConsolePushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
-  ConsolePushMetricExporterConfiguration()           = default;
-  ~ConsolePushMetricExporterConfiguration() override = default;
-
   void Accept(PushMetricExporterConfigurationVisitor *visitor) const override
   {
     visitor->VisitConsole(this);
diff --git a/sdk/include/opentelemetry/sdk/configuration/metric_producer_configuration.h b/sdk/include/opentelemetry/sdk/configuration/metric_producer_configuration.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -19,8 +17,12 @@ class MetricProducerConfigurationVisitor;
 class MetricProducerConfiguration
 {
 public:
-  MetricProducerConfiguration()          = default;
-  virtual ~MetricProducerConfiguration() = default;
+  MetricProducerConfiguration()                                                    = default;
+  MetricProducerConfiguration(MetricProducerConfiguration &&)                      = default;
+  MetricProducerConfiguration(const MetricProducerConfiguration &)                 = default;
+  MetricProducerConfiguration &operator=(MetricProducerConfiguration &&)           = default;
+  MetricProducerConfiguration &operator=(const MetricProducerConfiguration &other) = default;
+  virtual ~MetricProducerConfiguration()                                           = default;
 
   virtual void Accept(MetricProducerConfigurationVisitor *visitor) const = 0;
 };
diff --git a/sdk/include/opentelemetry/sdk/configuration/metric_reader_configuration.h b/sdk/include/opentelemetry/sdk/configuration/metric_reader_configuration.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -19,8 +17,12 @@ class MetricReaderConfigurationVisitor;
 class MetricReaderConfiguration
 {
 public:
-  MetricReaderConfiguration()          = default;
-  virtual ~MetricReaderConfiguration() = default;
+  MetricReaderConfiguration()                                                  = default;
+  MetricReaderConfiguration(MetricReaderConfiguration &&)                      = default;
+  MetricReaderConfiguration(const MetricReaderConfiguration &)                 = default;
+  MetricReaderConfiguration &operator=(MetricReaderConfiguration &&)           = default;
+  MetricReaderConfiguration &operator=(const MetricReaderConfiguration &other) = default;
+  virtual ~MetricReaderConfiguration()                                         = default;
 
   virtual void Accept(MetricReaderConfigurationVisitor *visitor) const = 0;
 };
diff --git a/sdk/include/opentelemetry/sdk/configuration/metric_reader_configuration_visitor.h b/sdk/include/opentelemetry/sdk/configuration/metric_reader_configuration_visitor.h
@@ -17,7 +17,12 @@ class PullMetricReaderConfiguration;
 class MetricReaderConfigurationVisitor
 {
 public:
-  MetricReaderConfigurationVisitor()          = default;
+  MetricReaderConfigurationVisitor()                                               = default;
+  MetricReaderConfigurationVisitor(MetricReaderConfigurationVisitor &&)            = default;
+  MetricReaderConfigurationVisitor(const MetricReaderConfigurationVisitor &)       = default;
+  MetricReaderConfigurationVisitor &operator=(MetricReaderConfigurationVisitor &&) = default;
+  MetricReaderConfigurationVisitor &operator=(const MetricReaderConfigurationVisitor &other) =
+      default;
   virtual ~MetricReaderConfigurationVisitor() = default;
 
   virtual void VisitPeriodic(const PeriodicMetricReaderConfiguration *model) = 0;
diff --git a/sdk/include/opentelemetry/sdk/configuration/otlp_file_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/otlp_file_push_metric_exporter_configuration.h
@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include "opentelemetry/sdk/configuration/exporter_default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h"
@@ -22,9 +22,6 @@ namespace configuration
 class OtlpFilePushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
-  OtlpFilePushMetricExporterConfiguration()           = default;
-  ~OtlpFilePushMetricExporterConfiguration() override = default;
-
   void Accept(PushMetricExporterConfigurationVisitor *visitor) const override
   {
     visitor->VisitOtlpFile(this);
diff --git a/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include "opentelemetry/sdk/configuration/exporter_default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h"
@@ -23,9 +23,6 @@ namespace configuration
 class OtlpGrpcPushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
-  OtlpGrpcPushMetricExporterConfiguration()           = default;
-  ~OtlpGrpcPushMetricExporterConfiguration() override = default;
-
   void Accept(PushMetricExporterConfigurationVisitor *visitor) const override
   {
     visitor->VisitOtlpGrpc(this);
@@ -38,7 +35,7 @@ class OtlpGrpcPushMetricExporterConfiguration : public PushMetricExporterConfigu
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
-  size_t timeout{0};
+  std::size_t timeout{0};
   bool insecure{false};
   std::string temporality_preference;  // FIXME: enum
   enum_default_histogram_aggregation default_histogram_aggregation{explicit_bucket_histogram};
diff --git a/sdk/include/opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include "opentelemetry/sdk/configuration/exporter_default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
@@ -24,9 +24,6 @@ namespace configuration
 class OtlpHttpPushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
-  OtlpHttpPushMetricExporterConfiguration()           = default;
-  ~OtlpHttpPushMetricExporterConfiguration() override = default;
-
   void Accept(PushMetricExporterConfigurationVisitor *visitor) const override
   {
     visitor->VisitOtlpHttp(this);
@@ -39,7 +36,7 @@ class OtlpHttpPushMetricExporterConfiguration : public PushMetricExporterConfigu
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
-  size_t timeout{0};
+  std::size_t timeout{0};
   enum_otlp_http_encoding encoding{protobuf};
   std::string temporality_preference;  // FIXME: enum
   enum_default_histogram_aggregation default_histogram_aggregation{explicit_bucket_histogram};
diff --git a/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h b/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h
@@ -23,16 +23,13 @@ namespace configuration
 class PeriodicMetricReaderConfiguration : public MetricReaderConfiguration
 {
 public:
-  PeriodicMetricReaderConfiguration()           = default;
-  ~PeriodicMetricReaderConfiguration() override = default;
-
   void Accept(MetricReaderConfigurationVisitor *visitor) const override
   {
     visitor->VisitPeriodic(this);
   }
 
-  size_t interval{0};
-  size_t timeout{0};
+  std::size_t interval{0};
+  std::size_t timeout{0};
   std::unique_ptr<PushMetricExporterConfiguration> exporter;
   std::vector<std::unique_ptr<MetricProducerConfiguration>> producers;
 };
diff --git a/sdk/include/opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h
@@ -21,16 +21,13 @@ namespace configuration
 class PrometheusPullMetricExporterConfiguration : public PullMetricExporterConfiguration
 {
 public:
-  PrometheusPullMetricExporterConfiguration()           = default;
-  ~PrometheusPullMetricExporterConfiguration() override = default;
-
   void Accept(PullMetricExporterConfigurationVisitor *visitor) const override
   {
     visitor->VisitPrometheus(this);
   }
 
   std::string host;
-  size_t port{0};
+  std::size_t port{0};
   bool without_units{false};
   bool without_type_suffix{false};
   bool without_scope_info{false};
diff --git a/sdk/include/opentelemetry/sdk/configuration/pull_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/pull_metric_exporter_configuration.h
@@ -15,7 +15,12 @@ class PullMetricExporterConfigurationVisitor;
 class PullMetricExporterConfiguration
 {
 public:
-  PullMetricExporterConfiguration()          = default;
+  PullMetricExporterConfiguration()                                              = default;
+  PullMetricExporterConfiguration(PullMetricExporterConfiguration &&)            = default;
+  PullMetricExporterConfiguration(const PullMetricExporterConfiguration &)       = default;
+  PullMetricExporterConfiguration &operator=(PullMetricExporterConfiguration &&) = default;
+  PullMetricExporterConfiguration &operator=(const PullMetricExporterConfiguration &other) =
+      default;
   virtual ~PullMetricExporterConfiguration() = default;
 
   virtual void Accept(PullMetricExporterConfigurationVisitor *visitor) const = 0;
diff --git a/sdk/include/opentelemetry/sdk/configuration/pull_metric_exporter_configuration_visitor.h b/sdk/include/opentelemetry/sdk/configuration/pull_metric_exporter_configuration_visitor.h
@@ -17,8 +17,14 @@ class ExtensionPullMetricExporterConfiguration;
 class PullMetricExporterConfigurationVisitor
 {
 public:
-  PullMetricExporterConfigurationVisitor()          = default;
-  virtual ~PullMetricExporterConfigurationVisitor() = default;
+  PullMetricExporterConfigurationVisitor()                                               = default;
+  PullMetricExporterConfigurationVisitor(PullMetricExporterConfigurationVisitor &&)      = default;
+  PullMetricExporterConfigurationVisitor(const PullMetricExporterConfigurationVisitor &) = default;
+  PullMetricExporterConfigurationVisitor &operator=(PullMetricExporterConfigurationVisitor &&) =
+      default;
+  PullMetricExporterConfigurationVisitor &operator=(
+      const PullMetricExporterConfigurationVisitor &other) = default;
+  virtual ~PullMetricExporterConfigurationVisitor()        = default;
 
   virtual void VisitPrometheus(const PrometheusPullMetricExporterConfiguration *model) = 0;
   virtual void VisitExtension(const ExtensionPullMetricExporterConfiguration *model)   = 0;
diff --git a/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h b/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h
@@ -23,9 +23,6 @@ namespace configuration
 class PullMetricReaderConfiguration : public MetricReaderConfiguration
 {
 public:
-  PullMetricReaderConfiguration()           = default;
-  ~PullMetricReaderConfiguration() override = default;
-
   void Accept(MetricReaderConfigurationVisitor *visitor) const override
   {
     visitor->VisitPull(this);
diff --git a/sdk/include/opentelemetry/sdk/configuration/push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/push_metric_exporter_configuration.h
@@ -17,7 +17,12 @@ class PushMetricExporterConfigurationVisitor;
 class PushMetricExporterConfiguration
 {
 public:
-  PushMetricExporterConfiguration()          = default;
+  PushMetricExporterConfiguration()                                              = default;
+  PushMetricExporterConfiguration(PushMetricExporterConfiguration &&)            = default;
+  PushMetricExporterConfiguration(const PushMetricExporterConfiguration &)       = default;
+  PushMetricExporterConfiguration &operator=(PushMetricExporterConfiguration &&) = default;
+  PushMetricExporterConfiguration &operator=(const PushMetricExporterConfiguration &other) =
+      default;
   virtual ~PushMetricExporterConfiguration() = default;
 
   virtual void Accept(PushMetricExporterConfigurationVisitor *visitor) const = 0;
diff --git a/sdk/include/opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h b/sdk/include/opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h
@@ -20,8 +20,14 @@ class ExtensionPushMetricExporterConfiguration;
 class PushMetricExporterConfigurationVisitor
 {
 public:
-  PushMetricExporterConfigurationVisitor()          = default;
-  virtual ~PushMetricExporterConfigurationVisitor() = default;
+  PushMetricExporterConfigurationVisitor()                                               = default;
+  PushMetricExporterConfigurationVisitor(PushMetricExporterConfigurationVisitor &&)      = default;
+  PushMetricExporterConfigurationVisitor(const PushMetricExporterConfigurationVisitor &) = default;
+  PushMetricExporterConfigurationVisitor &operator=(PushMetricExporterConfigurationVisitor &&) =
+      default;
+  PushMetricExporterConfigurationVisitor &operator=(
+      const PushMetricExporterConfigurationVisitor &other) = default;
+  virtual ~PushMetricExporterConfigurationVisitor()        = default;
 
   virtual void VisitOtlpHttp(const OtlpHttpPushMetricExporterConfiguration *model)   = 0;
   virtual void VisitOtlpGrpc(const OtlpGrpcPushMetricExporterConfiguration *model)   = 0;

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ namespace configuration`
`19`	`19`	`class ConsolePushMetricExporterConfiguration : public PushMetricExporterConfiguration`
`20`	`20`	`{`
`21`	`21`	`public:`
`22`		`- ConsolePushMetricExporterConfiguration() = default;`
`23`		`- ~ConsolePushMetricExporterConfiguration() override = default;`
`24`		`-`
`25`	`22`	`void Accept(PushMetricExporterConfigurationVisitor *visitor) const override`
`26`	`23`	`{`
`27`	`24`	`visitor->VisitConsole(this);`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,13 @@ namespace configuration`
`23`	`23`	`class PeriodicMetricReaderConfiguration : public MetricReaderConfiguration`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`		`- PeriodicMetricReaderConfiguration() = default;`
`27`		`- ~PeriodicMetricReaderConfiguration() override = default;`
`28`		`-`
`29`	`26`	`void Accept(MetricReaderConfigurationVisitor *visitor) const override`
`30`	`27`	`{`
`31`	`28`	`visitor->VisitPeriodic(this);`
`32`	`29`	`}`
`33`	`30`
`34`		`- size_t interval{0};`
`35`		`- size_t timeout{0};`
	`31`	`+ std::size_t interval{0};`
	`32`	`+ std::size_t timeout{0};`
`36`	`33`	`std::unique_ptr<PushMetricExporterConfiguration> exporter;`
`37`	`34`	`std::vector<std::unique_ptr<MetricProducerConfiguration>> producers;`
`38`	`35`	`};`
Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,13 @@ namespace configuration`
`21`	`21`	`class PrometheusPullMetricExporterConfiguration : public PullMetricExporterConfiguration`
`22`	`22`	`{`
`23`	`23`	`public:`
`24`		`- PrometheusPullMetricExporterConfiguration() = default;`
`25`		`- ~PrometheusPullMetricExporterConfiguration() override = default;`
`26`		`-`
`27`	`24`	`void Accept(PullMetricExporterConfigurationVisitor *visitor) const override`
`28`	`25`	`{`
`29`	`26`	`visitor->VisitPrometheus(this);`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`std::string host;`
`33`		`- size_t port{0};`
	`30`	`+ std::size_t port{0};`
`34`	`31`	`bool without_units{false};`
`35`	`32`	`bool without_type_suffix{false};`
`36`	`33`	`bool without_scope_info{false};`