exporters, use model parameters.

Author: marcalff

exporters/otlp/CMakeLists.txt

@@ -35,6 +35,25 @@ target_link_libraries(opentelemetry_otlp_recordable PUBLIC opentelemetry_logs)
 target_link_libraries(opentelemetry_otlp_recordable
                       PUBLIC opentelemetry_metrics)
 
+#
+# opentelemetry_exporter_otlp_builder_utils
+#
+
+add_library(opentelemetry_exporter_otlp_builder_utils
+            ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_builder_utils.cc)
+
+set_target_properties(opentelemetry_exporter_otlp_builder_utils
+                      PROPERTIES EXPORT_NAME otlp_builder_utils)
+set_target_version(opentelemetry_exporter_otlp_builder_utils)
+
+target_include_directories(
+  opentelemetry_exporter_otlp_builder_utils
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+         "$<INSTALL_INTERFACE:include>")
+
+target_link_libraries(opentelemetry_exporter_otlp_builder_utils
+                      PUBLIC opentelemetry_otlp_recordable)
+
 if(WITH_OTLP_GRPC)
   if(NOT DEFINED grpc_lib_type)
     message(
@@ -275,6 +294,8 @@ if(WITH_OTLP_HTTP)
 
   target_link_libraries(opentelemetry_exporter_otlp_http_builder
                         PUBLIC opentelemetry_exporter_otlp_http)
+  target_link_libraries(opentelemetry_exporter_otlp_http_builder
+                        PUBLIC opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS
        opentelemetry_exporter_otlp_http_builder)
@@ -316,6 +337,8 @@ if(WITH_OTLP_HTTP)
 
   target_link_libraries(opentelemetry_exporter_otlp_http_log_builder
                         PUBLIC opentelemetry_exporter_otlp_http_log)
+  target_link_libraries(opentelemetry_exporter_otlp_http_log_builder
+                        PUBLIC opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS
        opentelemetry_exporter_otlp_http_log_builder)
@@ -357,6 +380,8 @@ if(WITH_OTLP_HTTP)
 
   target_link_libraries(opentelemetry_exporter_otlp_http_metric_builder
                         PUBLIC opentelemetry_exporter_otlp_http_metric)
+  target_link_libraries(opentelemetry_exporter_otlp_http_metric_builder
+                        PUBLIC opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS
        opentelemetry_exporter_otlp_http_metric_builder)
@@ -528,6 +553,9 @@ otel_add_component(
   PATTERN
   "*.h"
   PATTERN
+  "otlp_builder_utils*.h"
+  EXCLUDE
+  PATTERN
   "otlp_http*.h"
   EXCLUDE
   PATTERN
@@ -537,6 +565,19 @@ otel_add_component(
   "otlp_file*.h"
   EXCLUDE)
 
+otel_add_component(
+  COMPONENT
+  exporter_otlp_builder_utils
+  TARGETS
+  opentelemetry_exporter_otlp_builder_utils
+  FILES_DIRECTORY
+  "include/opentelemetry/exporters/otlp"
+  FILES_DESTINATION
+  "include/opentelemetry/exporters"
+  FILES_MATCHING
+  PATTERN
+  "otlp_builder_utils.h")
+
 if(WITH_OTLP_GRPC)
   otel_add_component(
     COMPONENT

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_builder_utils.h

@@ -0,0 +1,38 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"  // For OtlpHeaders
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
+#include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
+#include "opentelemetry/sdk/configuration/temporality_preference.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace exporter
+{
+namespace otlp
+{
+
+class OtlpBuilderUtils
+{
+public:
+  static HttpRequestContentType ConvertOtlpHttpEncoding(
+      opentelemetry::sdk::configuration::OtlpHttpEncoding model);
+
+  static OtlpHeaders ConvertHeadersConfigurationModel(
+      const opentelemetry::sdk::configuration::HeadersConfiguration *model,
+      const std::string &headers_list);
+
+  static PreferredAggregationTemporality ConvertTemporalityPreference(
+      opentelemetry::sdk::configuration::TemporalityPreference model);
+};
+
+}  // namespace otlp
+}  // namespace exporter
+OPENTELEMETRY_END_NAMESPACE

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h

@@ -23,7 +23,10 @@ namespace otlp
  */
 struct OPENTELEMETRY_EXPORT OtlpGrpcExporterOptions : public OtlpGrpcClientOptions
 {
+  /** Lookup environment variables. */
   OtlpGrpcExporterOptions();
+  /** No defaults. */
+  OtlpGrpcExporterOptions(void *);
   OtlpGrpcExporterOptions(const OtlpGrpcExporterOptions &)            = default;
   OtlpGrpcExporterOptions(OtlpGrpcExporterOptions &&)                 = default;
   OtlpGrpcExporterOptions &operator=(const OtlpGrpcExporterOptions &) = default;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h

@@ -23,7 +23,10 @@ namespace otlp
  */
 struct OPENTELEMETRY_EXPORT OtlpGrpcLogRecordExporterOptions : public OtlpGrpcClientOptions
 {
+  /** Lookup environment variables. */
   OtlpGrpcLogRecordExporterOptions();
+  /** No defaults. */
+  OtlpGrpcLogRecordExporterOptions(void *);
   OtlpGrpcLogRecordExporterOptions(const OtlpGrpcLogRecordExporterOptions &)            = default;
   OtlpGrpcLogRecordExporterOptions(OtlpGrpcLogRecordExporterOptions &&)                 = default;
   OtlpGrpcLogRecordExporterOptions &operator=(const OtlpGrpcLogRecordExporterOptions &) = default;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h

@@ -24,7 +24,10 @@ namespace otlp
  */
 struct OPENTELEMETRY_EXPORT OtlpGrpcMetricExporterOptions : public OtlpGrpcClientOptions
 {
+  /** Lookup environment variables. */
   OtlpGrpcMetricExporterOptions();
+  /** No defaults. */
+  OtlpGrpcMetricExporterOptions(void *);
   OtlpGrpcMetricExporterOptions(const OtlpGrpcMetricExporterOptions &)            = default;
   OtlpGrpcMetricExporterOptions(OtlpGrpcMetricExporterOptions &&)                 = default;
   OtlpGrpcMetricExporterOptions &operator=(const OtlpGrpcMetricExporterOptions &) = default;

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

@@ -35,7 +35,7 @@ struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
   /** Lookup environment variables. */
   OtlpHttpExporterOptions();
   /** No defaults. */
-  OtlpHttpExporterOptions(void * /* raw */);
+  OtlpHttpExporterOptions(void *);
   OtlpHttpExporterOptions(const OtlpHttpExporterOptions &)            = default;
   OtlpHttpExporterOptions(OtlpHttpExporterOptions &&)                 = default;
   OtlpHttpExporterOptions &operator=(const OtlpHttpExporterOptions &) = default;

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

@@ -32,7 +32,10 @@ namespace otlp
  */
 struct OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterOptions
 {
+  /** Lookup environment variables. */
   OtlpHttpLogRecordExporterOptions();
+  /** No defaults. */
+  OtlpHttpLogRecordExporterOptions(void *);
   OtlpHttpLogRecordExporterOptions(const OtlpHttpLogRecordExporterOptions &)            = default;
   OtlpHttpLogRecordExporterOptions(OtlpHttpLogRecordExporterOptions &&)                 = default;
   OtlpHttpLogRecordExporterOptions &operator=(const OtlpHttpLogRecordExporterOptions &) = default;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h

@@ -33,7 +33,10 @@ namespace otlp
  */
 struct OPENTELEMETRY_EXPORT OtlpHttpMetricExporterOptions
 {
+  /** Lookup environment variables. */
   OtlpHttpMetricExporterOptions();
+  /** No defaults. */
+  OtlpHttpMetricExporterOptions(void *);
   OtlpHttpMetricExporterOptions(const OtlpHttpMetricExporterOptions &)            = default;
   OtlpHttpMetricExporterOptions(OtlpHttpMetricExporterOptions &&)                 = default;
   OtlpHttpMetricExporterOptions &operator=(const OtlpHttpMetricExporterOptions &) = default;

exporters/otlp/src/otlp_builder_utils.cc

@@ -0,0 +1,104 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include "opentelemetry/exporters/otlp/otlp_builder_utils.h"
+#include "opentelemetry/common/kv_properties.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace exporter
+{
+namespace otlp
+{
+
+HttpRequestContentType OtlpBuilderUtils::ConvertOtlpHttpEncoding(
+    opentelemetry::sdk::configuration::OtlpHttpEncoding model)
+{
+  auto result = exporter::otlp::HttpRequestContentType::kBinary;
+
+  switch (model)
+  {
+    case opentelemetry::sdk::configuration::OtlpHttpEncoding::protobuf:
+      result = exporter::otlp::HttpRequestContentType::kBinary;
+    case opentelemetry::sdk::configuration::OtlpHttpEncoding::json:
+      result = exporter::otlp::HttpRequestContentType::kJson;
+  }
+
+  return result;
+}
+
+OtlpHeaders OtlpBuilderUtils::ConvertHeadersConfigurationModel(
+    const opentelemetry::sdk::configuration::HeadersConfiguration *model,
+    const std::string &headers_list)
+{
+  OtlpHeaders headers;
+
+  // First, scan headers_list, which has low priority.
+  if (headers_list.size() > 0)
+  {
+    opentelemetry::common::KeyValueStringTokenizer tokenizer{headers_list};
+
+    opentelemetry::nostd::string_view header_key;
+    opentelemetry::nostd::string_view header_value;
+    bool header_valid = true;
+
+    while (tokenizer.next(header_valid, header_key, header_value))
+    {
+      if (header_valid)
+      {
+        std::string key(header_key);
+        std::string value(header_value);
+
+        if (headers.find(key) == headers.end())
+        {
+          headers.emplace(std::make_pair(std::move(key), std::move(value)));
+        }
+        else
+        {
+          OTEL_INTERNAL_LOG_WARN("Found duplicate key in headers_list");
+        }
+      }
+      else
+      {
+        OTEL_INTERNAL_LOG_WARN("Found invalid key/value pair in headers_list");
+      }
+    }
+  }
+
+  // Second, scan headers, which has high priority.
+  for (const auto &kv : model->kv_map)
+  {
+    const auto &search = headers.find(kv.first);
+    if (search != headers.end())
+    {
+      headers.erase(search);
+    }
+
+    headers.emplace(std::make_pair(kv.first, kv.second));
+  }
+
+  return headers;
+}
+
+PreferredAggregationTemporality OtlpBuilderUtils::ConvertTemporalityPreference(
+    opentelemetry::sdk::configuration::TemporalityPreference model)
+{
+  auto result = exporter::otlp::PreferredAggregationTemporality::kCumulative;
+
+  switch (model)
+  {
+    case opentelemetry::sdk::configuration::TemporalityPreference::cumulative:
+      result = exporter::otlp::PreferredAggregationTemporality::kCumulative;
+    case opentelemetry::sdk::configuration::TemporalityPreference::delta:
+      result = exporter::otlp::PreferredAggregationTemporality::kDelta;
+    case opentelemetry::sdk::configuration::TemporalityPreference::low_memory:
+      result = exporter::otlp::PreferredAggregationTemporality::kLowMemory;
+  }
+
+  return result;
+}
+
+}  // namespace otlp
+}  // namespace exporter
+OPENTELEMETRY_END_NAMESPACE

exporters/otlp/src/otlp_file_log_record_builder.cc

@@ -29,8 +29,10 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpFileLogRecordBu
     const opentelemetry::sdk::configuration::OtlpFileLogRecordExporterConfiguration * /* model */)
     const
 {
-  // FIXME, use model
   OtlpFileLogRecordExporterOptions options;
+
+  // FIXME: unclear how to map model->output_stream to a OtlpFileClientBackendOptions
+
   return OtlpFileLogRecordExporterFactory::Create(options);
 }