[CONFIGURATION] Break the configuration_core dependency on the SDK logs library (#4553)

Author: dbarker

CHANGELOG.md

@@ -68,6 +68,10 @@ Increment the:
 
 * [CONFIGURATION] SDK signal provider builder interface
   [#4426](https://github.com/open-telemetry/opentelemetry-cpp/pull/4426)
+
+* [CONFIGURATION] Break the configuration_core dependency on SDK logs
+  [#4553](https://github.com/open-telemetry/opentelemetry-cpp/pull/4553)
+
 * [CONFIGURATION] Support environment variable substitution for attributes
   [#4474](https://github.com/open-telemetry/opentelemetry-cpp/pull/4474)
 

sdk/include/opentelemetry/sdk/configuration/logs_builder_utils.h

@@ -0,0 +1,46 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+#include "opentelemetry/sdk/configuration/log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/log_record_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/logger_configurator_configuration.h"
+#include "opentelemetry/sdk/configuration/registry.h"
+#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
+#include "opentelemetry/sdk/logs/exporter.h"
+#include "opentelemetry/sdk/logs/logger_config.h"
+#include "opentelemetry/sdk/logs/processor.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+/**
+ * Common utility functions for building logs SDK components from configuration models
+ */
+class LogsBuilderUtils
+{
+public:
+  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateLogRecordExporter(
+      const Registry *registry,
+      const std::unique_ptr<LogRecordExporterConfiguration> &model);
+
+  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor> CreateLogRecordProcessor(
+      const Registry *registry,
+      const std::unique_ptr<LogRecordProcessorConfiguration> &model);
+
+  static std::unique_ptr<opentelemetry::sdk::instrumentationscope::ScopeConfigurator<
+      opentelemetry::sdk::logs::LoggerConfig>>
+  CreateLoggerConfigurator(const Registry *registry,
+                           const std::unique_ptr<LoggerConfiguratorConfiguration> &model);
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE

sdk/include/opentelemetry/sdk/configuration/sdk_builder.h

@@ -58,9 +58,6 @@
 #include "opentelemetry/sdk/configuration/string_attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/tracer_configurator_configuration.h"
 #include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 #include "opentelemetry/sdk/trace/processor.h"
@@ -168,49 +165,6 @@ class SdkBuilder
       const std::unique_ptr<opentelemetry::sdk::configuration::PropagatorConfiguration> &model)
       const;
 
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateOtlpHttpLogRecordExporter(
-      const opentelemetry::sdk::configuration::OtlpHttpLogRecordExporterConfiguration *model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateOtlpGrpcLogRecordExporter(
-      const opentelemetry::sdk::configuration::OtlpGrpcLogRecordExporterConfiguration *model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateOtlpFileLogRecordExporter(
-      const opentelemetry::sdk::configuration::OtlpFileLogRecordExporterConfiguration *model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateConsoleLogRecordExporter(
-      const opentelemetry::sdk::configuration::ConsoleLogRecordExporterConfiguration *model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateExtensionLogRecordExporter(
-      const opentelemetry::sdk::configuration::ExtensionLogRecordExporterConfiguration *model)
-      const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> CreateLogRecordExporter(
-      const std::unique_ptr<opentelemetry::sdk::configuration::LogRecordExporterConfiguration>
-          &model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor> CreateBatchLogRecordProcessor(
-      const opentelemetry::sdk::configuration::BatchLogRecordProcessorConfiguration *model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor> CreateSimpleLogRecordProcessor(
-      const opentelemetry::sdk::configuration::SimpleLogRecordProcessorConfiguration *model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor> CreateExtensionLogRecordProcessor(
-      const opentelemetry::sdk::configuration::ExtensionLogRecordProcessorConfiguration *model)
-      const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor> CreateLogRecordProcessor(
-      const std::unique_ptr<opentelemetry::sdk::configuration::LogRecordProcessorConfiguration>
-          &model) const;
-
-  std::unique_ptr<opentelemetry::sdk::instrumentationscope::ScopeConfigurator<
-      opentelemetry::sdk::logs::LoggerConfig>>
-  CreateLoggerConfigurator(const std::unique_ptr<LoggerConfiguratorConfiguration> &model) const;
-
-  std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> CreateLoggerProvider(
-      const std::unique_ptr<opentelemetry::sdk::configuration::LoggerProviderConfiguration> &model,
-      const opentelemetry::sdk::resource::Resource &resource,
-      const AttributeLimitsConfiguration *attribute_limits = nullptr) const;
-
   std::unique_ptr<opentelemetry::sdk::resource::ResourceDetector> CreateContainerResourceDetector(
       const opentelemetry::sdk::configuration::ContainerResourceDetectorConfiguration *model) const;
 

sdk/src/configuration/BUILD

@@ -23,7 +23,6 @@ cc_library(
         "//api",
         "//sdk:headers",
         "//sdk/src/common:wildcard_match",
-        "//sdk/src/logs",
         "//sdk/src/resource",
         "//sdk/src/trace",
     ],
@@ -43,7 +42,10 @@ cc_library(
 
 cc_library(
     name = "configuration_logs_builders",
-    srcs = ["logs_builders.cc"],
+    srcs = [
+        "logs_builder_utils.cc",
+        "logs_builders.cc",
+    ],
     include_prefix = "src/configuration",
     deps = [
         ":configuration_core",

sdk/src/configuration/CMakeLists.txt

@@ -28,7 +28,7 @@ target_include_directories(
 target_link_libraries(
   opentelemetry_configuration_core
   PUBLIC opentelemetry_api opentelemetry_common opentelemetry_resources
-         opentelemetry_trace opentelemetry_logs)
+         opentelemetry_trace)
 
 # Trace SDK component builders
 add_library(opentelemetry_configuration_trace_builders trace_builders.cc)
@@ -47,7 +47,8 @@ target_link_libraries(
   PUBLIC opentelemetry_trace opentelemetry_configuration_core)
 
 # Logs SDK component builders
-add_library(opentelemetry_configuration_logs_builders logs_builders.cc)
+add_library(opentelemetry_configuration_logs_builders logs_builders.cc
+                                                      logs_builder_utils.cc)
 
 set_target_properties(opentelemetry_configuration_logs_builders
                       PROPERTIES EXPORT_NAME configuration_logs_builders)