Skip to content

Commit 705914b

Browse files
authored
[CONFIGURATION] File configuration - remove zipkin (#3804)
1 parent 025a3b9 commit 705914b

File tree

21 files changed

+10
-391
lines changed

21 files changed

+10
-391
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ Increment the:
1515

1616
## [Unreleased]
1717

18+
* [CONFIGURATION] File configuration - remove zipkin
19+
[#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804)
20+
21+
Breaking changes:
22+
23+
* [CONFIGURATION] File configuration - remove zipkin
24+
[#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804)
25+
* The zipkin trace exporter is no longer supported
26+
by declarative configuration, due to an upstream schema change.
27+
1828
## [1.24 2025-11-20]
1929

2030
* [RELEASE] Bump main branch to 1.24-dev

ci/do_ci.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ elif [[ "$1" == "cmake.install.test" ]]; then
505505
"exporters_prometheus_builder"
506506
"exporters_elasticsearch"
507507
"exporters_zipkin"
508-
"exporters_zipkin_builder"
509508
)
510509
EXPECTED_COMPONENTS_STRING=$(IFS=\;; echo "${EXPECTED_COMPONENTS[*]}")
511510
mkdir -p "${BUILD_DIR}/install_test"

examples/configuration/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ cc_binary(
1010
"OTEL_HAVE_OTLP_HTTP",
1111
"OTEL_HAVE_OTLP_GRPC",
1212
"OTEL_HAVE_OTLP_FILE",
13-
"OTEL_HAVE_ZIPKIN",
1413
"OTEL_HAVE_PROMETHEUS",
1514
],
1615
tags = [
@@ -34,7 +33,6 @@ cc_binary(
3433
"//exporters/otlp:otlp_http_metric_exporter_builder",
3534
"//exporters/otlp:otlp_http_span_exporter_builder",
3635
"//exporters/prometheus:prometheus_exporter_builder",
37-
"//exporters/zipkin:zipkin_exporter_builder",
3836
"//sdk:headers",
3937
"//sdk/src/configuration",
4038
"//sdk/src/logs",

examples/configuration/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ if(WITH_OTLP_FILE)
5454
opentelemetry-cpp::otlp_file_metric_exporter_builder)
5555
endif()
5656

57-
if(WITH_ZIPKIN)
58-
target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_ZIPKIN)
59-
target_link_libraries(
60-
example_yaml PRIVATE opentelemetry-cpp::zipkin_trace_exporter_builder)
61-
endif()
62-
6357
if(WITH_PROMETHEUS)
6458
target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_PROMETHEUS)
6559
target_link_libraries(example_yaml

examples/configuration/main.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
# include "opentelemetry/exporters/otlp/otlp_file_span_builder.h"
5252
#endif
5353

54-
#ifdef OTEL_HAVE_ZIPKIN
55-
# include "opentelemetry/exporters/zipkin/zipkin_builder.h"
56-
#endif
57-
5854
#ifdef OTEL_HAVE_PROMETHEUS
5955
# include "opentelemetry/exporters/prometheus/prometheus_pull_builder.h"
6056
#endif
@@ -215,10 +211,6 @@ void InitOtel(const std::string &config_file)
215211
opentelemetry::exporter::otlp::OtlpFileLogRecordBuilder::Register(registry.get());
216212
#endif
217213

218-
#ifdef OTEL_HAVE_ZIPKIN
219-
opentelemetry::exporter::zipkin::ZipkinBuilder::Register(registry.get());
220-
#endif
221-
222214
#ifdef OTEL_HAVE_PROMETHEUS
223215
opentelemetry::exporter::metrics::PrometheusPullBuilder::Register(registry.get());
224216
#endif

exporters/zipkin/BUILD

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,6 @@ cc_library(
4545
],
4646
)
4747

48-
cc_library(
49-
name = "zipkin_exporter_builder",
50-
srcs = [
51-
"src/zipkin_builder.cc",
52-
],
53-
hdrs = [
54-
"include/opentelemetry/exporters/zipkin/zipkin_builder.h",
55-
],
56-
strip_include_prefix = "include",
57-
tags = ["zipkin"],
58-
deps = [
59-
":zipkin_exporter",
60-
],
61-
)
62-
6348
cc_test(
6449
name = "zipkin_recordable_test",
6550
srcs = ["test/zipkin_recordable_test.cc"],

exporters/zipkin/CMakeLists.txt

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,6 @@ target_link_libraries(
2424
PUBLIC opentelemetry_trace opentelemetry_http_client_curl
2525
nlohmann_json::nlohmann_json)
2626

27-
#
28-
# opentelemetry_exporter_zipkin_trace_builder
29-
#
30-
31-
add_library(opentelemetry_exporter_zipkin_trace_builder src/zipkin_builder.cc)
32-
33-
target_include_directories(
34-
opentelemetry_exporter_zipkin_trace_builder
35-
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
36-
"$<INSTALL_INTERFACE:include>")
37-
38-
set_target_properties(opentelemetry_exporter_zipkin_trace_builder
39-
PROPERTIES EXPORT_NAME zipkin_trace_exporter_builder)
40-
41-
set_target_version(opentelemetry_exporter_zipkin_trace_builder)
42-
43-
target_link_libraries(opentelemetry_exporter_zipkin_trace_builder
44-
PUBLIC opentelemetry_exporter_zipkin_trace)
45-
4627
otel_add_component(
4728
COMPONENT
4829
exporters_zipkin
@@ -57,24 +38,8 @@ otel_add_component(
5738
"*.h"
5839
PATTERN
5940
"recordable.h"
60-
EXCLUDE
61-
PATTERN
62-
"zipkin_builder.h"
6341
EXCLUDE)
6442

65-
otel_add_component(
66-
COMPONENT
67-
exporters_zipkin_builder
68-
TARGETS
69-
opentelemetry_exporter_zipkin_trace_builder
70-
FILES_DIRECTORY
71-
"include/opentelemetry/exporters/zipkin"
72-
FILES_DESTINATION
73-
"include/opentelemetry/exporters"
74-
FILES_MATCHING
75-
PATTERN
76-
"zipkin_builder.h")
77-
7843
if(BUILD_TESTING)
7944
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
8045

exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

exporters/zipkin/src/zipkin_builder.cc

Lines changed: 0 additions & 41 deletions
This file was deleted.

functional/configuration/shelltests/kitchen-sink.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -731,19 +731,6 @@ tracer_provider:
731731
# Values include stdout, or scheme+destination. For example: file:///path/to/file.jsonl.
732732
# If omitted or null, stdout is used.
733733
output_stream: stdout
734-
- # Configure a batch span processor.
735-
batch:
736-
# Configure exporter.
737-
exporter:
738-
# Configure exporter to be zipkin.
739-
zipkin:
740-
# Configure endpoint.
741-
# If omitted or null, http://localhost:9411/api/v2/spans is used.
742-
endpoint: http://localhost:9411/api/v2/spans
743-
# Configure max time (in milliseconds) to wait for each export.
744-
# Value must be non-negative. A value of 0 indicates indefinite.
745-
# If omitted or null, 10000 is used.
746-
timeout: 10000
747734
- # Configure a simple span processor.
748735
simple:
749736
# Configure exporter.

0 commit comments

Comments
 (0)