WIP

marcalff · marcalff · commit 75e3816671d3 · 2024-11-20T20:36:24.000+01:00
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
@@ -27,7 +27,10 @@ namespace otlp
  */
 struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
 {
+  /** Lookup environment variables. */
   OtlpHttpExporterOptions();
+  /** No defaults. */
+  OtlpHttpExporterOptions(void * /* raw */);
   ~OtlpHttpExporterOptions();
 
   /** The endpoint to export to. */
diff --git a/exporters/otlp/src/otlp_http_exporter_options.cc b/exporters/otlp/src/otlp_http_exporter_options.cc
@@ -47,6 +47,35 @@ OtlpHttpExporterOptions::OtlpHttpExporterOptions()
   compression = GetOtlpDefaultTracesCompression();
 }
 
+OtlpHttpExporterOptions::OtlpHttpExporterOptions(void *)
+    : json_bytes_mapping(JsonBytesMappingKind::kHexId),
+      use_json_name(false),
+      console_debug(false),
+      ssl_insecure_skip_verify(false)
+{
+  url          = "";
+  content_type = HttpRequestContentType::kBinary;
+
+#ifdef ENABLE_ASYNC_EXPORT
+  max_concurrent_requests     = 64;
+  max_requests_per_connection = 8;
+#endif /* ENABLE_ASYNC_EXPORT */
+
+  ssl_ca_cert_path       = "";
+  ssl_ca_cert_string     = "";
+  ssl_client_key_path    = "";
+  ssl_client_key_string  = "";
+  ssl_client_cert_path   = "";
+  ssl_client_cert_string = "";
+
+  ssl_min_tls      = "";
+  ssl_max_tls      = "";
+  ssl_cipher       = "";
+  ssl_cipher_suite = "";
+
+  compression = "";
+}
+
 OtlpHttpExporterOptions::~OtlpHttpExporterOptions() {}
 
 }  // namespace otlp
diff --git a/exporters/otlp/src/otlp_http_span_builder.cc b/exporters/otlp/src/otlp_http_span_builder.cc
@@ -20,10 +20,17 @@ void OtlpHttpSpanBuilder::Register(opentelemetry::sdk::init::Registry *registry)
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Build(
-    const opentelemetry::sdk::configuration::OtlpSpanExporterConfiguration * /* model */) const
+    const opentelemetry::sdk::configuration::OtlpSpanExporterConfiguration *model) const
 {
-  // FIXME, use model
-  OtlpHttpExporterOptions options;
+  OtlpHttpExporterOptions options(nullptr);
+  options.url          = model->endpoint;
+  options.content_type = GetOtlpHttpProtocolFromString(model->protocol);
+  options.timeout      = std::chrono::duration_cast<std::chrono::system_clock::duration>(
+      std::chrono::seconds{model->timeout});
+  // options.http_headers = model->xxx;
+  options.ssl_ca_cert_path     = model->certificate;
+  options.ssl_client_key_path  = model->client_key;
+  options.ssl_client_cert_path = model->client_certificate;
   return OtlpHttpExporterFactory::Create(options);
 }
 
diff --git a/sdk/include/opentelemetry/sdk/configuration/attribute_limit_configuration.h b/sdk/include/opentelemetry/sdk/configuration/attribute_limit_configuration.h
@@ -13,6 +13,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/opentelemetry_configuration.json
 class AttributeLimitConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/batch_log_record_processor_configuration.h b/sdk/include/opentelemetry/sdk/configuration/batch_log_record_processor_configuration.h
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/logger_provider.json
 class BatchLogRecordProcessorConfiguration : public LogRecordProcessorConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/configuration.h b/sdk/include/opentelemetry/sdk/configuration/configuration.h
