Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions examples/configuration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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",
Expand Down
6 changes: 0 additions & 6 deletions examples/configuration/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions examples/configuration/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions exporters/zipkin/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
35 changes: 0 additions & 35 deletions exporters/zipkin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<INSTALL_INTERFACE:include>")

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
Expand All @@ -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)

Expand Down

This file was deleted.

41 changes: 0 additions & 41 deletions exporters/zipkin/src/zipkin_builder.cc

This file was deleted.

13 changes: 0 additions & 13 deletions functional/configuration/shelltests/kitchen-sink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

This file was deleted.

18 changes: 0 additions & 18 deletions install/test/src/test_exporters_zipkin_builder.cc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -302,9 +301,6 @@ class ConfigurationParser
std::unique_ptr<ConsoleSpanExporterConfiguration> ParseConsoleSpanExporterConfiguration(
const std::unique_ptr<DocumentNode> &node) const;

std::unique_ptr<ZipkinSpanExporterConfiguration> ParseZipkinSpanExporterConfiguration(
const std::unique_ptr<DocumentNode> &node) const;

std::unique_ptr<ExtensionSpanExporterConfiguration> ParseExtensionSpanExporterConfiguration(
const std::string &name,
std::unique_ptr<DocumentNode> node) const;
Expand Down
12 changes: 0 additions & 12 deletions sdk/include/opentelemetry/sdk/configuration/registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<ZipkinSpanExporterBuilder> &&builder)
{
zipkin_span_builder_ = std::move(builder);
}

const OtlpHttpPushMetricExporterBuilder *GetOtlpHttpPushMetricExporterBuilder() const
{
return otlp_http_push_metric_builder_.get();
Expand Down Expand Up @@ -251,7 +240,6 @@ class Registry
std::unique_ptr<OtlpGrpcSpanExporterBuilder> otlp_grpc_span_builder_;
std::unique_ptr<OtlpFileSpanExporterBuilder> otlp_file_span_builder_;
std::unique_ptr<ConsoleSpanExporterBuilder> console_span_builder_;
std::unique_ptr<ZipkinSpanExporterBuilder> zipkin_span_builder_;

std::unique_ptr<OtlpHttpPushMetricExporterBuilder> otlp_http_push_metric_builder_;
std::unique_ptr<OtlpGrpcPushMetricExporterBuilder> otlp_grpc_push_metric_builder_;
Expand Down
4 changes: 0 additions & 4 deletions sdk/include/opentelemetry/sdk/configuration/sdk_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -106,9 +105,6 @@ class SdkBuilder
std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CreateConsoleSpanExporter(
const opentelemetry::sdk::configuration::ConsoleSpanExporterConfiguration *model) const;

std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CreateZipkinSpanExporter(
const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const;

std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CreateExtensionSpanExporter(
const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) const;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class OtlpHttpSpanExporterConfiguration;
class OtlpGrpcSpanExporterConfiguration;
class OtlpFileSpanExporterConfiguration;
class ConsoleSpanExporterConfiguration;
class ZipkinSpanExporterConfiguration;
class ExtensionSpanExporterConfiguration;

class SpanExporterConfigurationVisitor
Expand All @@ -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;
};

Expand Down
Loading
Loading