Merge branch 'main' into InMemorySpanExporter-shutdown

open-telemetry · Dec 22, 2021 · 33c35bd · 33c35bd
2 parents 2d0ee47 + 1cf2422
commit 33c35bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,7 +23,7 @@ Increment the:
 * [EXPORTER] ZipkinExporter shutdown ([#1153](https://github.com/open-telemetry/opentelemetry-cpp/pull/1153))
 * [EXPORTER] Jaeger exporter shutdown ([#1150](https://github.com/open-telemetry/opentelemetry-cpp/pull/1150))
 * [EXPORTER] Bugfix: `jaeger::TUDPTransport::write` crash when `getaddrinfo` returns error ([#1116](https://github.com/open-telemetry/opentelemetry-cpp/pull/1116))
-* [EXPORTER] Bugfix: Jaeger exporter: extend supported attributes types ([#1116](https://github.com/open-telemetry/opentelemetry-cpp/pull/1116))
+* [EXPORTER] Bugfix: Jaeger exporter: extend supported attributes types ([#1106](https://github.com/open-telemetry/opentelemetry-cpp/pull/1106))
 * [EXPORTER] Fix otlp generates null span ids ([#1113](https://github.com/open-telemetry/opentelemetry-cpp/pull/1113))
 * [EXPORTER] Jaeger bazel (Linux only) ([#1077](https://github.com/open-telemetry/opentelemetry-cpp/pull/1077))
 * [DOCS] Add note on DLL support ([#1137](https://github.com/open-telemetry/opentelemetry-cpp/pull/1137))

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -204,7 +204,7 @@ endif(WIN32)
 
 option(
   WITH_API_ONLY
-  "Only build the API (use as a header-only library). Overrides WITH_EXAMPLES"
+  "Only build the API (use as a header-only library). Overrides WITH_EXAMPLES and all options to enable exporters"
   OFF)
 option(WITH_EXAMPLES "Whether to build examples" ON)
 
@@ -269,13 +269,14 @@ endif()
 include(GNUInstallDirs)
 
 if((NOT WITH_API_ONLY)
-   OR WITH_ELASTICSEARCH
-   OR WITH_ZIPKIN
-   OR WITH_OTLP
-   OR WITH_OTLP_HTTP
-   OR WITH_ZPAGES
-   OR BUILD_W3CTRACECONTEXT_TEST
-   OR WITH_ETW)
+   AND (WITH_ELASTICSEARCH
+        OR WITH_ZIPKIN
+        OR WITH_OTLP
+        OR WITH_OTLP_HTTP
+        OR WITH_ZPAGES
+        OR BUILD_W3CTRACECONTEXT_TEST
+        OR WITH_ETW
+       ))
   # nlohmann_json package is required for most SDK build configurations
   find_package(nlohmann_json QUIET)
   set(nlohmann_json_clone FALSE)