@@ -20,6 +20,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/opentelemetry_configuration.json
 class Configuration
 {
 public:
@@ -35,6 +36,7 @@ class Configuration
   std::unique_ptr<PropagatorConfiguration> propagator;
   std::unique_ptr<TracerProviderConfiguration> tracer_provider;
   std::unique_ptr<ResourceConfiguration> resource;
+  // Ignored: instrumentation
 
 private:
   std::unique_ptr<Document> m_doc;
diff --git a/sdk/include/opentelemetry/sdk/configuration/console_log_record_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/console_log_record_exporter_configuration.h
@@ -13,6 +13,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/common.json, Console
 class ConsoleLogRecordExporterConfiguration : public LogRecordExporterConfiguration
 {
 public:
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
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/common.json, Console
 class ConsolePushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/logger_provider.json
 class ExtensionLogRecordExporterConfiguration : public LogRecordExporterConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_pull_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_pull_metric_exporter_configuration.h
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/meter_provider.json
 class ExtensionPullMetricExporterConfiguration : public PullMetricExporterConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_push_metric_exporter_configuration.h
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/meter_provider.json
 class ExtensionPushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/log_record_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/log_record_exporter_configuration.h
@@ -12,6 +12,7 @@ namespace configuration
 {
 class LogRecordExporterConfigurationVisitor;
 
+// REF: schema/logger_provider.json
 class LogRecordExporterConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/log_record_limits_configuration.h b/sdk/include/opentelemetry/sdk/configuration/log_record_limits_configuration.h
@@ -11,6 +11,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/logger_provider.json
 class LogRecordLimitsConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/log_record_processor_configuration.h b/sdk/include/opentelemetry/sdk/configuration/log_record_processor_configuration.h
@@ -12,6 +12,7 @@ namespace configuration
 {
 class LogRecordProcessorConfigurationVisitor;
 
+// REF: schema/logger_provider.json
 class LogRecordProcessorConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/logger_provider_configuration.h b/sdk/include/opentelemetry/sdk/configuration/logger_provider_configuration.h
@@ -16,6 +16,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/logger_provider.json
 class LoggerProviderConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h b/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h
@@ -16,11 +16,13 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/meter_provider.json
 class MeterProviderConfiguration
 {
 public:
   std::vector<std::unique_ptr<MetricReaderConfiguration>> readers;
   std::vector<std::unique_ptr<ViewConfiguration>> views;
+  // FIXME: exemplar_filter
 };
 
 }  // namespace configuration
diff --git a/sdk/include/opentelemetry/sdk/configuration/metric_reader_configuration.h b/sdk/include/opentelemetry/sdk/configuration/metric_reader_configuration.h
@@ -14,6 +14,8 @@ namespace configuration
 {
 class MetricReaderConfigurationVisitor;
 
+// REF: schema/meter_provider.json
+// FIXME: https://github.com/open-telemetry/opentelemetry-configuration/issues/138
 class MetricReaderConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/otlp_log_record_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/otlp_log_record_exporter_configuration.h
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/common.json, Otlp
 class OtlpLogRecordExporterConfiguration : public LogRecordExporterConfiguration
 {
 public:
@@ -31,6 +32,7 @@ class OtlpLogRecordExporterConfiguration : public LogRecordExporterConfiguration
   std::string client_key;
   std::string client_certificate;
   std::unique_ptr<HeadersConfiguration> headers;
+  std::string headers_list;
   std::string compression;
   size_t timeout;
   bool insecure;
diff --git a/sdk/include/opentelemetry/sdk/configuration/otlp_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/otlp_push_metric_exporter_configuration.h
@@ -20,6 +20,7 @@ enum enum_default_histogram_aggregation
   base2_exponential_bucket_histogram
 };
 
+// REF: schema/meter_provider.json, OtlpMetric
 class OtlpPushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
@@ -37,6 +38,7 @@ class OtlpPushMetricExporterConfiguration : public PushMetricExporterConfigurati
   std::string client_key;
   std::string client_certificate;
   std::unique_ptr<HeadersConfiguration> headers;
+  std::string headers_list;
   std::string compression;
   size_t timeout;
   std::string temporality_preference;
diff --git a/sdk/include/opentelemetry/sdk/configuration/otlp_span_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/otlp_span_exporter_configuration.h
@@ -31,6 +31,7 @@ class OtlpSpanExporterConfiguration : public SpanExporterConfiguration
   std::string client_key;
   std::string client_certificate;
   std::unique_ptr<HeadersConfiguration> headers;
+  std::string headers_list;
   std::string compression;
   size_t timeout;
   bool insecure;
diff --git a/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h b/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h
@@ -16,6 +16,8 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/meter_provider.json
+// FIXME: https://github.com/open-telemetry/opentelemetry-configuration/issues/138
 class PeriodicMetricReaderConfiguration : public MetricReaderConfiguration
 {
 public:
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
@@ -14,6 +14,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/meter_provider.json
 class PrometheusPullMetricExporterConfiguration : public PullMetricExporterConfiguration
 {
 public:
@@ -30,6 +31,7 @@ class PrometheusPullMetricExporterConfiguration : public PullMetricExporterConfi
   bool without_units;
   bool without_type_suffix;
   bool without_scope_info;
+  // FIXME: with_resource_constant_labels;
 };
 
 }  // namespace configuration
diff --git a/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h b/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h
@@ -16,6 +16,8 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/meter_provider.json
+// FIXME: https://github.com/open-telemetry/opentelemetry-configuration/issues/138
 class PullMetricReaderConfiguration : public MetricReaderConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/push_metric_exporter_configuration.h
@@ -12,6 +12,7 @@ namespace configuration
 {
 class PushMetricExporterConfigurationVisitor;
 
+// REF: schema/meter_provider.json
 class PushMetricExporterConfiguration
 {
 public:
diff --git a/sdk/include/opentelemetry/sdk/configuration/simple_log_record_processor_configuration.h b/sdk/include/opentelemetry/sdk/configuration/simple_log_record_processor_configuration.h
@@ -13,6 +13,7 @@ namespace sdk
 namespace configuration
 {
 
+// REF: schema/logger_provider.json
 class SimpleLogRecordProcessorConfiguration : public LogRecordProcessorConfiguration
 {
 public:
diff --git a/sdk/src/configuration/configuration_factory.cc b/sdk/src/configuration/configuration_factory.cc
@@ -133,9 +133,10 @@ static std::unique_ptr<OtlpLogRecordExporterConfiguration> ParseOtlpLogRecordExp
     model->headers = ParseHeadersConfiguration(child);
   }
 
-  model->compression = node->GetString("compression", "");
-  model->timeout     = node->GetInteger("timeout", 10000);
-  model->insecure    = node->GetBoolean("insecure", false);
+  model->headers_list = node->GetString("headers_list", "");
+  model->compression  = node->GetString("compression", "");
+  model->timeout      = node->GetInteger("timeout", 10000);
+  model->insecure     = node->GetBoolean("insecure", false);
 
   return model;
 }
@@ -353,6 +354,7 @@ ParseOtlpPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &no
     model->headers = ParseHeadersConfiguration(child);
   }
 
+  model->headers_list           = node->GetString("headers_list", "");
   model->compression            = node->GetString("compression", "");
   model->timeout                = node->GetInteger("timeout", 10000);
   model->temporality_preference = node->GetString("temporality_preference", "");
@@ -1049,9 +1051,10 @@ static std::unique_ptr<OtlpSpanExporterConfiguration> ParseOtlpSpanExporterConfi
     model->headers = ParseHeadersConfiguration(child);
   }
 
-  model->compression = node->GetString("compression", "");
-  model->timeout     = node->GetInteger("timeout", 10000);
-  model->insecure    = node->GetBoolean("insecure", false);
+  model->headers_list = node->GetString("headers_list", "");
+  model->compression  = node->GetString("compression", "");
+  model->timeout      = node->GetInteger("timeout", 10000);
+  model->insecure     = node->GetBoolean("insecure", false);
 
   return model;
 }

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,17 @@ void OtlpHttpSpanBuilder::Register(opentelemetry::sdk::init::Registry *registry)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Build(`
`23`		`- const opentelemetry::sdk::configuration::OtlpSpanExporterConfiguration * /* model */) const`
	`23`	`+ const opentelemetry::sdk::configuration::OtlpSpanExporterConfiguration *model) const`
`24`	`24`	`{`
`25`		`- // FIXME, use model`
`26`		`- OtlpHttpExporterOptions options;`
	`25`	`+ OtlpHttpExporterOptions options(nullptr);`
	`26`	`+ options.url = model->endpoint;`
	`27`	`+ options.content_type = GetOtlpHttpProtocolFromString(model->protocol);`
	`28`	`+ options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(`
	`29`	`+ std::chrono::seconds{model->timeout});`
	`30`	`+ // options.http_headers = model->xxx;`
	`31`	`+ options.ssl_ca_cert_path = model->certificate;`
	`32`	`+ options.ssl_client_key_path = model->client_key;`
	`33`	`+ options.ssl_client_cert_path = model->client_certificate;`
`27`	`34`	`return OtlpHttpExporterFactory::Create(options);`
`28`	`35`	`}`
`29`	`36`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ namespace sdk`
`13`	`13`	`namespace configuration`
`14`	`14`	`{`
`15`	`15`
	`16`	`+// REF: schema/opentelemetry_configuration.json`
`16`	`17`	`class AttributeLimitConfiguration`
`17`	`18`	`{`
`18`	`19`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ namespace sdk`
`14`	`14`	`namespace configuration`
`15`	`15`	`{`
`16`	`16`
	`17`	`+// REF: schema/logger_provider.json`
`17`	`18`	`class BatchLogRecordProcessorConfiguration : public LogRecordProcessorConfiguration`
`18`	`19`	`{`
`19`	`20`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ namespace sdk`
`20`	`20`	`namespace configuration`
`21`	`21`	`{`
`22`	`22`
	`23`	`+// REF: schema/opentelemetry_configuration.json`
`23`	`24`	`class Configuration`
`24`	`25`	`{`
`25`	`26`	`public:`
`@@ -35,6 +36,7 @@ class Configuration`
`35`	`36`	`std::unique_ptr<PropagatorConfiguration> propagator;`
`36`	`37`	`std::unique_ptr<TracerProviderConfiguration> tracer_provider;`
`37`	`38`	`std::unique_ptr<ResourceConfiguration> resource;`
	`39`	`+ // Ignored: instrumentation`
`38`	`40`
`39`	`41`	`private:`
`40`	`42`	`std::unique_ptr<Document> m_doc;`