exporter cleanup

Author: marcalff

exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_options.h

@@ -18,8 +18,12 @@ namespace metrics
  */
 struct PrometheusExporterOptions
 {
+  // Lookup environment variables
   PrometheusExporterOptions();
 
+  // No defaults
+  PrometheusExporterOptions(void *);
+
   // The endpoint the Prometheus backend can collect metrics from
   std::string url;
 

exporters/prometheus/src/exporter_options.cc

@@ -77,6 +77,14 @@ PrometheusExporterOptions::PrometheusExporterOptions()
       without_type_suffix(GetPrometheusWithoutTypeSuffix())
 {}
 
+PrometheusExporterOptions::PrometheusExporterOptions(void *)
+    : url(""),
+      populate_target_info(true),
+      without_otel_scope(false),
+      without_units(false),
+      without_type_suffix(false)
+{}
+
 }  // namespace metrics
 }  // namespace exporter
 OPENTELEMETRY_END_NAMESPACE

exporters/prometheus/src/prometheus_pull_builder.cc

@@ -26,24 +26,19 @@ void PrometheusPullBuilder::Register(opentelemetry::sdk::configuration::Registry
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> PrometheusPullBuilder::Build(
-    const opentelemetry::sdk::configuration::PrometheusPullMetricExporterConfiguration
-        * /* model */) const
+    const opentelemetry::sdk::configuration::PrometheusPullMetricExporterConfiguration *model) const
 {
-  opentelemetry::exporter::metrics::PrometheusExporterOptions options;
-
-#ifdef LATER
-  // Expected
-  options.url                  = model->xxx;
-  options.populate_target_info = model->xxx;
-  options.without_otel_scope   = model->xxx;
-
-  // Configuration model
-  options.xxx = model->host;
-  options.xxx = model->port;
-  options.xxx = model->without_units;
-  options.xxx = model->without_type_suffix;
-  options.xxx = model->without_scope_info;
-#endif
+  opentelemetry::exporter::metrics::PrometheusExporterOptions options(nullptr);
+
+  std::string url(model->host);
+  url.append(":");
+  url.append(std::to_string(model->port));
+
+  options.url                  = url;
+  options.populate_target_info = true;
+  options.without_otel_scope   = model->without_scope_info;
+  options.without_units        = model->without_units;
+  options.without_type_suffix  = model->without_type_suffix;
 
   return PrometheusExporterFactory::Create(options);
 }

exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h

@@ -13,6 +13,7 @@ namespace exporter
 namespace zipkin
 {
 
+// The endpoint to export to. By default the OpenTelemetry Collector's default endpoint.
 inline const std::string GetDefaultZipkinEndpoint()
 {
   const char *otel_exporter_zipkin_endpoint_env = "OTEL_EXPORTER_ZIPKIN_ENDPOINT";
@@ -36,8 +37,13 @@ enum class TransportFormat
  */
 struct ZipkinExporterOptions
 {
-  // The endpoint to export to. By default the OpenTelemetry Collector's default endpoint.
-  std::string endpoint     = GetDefaultZipkinEndpoint();
+  // Lookup environment variables
+  ZipkinExporterOptions() : endpoint(GetDefaultZipkinEndpoint()) {}
+
+  // No defaults
+  ZipkinExporterOptions(void *) : endpoint("") {}
+
+  std::string endpoint;
   TransportFormat format   = TransportFormat::kJson;
   std::string service_name = "default-service";
   std::string ipv4;

exporters/zipkin/src/zipkin_builder.cc

@@ -31,14 +31,10 @@ void ZipkinBuilder::Register(opentelemetry::sdk::configuration::Registry *regist
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> ZipkinBuilder::Build(
     const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const
 {
-  ZipkinExporterOptions options;
+  ZipkinExporterOptions options(nullptr);
 
   options.endpoint = model->endpoint;
 
-#ifdef LATER
-  options.xxx = model->timeout;
-#endif
-
   return ZipkinExporterFactory::Create(options);
 }