diff --git a/CHANGELOG.md b/CHANGELOG.md index 254787e5aa..3f3538e1f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,16 @@ Increment the: ## [Unreleased] +* [CONFIGURATION] File configuration - remove zipkin + [#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804) + +Breaking changes: + +* [CONFIGURATION] File configuration - remove zipkin + [#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804) + * The zipkin trace exporter is no longer supported + by declarative configuration, due to an upstream schema change. + ## [1.24 2025-11-20] * [RELEASE] Bump main branch to 1.24-dev diff --git a/ci/do_ci.sh b/ci/do_ci.sh index eaea9e9643..067913128e 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -505,7 +505,6 @@ elif [[ "$1" == "cmake.install.test" ]]; then "exporters_prometheus_builder" "exporters_elasticsearch" "exporters_zipkin" - "exporters_zipkin_builder" ) EXPECTED_COMPONENTS_STRING=$(IFS=\;; echo "${EXPECTED_COMPONENTS[*]}") mkdir -p "${BUILD_DIR}/install_test" diff --git a/examples/configuration/BUILD b/examples/configuration/BUILD index f5855a4af1..45716c687b 100644 --- a/examples/configuration/BUILD +++ b/examples/configuration/BUILD @@ -10,7 +10,6 @@ cc_binary( "OTEL_HAVE_OTLP_HTTP", "OTEL_HAVE_OTLP_GRPC", "OTEL_HAVE_OTLP_FILE", - "OTEL_HAVE_ZIPKIN", "OTEL_HAVE_PROMETHEUS", ], tags = [ @@ -34,7 +33,6 @@ cc_binary( "//exporters/otlp:otlp_http_metric_exporter_builder", "//exporters/otlp:otlp_http_span_exporter_builder", "//exporters/prometheus:prometheus_exporter_builder", - "//exporters/zipkin:zipkin_exporter_builder", "//sdk:headers", "//sdk/src/configuration", "//sdk/src/logs", diff --git a/examples/configuration/CMakeLists.txt b/examples/configuration/CMakeLists.txt index 87c3156f52..80097f6a11 100644 --- a/examples/configuration/CMakeLists.txt +++ b/examples/configuration/CMakeLists.txt @@ -54,12 +54,6 @@ if(WITH_OTLP_FILE) opentelemetry-cpp::otlp_file_metric_exporter_builder) endif() -if(WITH_ZIPKIN) - target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_ZIPKIN) - target_link_libraries( - example_yaml PRIVATE opentelemetry-cpp::zipkin_trace_exporter_builder) -endif() - if(WITH_PROMETHEUS) target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_PROMETHEUS) target_link_libraries(example_yaml diff --git a/examples/configuration/main.cc b/examples/configuration/main.cc index f6abd6c979..20be3369b9 100644 --- a/examples/configuration/main.cc +++ b/examples/configuration/main.cc @@ -51,10 +51,6 @@ # include "opentelemetry/exporters/otlp/otlp_file_span_builder.h" #endif -#ifdef OTEL_HAVE_ZIPKIN -# include "opentelemetry/exporters/zipkin/zipkin_builder.h" -#endif - #ifdef OTEL_HAVE_PROMETHEUS # include "opentelemetry/exporters/prometheus/prometheus_pull_builder.h" #endif @@ -215,10 +211,6 @@ void InitOtel(const std::string &config_file) opentelemetry::exporter::otlp::OtlpFileLogRecordBuilder::Register(registry.get()); #endif -#ifdef OTEL_HAVE_ZIPKIN - opentelemetry::exporter::zipkin::ZipkinBuilder::Register(registry.get()); -#endif - #ifdef OTEL_HAVE_PROMETHEUS opentelemetry::exporter::metrics::PrometheusPullBuilder::Register(registry.get()); #endif diff --git a/exporters/zipkin/BUILD b/exporters/zipkin/BUILD index 9a02b132d8..bfa91014d3 100644 --- a/exporters/zipkin/BUILD +++ b/exporters/zipkin/BUILD @@ -45,21 +45,6 @@ cc_library( ], ) -cc_library( - name = "zipkin_exporter_builder", - srcs = [ - "src/zipkin_builder.cc", - ], - hdrs = [ - "include/opentelemetry/exporters/zipkin/zipkin_builder.h", - ], - strip_include_prefix = "include", - tags = ["zipkin"], - deps = [ - ":zipkin_exporter", - ], -) - cc_test( name = "zipkin_recordable_test", srcs = ["test/zipkin_recordable_test.cc"], diff --git a/exporters/zipkin/CMakeLists.txt b/exporters/zipkin/CMakeLists.txt index c8e3e9be2f..d043e87b52 100644 --- a/exporters/zipkin/CMakeLists.txt +++ b/exporters/zipkin/CMakeLists.txt @@ -24,25 +24,6 @@ target_link_libraries( PUBLIC opentelemetry_trace opentelemetry_http_client_curl nlohmann_json::nlohmann_json) -# -# opentelemetry_exporter_zipkin_trace_builder -# - -add_library(opentelemetry_exporter_zipkin_trace_builder src/zipkin_builder.cc) - -target_include_directories( - opentelemetry_exporter_zipkin_trace_builder - PUBLIC "$" - "$") - -set_target_properties(opentelemetry_exporter_zipkin_trace_builder - PROPERTIES EXPORT_NAME zipkin_trace_exporter_builder) - -set_target_version(opentelemetry_exporter_zipkin_trace_builder) - -target_link_libraries(opentelemetry_exporter_zipkin_trace_builder - PUBLIC opentelemetry_exporter_zipkin_trace) - otel_add_component( COMPONENT exporters_zipkin @@ -57,24 +38,8 @@ otel_add_component( "*.h" PATTERN "recordable.h" - EXCLUDE - PATTERN - "zipkin_builder.h" EXCLUDE) -otel_add_component( - COMPONENT - exporters_zipkin_builder - TARGETS - opentelemetry_exporter_zipkin_trace_builder - FILES_DIRECTORY - "include/opentelemetry/exporters/zipkin" - FILES_DESTINATION - "include/opentelemetry/exporters" - FILES_MATCHING - PATTERN - "zipkin_builder.h") - if(BUILD_TESTING) add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1) diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h deleted file mode 100644 index c5d28d09ce..0000000000 --- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -#pragma once - -#include - -#include "opentelemetry/sdk/configuration/registry.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" -#include "opentelemetry/sdk/trace/exporter.h" -#include "opentelemetry/version.h" - -OPENTELEMETRY_BEGIN_NAMESPACE -namespace exporter -{ -namespace zipkin -{ - -class OPENTELEMETRY_EXPORT ZipkinBuilder - : public opentelemetry::sdk::configuration::ZipkinSpanExporterBuilder -{ -public: - static void Register(opentelemetry::sdk::configuration::Registry *registry); - - std::unique_ptr Build( - const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) - const override; -}; - -} // namespace zipkin -} // namespace exporter -OPENTELEMETRY_END_NAMESPACE diff --git a/exporters/zipkin/src/zipkin_builder.cc b/exporters/zipkin/src/zipkin_builder.cc deleted file mode 100644 index a7bdc770d4..0000000000 --- a/exporters/zipkin/src/zipkin_builder.cc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -#include -#include -#include - -#include "opentelemetry/exporters/zipkin/zipkin_builder.h" -#include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h" -#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h" -#include "opentelemetry/sdk/configuration/registry.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" -#include "opentelemetry/sdk/trace/exporter.h" -#include "opentelemetry/version.h" - -OPENTELEMETRY_BEGIN_NAMESPACE -namespace exporter -{ -namespace zipkin -{ - -void ZipkinBuilder::Register(opentelemetry::sdk::configuration::Registry *registry) -{ - auto builder = std::make_unique(); - registry->SetZipkinSpanBuilder(std::move(builder)); -} - -std::unique_ptr ZipkinBuilder::Build( - const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const -{ - ZipkinExporterOptions options(nullptr); - - options.endpoint = model->endpoint; - - return ZipkinExporterFactory::Create(options); -} - -} // namespace zipkin -} // namespace exporter -OPENTELEMETRY_END_NAMESPACE diff --git a/functional/configuration/shelltests/kitchen-sink.yaml b/functional/configuration/shelltests/kitchen-sink.yaml index 8d4ad77020..8d5ff26dd3 100644 --- a/functional/configuration/shelltests/kitchen-sink.yaml +++ b/functional/configuration/shelltests/kitchen-sink.yaml @@ -731,19 +731,6 @@ tracer_provider: # Values include stdout, or scheme+destination. For example: file:///path/to/file.jsonl. # If omitted or null, stdout is used. output_stream: stdout - - # Configure a batch span processor. - batch: - # Configure exporter. - exporter: - # Configure exporter to be zipkin. - zipkin: - # Configure endpoint. - # If omitted or null, http://localhost:9411/api/v2/spans is used. - endpoint: http://localhost:9411/api/v2/spans - # Configure max time (in milliseconds) to wait for each export. - # Value must be non-negative. A value of 0 indicates indefinite. - # If omitted or null, 10000 is used. - timeout: 10000 - # Configure a simple span processor. simple: # Configure exporter. diff --git a/install/test/cmake/component_tests/exporters_zipkin_builder/CMakeLists.txt b/install/test/cmake/component_tests/exporters_zipkin_builder/CMakeLists.txt deleted file mode 100644 index 287e213277..0000000000 --- a/install/test/cmake/component_tests/exporters_zipkin_builder/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - -cmake_minimum_required(VERSION 3.16) -project(opentelemetry-cpp-exporters-zipkin-builder-install-test LANGUAGES CXX) - -find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_zipkin_builder) - -if(NOT TARGET nlohmann_json::nlohmann_json) - message(FATAL_ERROR "nlohmann_json::nlohmann_json target not found") -endif() - -find_package(GTest CONFIG REQUIRED) -include(GoogleTest) - -add_executable(exporters_zipkin_builder_test - ${INSTALL_TEST_SRC_DIR}/test_exporters_zipkin_builder.cc) -target_link_libraries( - exporters_zipkin_builder_test - PRIVATE opentelemetry-cpp::zipkin_trace_exporter_builder GTest::gtest - GTest::gtest_main) - -gtest_discover_tests(exporters_zipkin_builder_test) diff --git a/install/test/src/test_exporters_zipkin_builder.cc b/install/test/src/test_exporters_zipkin_builder.cc deleted file mode 100644 index e358cef08e..0000000000 --- a/install/test/src/test_exporters_zipkin_builder.cc +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -#include - -#include - -TEST(ExportersZipkinBuilderInstall, ZipkinBuilder) -{ - auto builder = std::make_unique(); - ASSERT_TRUE(builder != nullptr); - - opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration model; - model.endpoint = "localhost"; - - auto exporter = builder->Build(&model); - ASSERT_TRUE(exporter != nullptr); -} diff --git a/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h b/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h index e131119d76..25aefce8a5 100644 --- a/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h +++ b/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h @@ -88,7 +88,6 @@ #include "opentelemetry/sdk/configuration/view_configuration.h" #include "opentelemetry/sdk/configuration/view_selector_configuration.h" #include "opentelemetry/sdk/configuration/view_stream_configuration.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE @@ -302,9 +301,6 @@ class ConfigurationParser std::unique_ptr ParseConsoleSpanExporterConfiguration( const std::unique_ptr &node) const; - std::unique_ptr ParseZipkinSpanExporterConfiguration( - const std::unique_ptr &node) const; - std::unique_ptr ParseExtensionSpanExporterConfiguration( const std::string &name, std::unique_ptr node) const; diff --git a/sdk/include/opentelemetry/sdk/configuration/registry.h b/sdk/include/opentelemetry/sdk/configuration/registry.h index 81d38d2ef6..955c218b0d 100644 --- a/sdk/include/opentelemetry/sdk/configuration/registry.h +++ b/sdk/include/opentelemetry/sdk/configuration/registry.h @@ -27,7 +27,6 @@ #include "opentelemetry/sdk/configuration/otlp_http_span_exporter_builder.h" #include "opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_builder.h" #include "opentelemetry/sdk/configuration/text_map_propagator_builder.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h" #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE @@ -89,16 +88,6 @@ class Registry console_span_builder_ = std::move(builder); } - const ZipkinSpanExporterBuilder *GetZipkinSpanBuilder() const - { - return zipkin_span_builder_.get(); - } - - void SetZipkinSpanBuilder(std::unique_ptr &&builder) - { - zipkin_span_builder_ = std::move(builder); - } - const OtlpHttpPushMetricExporterBuilder *GetOtlpHttpPushMetricExporterBuilder() const { return otlp_http_push_metric_builder_.get(); @@ -251,7 +240,6 @@ class Registry std::unique_ptr otlp_grpc_span_builder_; std::unique_ptr otlp_file_span_builder_; std::unique_ptr console_span_builder_; - std::unique_ptr zipkin_span_builder_; std::unique_ptr otlp_http_push_metric_builder_; std::unique_ptr otlp_grpc_push_metric_builder_; diff --git a/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h b/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h index 9f31ba68e0..91dc9501cf 100644 --- a/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h +++ b/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h @@ -44,7 +44,6 @@ #include "opentelemetry/sdk/configuration/span_exporter_configuration.h" #include "opentelemetry/sdk/configuration/string_array_attribute_value_configuration.h" #include "opentelemetry/sdk/configuration/string_attribute_value_configuration.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" #include "opentelemetry/sdk/logs/exporter.h" #include "opentelemetry/sdk/logs/logger_provider.h" #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h" @@ -106,9 +105,6 @@ class SdkBuilder std::unique_ptr CreateConsoleSpanExporter( const opentelemetry::sdk::configuration::ConsoleSpanExporterConfiguration *model) const; - std::unique_ptr CreateZipkinSpanExporter( - const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const; - std::unique_ptr CreateExtensionSpanExporter( const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) const; diff --git a/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h b/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h index 685584220a..751274ee84 100644 --- a/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h +++ b/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h @@ -15,7 +15,6 @@ class OtlpHttpSpanExporterConfiguration; class OtlpGrpcSpanExporterConfiguration; class OtlpFileSpanExporterConfiguration; class ConsoleSpanExporterConfiguration; -class ZipkinSpanExporterConfiguration; class ExtensionSpanExporterConfiguration; class SpanExporterConfigurationVisitor @@ -33,7 +32,6 @@ class SpanExporterConfigurationVisitor virtual void VisitOtlpGrpc(const OtlpGrpcSpanExporterConfiguration *model) = 0; virtual void VisitOtlpFile(const OtlpFileSpanExporterConfiguration *model) = 0; virtual void VisitConsole(const ConsoleSpanExporterConfiguration *model) = 0; - virtual void VisitZipkin(const ZipkinSpanExporterConfiguration *model) = 0; virtual void VisitExtension(const ExtensionSpanExporterConfiguration *model) = 0; }; diff --git a/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h b/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h deleted file mode 100644 index 2b140e4c48..0000000000 --- a/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -#pragma once - -#include - -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" -#include "opentelemetry/sdk/trace/exporter.h" -#include "opentelemetry/version.h" - -OPENTELEMETRY_BEGIN_NAMESPACE -namespace sdk -{ -namespace configuration -{ - -class ZipkinSpanExporterBuilder -{ -public: - ZipkinSpanExporterBuilder() = default; - ZipkinSpanExporterBuilder(ZipkinSpanExporterBuilder &&) = default; - ZipkinSpanExporterBuilder(const ZipkinSpanExporterBuilder &) = default; - ZipkinSpanExporterBuilder &operator=(ZipkinSpanExporterBuilder &&) = default; - ZipkinSpanExporterBuilder &operator=(const ZipkinSpanExporterBuilder &other) = default; - virtual ~ZipkinSpanExporterBuilder() = default; - - virtual std::unique_ptr Build( - const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const = 0; -}; - -} // namespace configuration -} // namespace sdk -OPENTELEMETRY_END_NAMESPACE diff --git a/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h deleted file mode 100644 index fc64f30841..0000000000 --- a/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -#pragma once - -#include - -#include "opentelemetry/sdk/configuration/span_exporter_configuration.h" -#include "opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h" -#include "opentelemetry/version.h" - -OPENTELEMETRY_BEGIN_NAMESPACE -namespace sdk -{ -namespace configuration -{ - -// YAML-SCHEMA: schema/tracer_provider.json -// YAML-NODE: Zipkin -class ZipkinSpanExporterConfiguration : public SpanExporterConfiguration -{ -public: - void Accept(SpanExporterConfigurationVisitor *visitor) const override - { - visitor->VisitZipkin(this); - } - - std::string endpoint; - std::size_t timeout{0}; -}; - -} // namespace configuration -} // namespace sdk -OPENTELEMETRY_END_NAMESPACE diff --git a/sdk/src/configuration/configuration_parser.cc b/sdk/src/configuration/configuration_parser.cc index 439ff5f67c..f5eb6fb016 100644 --- a/sdk/src/configuration/configuration_parser.cc +++ b/sdk/src/configuration/configuration_parser.cc @@ -97,7 +97,6 @@ #include "opentelemetry/sdk/configuration/view_configuration.h" #include "opentelemetry/sdk/configuration/view_selector_configuration.h" #include "opentelemetry/sdk/configuration/view_stream_configuration.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE @@ -1544,18 +1543,6 @@ ConfigurationParser::ParseConsoleSpanExporterConfiguration( return model; } -std::unique_ptr -ConfigurationParser::ParseZipkinSpanExporterConfiguration( - const std::unique_ptr &node) const -{ - auto model = std::make_unique(); - - model->endpoint = node->GetRequiredString("endpoint"); - model->timeout = node->GetInteger("timeout", 10000); - - return model; -} - std::unique_ptr ConfigurationParser::ParseExtensionSpanExporterConfiguration( const std::string &name, @@ -1608,10 +1595,6 @@ std::unique_ptr ConfigurationParser::ParseSpanExporte { model = ParseConsoleSpanExporterConfiguration(child); } - else if (name == "zipkin") - { - model = ParseZipkinSpanExporterConfiguration(child); - } else { model = ParseExtensionSpanExporterConfiguration(name, std::move(child)); diff --git a/sdk/src/configuration/sdk_builder.cc b/sdk/src/configuration/sdk_builder.cc index 92352c51ba..ecb33e1e9c 100644 --- a/sdk/src/configuration/sdk_builder.cc +++ b/sdk/src/configuration/sdk_builder.cc @@ -116,8 +116,6 @@ #include "opentelemetry/sdk/configuration/view_configuration.h" #include "opentelemetry/sdk/configuration/view_selector_configuration.h" #include "opentelemetry/sdk/configuration/view_stream_configuration.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" #include "opentelemetry/sdk/logs/batch_log_record_processor_factory.h" #include "opentelemetry/sdk/logs/batch_log_record_processor_options.h" #include "opentelemetry/sdk/logs/exporter.h" @@ -417,12 +415,6 @@ class SpanExporterBuilder exporter = sdk_builder_->CreateConsoleSpanExporter(model); } - void VisitZipkin( - const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) override - { - exporter = sdk_builder_->CreateZipkinSpanExporter(model); - } - void VisitExtension( const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) override { @@ -886,23 +878,6 @@ std::unique_ptr SdkBuilder::CreateConso throw UnsupportedException(die); } -std::unique_ptr SdkBuilder::CreateZipkinSpanExporter( - const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const -{ - std::unique_ptr sdk; - const ZipkinSpanExporterBuilder *builder = registry_->GetZipkinSpanBuilder(); - - if (builder != nullptr) - { - OTEL_INTERNAL_LOG_DEBUG("CreateZipkinSpanExporter() using registered builder"); - sdk = builder->Build(model); - return sdk; - } - - static const std::string die("No builder for ZipkinSpanExporter"); - throw UnsupportedException(die); -} - std::unique_ptr SdkBuilder::CreateExtensionSpanExporter( const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) const { diff --git a/sdk/test/configuration/yaml_trace_test.cc b/sdk/test/configuration/yaml_trace_test.cc index 1b62fbd755..00b1c99f32 100644 --- a/sdk/test/configuration/yaml_trace_test.cc +++ b/sdk/test/configuration/yaml_trace_test.cc @@ -24,7 +24,6 @@ #include "opentelemetry/sdk/configuration/trace_id_ratio_based_sampler_configuration.h" #include "opentelemetry/sdk/configuration/tracer_provider_configuration.h" #include "opentelemetry/sdk/configuration/yaml_configuration_parser.h" -#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h" static std::unique_ptr DoParse( const std::string &yaml) @@ -428,69 +427,6 @@ file_format: "1.0-trace" ASSERT_NE(exporter, nullptr); } -TEST(YamlTrace, default_otlp_zipkin) -{ - std::string yaml = R"( -file_format: "1.0-trace" -tracer_provider: - processors: - - simple: - exporter: - zipkin: - endpoint: "zipkin" -)"; - - auto config = DoParse(yaml); - ASSERT_NE(config, nullptr); - ASSERT_NE(config->tracer_provider, nullptr); - ASSERT_EQ(config->tracer_provider->processors.size(), 1); - auto *processor = config->tracer_provider->processors[0].get(); - ASSERT_NE(processor, nullptr); - auto *simple = - reinterpret_cast( - processor); - ASSERT_NE(simple->exporter, nullptr); - auto *exporter = simple->exporter.get(); - ASSERT_NE(exporter, nullptr); - auto *zipkin = - reinterpret_cast( - exporter); - ASSERT_EQ(zipkin->endpoint, "zipkin"); - ASSERT_EQ(zipkin->timeout, 10000); -} - -TEST(YamlTrace, otlp_zipkin) -{ - std::string yaml = R"( -file_format: "1.0-trace" -tracer_provider: - processors: - - simple: - exporter: - zipkin: - endpoint: "zipkin" - timeout: 5000 -)"; - - auto config = DoParse(yaml); - ASSERT_NE(config, nullptr); - ASSERT_NE(config->tracer_provider, nullptr); - ASSERT_EQ(config->tracer_provider->processors.size(), 1); - auto *processor = config->tracer_provider->processors[0].get(); - ASSERT_NE(processor, nullptr); - auto *simple = - reinterpret_cast( - processor); - ASSERT_NE(simple->exporter, nullptr); - auto *exporter = simple->exporter.get(); - ASSERT_NE(exporter, nullptr); - auto *zipkin = - reinterpret_cast( - exporter); - ASSERT_EQ(zipkin->endpoint, "zipkin"); - ASSERT_EQ(zipkin->timeout, 5000); -} - TEST(YamlTrace, no_limits) { std::string yaml = R"(