Moved runtime options to a dedicated structure.

Author: marcalff

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h

@@ -8,6 +8,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/trace/exporter.h"
@@ -36,6 +37,12 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t
    */
   explicit OtlpHttpExporter(const OtlpHttpExporterOptions &options);
 
+  /**
+   * Create an OtlpHttpExporter using the given options.
+   */
+  OtlpHttpExporter(const OtlpHttpExporterOptions &options,
+                   const OtlpHttpExporterRuntimeOptions &runtime_options);
+
   /**
    * Create a span recordable.
    * @return a newly initialized Recordable object
@@ -69,7 +76,9 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t
 
 private:
   // The configuration options associated with this exporter.
-  const OtlpHttpExporterOptions options_;
+  OtlpHttpExporterOptions options_;
+  // The runtime options associated with this exporter.
+  OtlpHttpExporterRuntimeOptions runtime_options_;
 
   // Object that stores the HTTP sessions that have been created
   std::unique_ptr<OtlpHttpClient> http_client_;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h

@@ -6,6 +6,7 @@
 #include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 #include "opentelemetry/version.h"
 
@@ -31,6 +32,13 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporterFactory
    */
   static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
       const OtlpHttpExporterOptions &options);
+
+  /**
+   * Create an OtlpHttpExporter using the given options.
+   */
+  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
+      const OtlpHttpExporterOptions &options,
+      const OtlpHttpExporterRuntimeOptions &runtime_options);
 };
 
 }  // namespace otlp

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h

@@ -4,12 +4,10 @@
 #pragma once
 
 #include <chrono>
-#include <memory>
 #include <string>
 
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -103,9 +101,6 @@ struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
 
   /** Compression type. */
   std::string compression;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace otlp

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h

@@ -0,0 +1,31 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace exporter
+{
+namespace otlp
+{
+
+/**
+ * Struct to hold OTLP HTTP traces exporter runtime options.
+ */
+struct OPENTELEMETRY_EXPORT OtlpHttpExporterRuntimeOptions
+{
+  OtlpHttpExporterRuntimeOptions()  = default;
+  ~OtlpHttpExporterRuntimeOptions() = default;
+
+  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
+};
+
+}  // namespace otlp
+}  // namespace exporter
+OPENTELEMETRY_END_NAMESPACE

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h

@@ -8,6 +8,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/logs/exporter.h"
@@ -37,6 +38,14 @@ class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogReco
    */
   OtlpHttpLogRecordExporter(const OtlpHttpLogRecordExporterOptions &options);
 
+  /**
+   * Create an OtlpHttpLogRecordExporter with user specified options.
+   * @param options An object containing the user's configuration options.
+   * @param runtime_options An object containing the user's runtime options.
+   */
+  OtlpHttpLogRecordExporter(const OtlpHttpLogRecordExporterOptions &options,
+                            const OtlpHttpLogRecordExporterRuntimeOptions &runtime_options);
+
   /**
    * Creates a recordable that stores the data in a JSON object
    */
@@ -68,7 +77,9 @@ class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogReco
 
 private:
   // Configuration options for the exporter
-  const OtlpHttpLogRecordExporterOptions options_;
+  OtlpHttpLogRecordExporterOptions options_;
+  // Runtime options for the exporter
+  OtlpHttpLogRecordExporterRuntimeOptions runtime_options_;
 
   // Object that stores the HTTP sessions that have been created
   std::unique_ptr<OtlpHttpClient> http_client_;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h

@@ -6,6 +6,7 @@
 #include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
 #include "opentelemetry/sdk/logs/exporter.h"
 #include "opentelemetry/version.h"
 
@@ -31,6 +32,13 @@ class OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterFactory
    */
   static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
       const OtlpHttpLogRecordExporterOptions &options);
+
+  /**
+   * Create a OtlpHttpLogRecordExporter.
+   */
+  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
+      const OtlpHttpLogRecordExporterOptions &options,
+      const OtlpHttpLogRecordExporterRuntimeOptions &runtime_options);
 };
 
 }  // namespace otlp

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h

@@ -4,12 +4,10 @@
 #pragma once
 
 #include <chrono>
-#include <memory>
 #include <string>
 
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -103,9 +101,6 @@ struct OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterOptions
 
   /** Compression type. */
   std::string compression;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace otlp

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h

@@ -0,0 +1,31 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+#include "opentelemetry/sdk/common/thread_instrumentation.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace exporter
+{
+namespace otlp
+{
+
+/**
+ * Struct to hold OTLP HTTP log record exporter runtime options.
+ */
+struct OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterRuntimeOptions
+{
+  OtlpHttpLogRecordExporterRuntimeOptions()  = default;
+  ~OtlpHttpLogRecordExporterRuntimeOptions() = default;
+
+  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
+      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
+};
+
+}  // namespace otlp
+}  // namespace exporter
+OPENTELEMETRY_END_NAMESPACE

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h

@@ -8,6 +8,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
 #include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
@@ -36,6 +37,14 @@ class OtlpHttpMetricExporter final : public opentelemetry::sdk::metrics::PushMet
    */
   OtlpHttpMetricExporter(const OtlpHttpMetricExporterOptions &options);
 
+  /**
+   * Create an OtlpHttpMetricExporter with user specified options.
+   * @param options An object containing the user's configuration options.
+   * @param runtime_options An object containing the user's runtime options.
+   */
+  OtlpHttpMetricExporter(const OtlpHttpMetricExporterOptions &options,
+                         const OtlpHttpMetricExporterRuntimeOptions &runtime_options);
+
   /**
    * Get the AggregationTemporality for exporter
    *
@@ -58,7 +67,9 @@ class OtlpHttpMetricExporter final : public opentelemetry::sdk::metrics::PushMet
 
 private:
   // Configuration options for the exporter
-  const OtlpHttpMetricExporterOptions options_;
+  OtlpHttpMetricExporterOptions options_;
+  // Runtime options for the exporter
+  OtlpHttpMetricExporterRuntimeOptions runtime_options_;
 
   // Aggregation Temporality Selector
   const sdk::metrics::AggregationTemporalitySelector aggregation_temporality_selector_;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h

@@ -6,6 +6,7 @@
 #include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/version.h"
 
@@ -31,6 +32,13 @@ class OPENTELEMETRY_EXPORT OtlpHttpMetricExporterFactory
    */
   static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
       const OtlpHttpMetricExporterOptions &options);
+
+  /**
+   * Create a OtlpHttpMetricExporter.
+   */
+  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
+      const OtlpHttpMetricExporterOptions &options,
+      const OtlpHttpMetricExporterRuntimeOptions &runtime_options);
 };
 
 }  // namespace otlp