[REMOVAL] Remove WITH_OTLP_RETRY_PREVIEW (#4668)

Author: marcalff

CHANGELOG.md

@@ -98,6 +98,9 @@ Breaking changes:
 * [BUG] Keep the curl retry deadline stable within each attempt
   [#4452](https://github.com/open-telemetry/opentelemetry-cpp/pull/4452)
 
+* [REMOVAL] Remove WITH_OTLP_RETRY_PREVIEW - #4668
+  [#4668](https://github.com/open-telemetry/opentelemetry-cpp/pull/4668)
+
 ## [1.29.0] 2026-09-13
 
 * [RELEASE] Bump main branch to 1.29.0-dev (#4259)

CMakeLists.txt

@@ -170,9 +170,6 @@ if(NOT OTELCPP_WITH_STL STREQUAL "OFF")
   endif()
 endif()
 
-otelcpp_option_flag(OTELCPP_WITH_OTLP_RETRY_PREVIEW
-                    "Whether to enable retry functionality" ON)
-
 otelcpp_option_flag(OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW
                     "Whether to enable mTLS support for gRPC" ON)
 
@@ -639,8 +636,6 @@ message(
   STATUS
     "OTELCPP_WITH_OTLP_GRPC_CREDENTIAL_PREVIEW: ${OTELCPP_WITH_OTLP_GRPC_CREDENTIAL_PREVIEW}"
 )
-message(
-  STATUS "OTELCPP_WITH_OTLP_RETRY_PREVIEW: ${OTELCPP_WITH_OTLP_RETRY_PREVIEW}")
 message(
   STATUS
     "OTELCPP_WITH_METRICS_BOUND_INSTRUMENTS_PREVIEW: ${OTELCPP_WITH_METRICS_BOUND_INSTRUMENTS_PREVIEW}"

DEPRECATED.md

@@ -94,7 +94,6 @@ The following legacy CMake option names are deprecated:
 | `WITH_OTLP_GRPC_SSL_MTLS_PREVIEW` | `OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW` |
 | `WITH_OTLP_HTTP` | `OTELCPP_WITH_OTLP_HTTP` |
 | `WITH_OTLP_HTTP_COMPRESSION` | `OTELCPP_WITH_OTLP_HTTP_COMPRESSION` |
-| `WITH_OTLP_RETRY_PREVIEW` | `OTELCPP_WITH_OTLP_RETRY_PREVIEW` |
 | `WITH_OTLP_UTF8_VALIDITY` | `OTELCPP_WITH_OTLP_UTF8_VALIDITY` |
 | `WITH_PROMETHEUS` | `OTELCPP_WITH_PROMETHEUS` |
 | `WITH_RESOURCE_DETECTORS_PREVIEW` | `OTELCPP_WITH_RESOURCE_DETECTORS_PREVIEW` |
@@ -119,54 +118,6 @@ both names are set, the `OTELCPP_` name takes precedence.
 The legacy CMake option names will be removed in a future release. The
 replacement names are not affected by this removal.
 
-### CMake OTELCPP_WITH_OTLP_RETRY_PREVIEW
-
-#### Announcement (OTELCPP_WITH_OTLP_RETRY_PREVIEW)
-
-The CMake compile flag `OTELCPP_WITH_OTLP_RETRY_PREVIEW`, formerly named
-`WITH_OTLP_RETRY_PREVIEW`, is deprecated by:
-
-* Enable WITH_OTLP_RETRY_PREVIEW by default
-  [#3953](https://github.com/open-telemetry/opentelemetry-cpp/pull/3953)
-
-#### Motivation (OTELCPP_WITH_OTLP_RETRY_PREVIEW)
-
-Flags like `OTELCPP_WITH_OTLP_RETRY_PREVIEW` are used to conditionally compile
-new features when they are introduced in the code base.
-
-Now that this feature is stable, conditional compilation is no longer
-necessary.
-
-#### Scope (OTELCPP_WITH_OTLP_RETRY_PREVIEW)
-
-Remove the `OTELCPP_WITH_OTLP_RETRY_PREVIEW` compilation flag and its legacy
-name `WITH_OTLP_RETRY_PREVIEW` from CMake.
-
-Remove the `ENABLE_OTLP_RETRY_PREVIEW` preprocessor condition from C++.
-
-#### Mitigation (OTELCPP_WITH_OTLP_RETRY_PREVIEW)
-
-Applications built with `OTELCPP_WITH_OTLP_RETRY_PREVIEW=ON` or
-`WITH_OTLP_RETRY_PREVIEW=ON` need to:
-
-* remove the preview flag from CMake scripts
-
-Applications built with `OTELCPP_WITH_OTLP_RETRY_PREVIEW=OFF` or
-`WITH_OTLP_RETRY_PREVIEW=OFF` need to:
-
-* remove the preview flag from CMake scripts
-* use `retry_policy_max_attempts` = 0 in the OTLP exporter options.
-
-For Bazel, no compilation option exists,
-the bazel build enables unconditionally ENABLE_OTLP_RETRY_PREVIEW.
-
-Make sure to properly initialize `retry_policy_max_attempts`
-to enable or disable the retry feature.
-
-#### Planned removal (OTELCPP_WITH_OTLP_RETRY_PREVIEW)
-
-This compilation flag will be removed after October 1st, 2026.
-
 ### CMake OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW
 
 #### Announcement (OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW)

api/CMakeLists.txt

@@ -87,13 +87,6 @@ if(OTELCPP_WITH_METRICS_BOUND_INSTRUMENTS_PREVIEW)
                              INTERFACE ENABLE_METRICS_BOUND_INSTRUMENTS_PREVIEW)
 endif()
 
-if(OTELCPP_WITH_OTLP_RETRY_PREVIEW)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_OTLP_RETRY_PREVIEW)
-else()
-  message(WARNING "OTELCPP_WITH_OTLP_RETRY_PREVIEW=OFF is deprecated")
-endif()
-
 if(OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW)
   target_compile_definitions(opentelemetry_api
                              INTERFACE ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW)

ci/do_ci.ps1

@@ -554,7 +554,6 @@ switch ($action) {
       -DOTELCPP_WITH_OPENTRACING=OFF `
       -DOTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF `
       -DOTELCPP_WITH_OTLP_GRPC_CREDENTIAL_PREVIEW=OFF `
-      -DOTELCPP_WITH_OTLP_RETRY_PREVIEW=OFF `
       -DOTELCPP_WITH_OTLP_GRPC=OFF `
       -DOTELCPP_WITH_OTLP_HTTP=OFF `
       -DOTELCPP_WITH_OTLP_FILE=OFF `

ci/do_ci.sh

@@ -176,7 +176,6 @@ elif [[ "$1" == "cmake.maintainer.yaml.test" ]]; then
         -DOTELCPP_MAINTAINER_MODE=ON \
         -DOTELCPP_WITH_NO_DEPRECATED_CODE=ON \
         -DOTELCPP_WITH_OTLP_HTTP_COMPRESSION=ON \
-        -DOTELCPP_WITH_OTLP_RETRY_PREVIEW=ON \
         -DOTELCPP_WITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
         -DOTELCPP_WITH_CONFIGURATION=ON \
         -DOTELCPP_WITH_RESOURCE_DETECTORS_PREVIEW=ON \
@@ -402,7 +401,6 @@ elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then
         -DOTELCPP_WITH_OTLP_FILE=ON \
         -DOTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
         -DOTELCPP_WITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON \
-        -DOTELCPP_WITH_OTLP_RETRY_PREVIEW=ON \
         "${SRC_DIR}"
   cmake --build . "${CMAKE_BUILD_ARGS[@]}"
   ctest --output-on-failure
@@ -587,7 +585,6 @@ elif [[ "$1" == "cmake.legacy_options.test" ]]; then
         -DWITH_NO_DEPRECATED_CODE=ON \
         -DWITH_STL=ON \
         -DWITH_GSL=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=OFF \
         -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF \
         -DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON \
         -DWITH_OTLP_GRPC=ON \
@@ -625,7 +622,6 @@ elif [[ "$1" == "cmake.legacy_options.test" ]]; then
       WITH_NO_DEPRECATED_CODE \
       WITH_STL \
       WITH_GSL \
-      WITH_OTLP_RETRY_PREVIEW \
       WITH_OTLP_GRPC_SSL_MTLS_PREVIEW \
       WITH_OTLP_GRPC_CREDENTIAL_PREVIEW \
       WITH_OTLP_GRPC \
@@ -667,7 +663,6 @@ elif [[ "$1" == "cmake.legacy_options.test" ]]; then
       "OTELCPP_WITH_NO_DEPRECATED_CODE:BOOL=ON" \
       "OTELCPP_WITH_STL:STRING=ON" \
       "OTELCPP_WITH_GSL:BOOL=ON" \
-      "OTELCPP_WITH_OTLP_RETRY_PREVIEW:BOOL=OFF" \
       "OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW:BOOL=OFF" \
       "OTELCPP_WITH_OTLP_GRPC_CREDENTIAL_PREVIEW:BOOL=ON" \
       "OTELCPP_WITH_OTLP_GRPC:BOOL=ON" \

cmake/tools.cmake

@@ -353,8 +353,6 @@ set(_otelcpp_legacy_option_name_OTELCPP_WITH_OTLP_GRPC_SSL_MTLS_PREVIEW
 set(_otelcpp_legacy_option_name_OTELCPP_WITH_OTLP_HTTP "WITH_OTLP_HTTP")
 set(_otelcpp_legacy_option_name_OTELCPP_WITH_OTLP_HTTP_COMPRESSION
     "WITH_OTLP_HTTP_COMPRESSION")
-set(_otelcpp_legacy_option_name_OTELCPP_WITH_OTLP_RETRY_PREVIEW
-    "WITH_OTLP_RETRY_PREVIEW")
 set(_otelcpp_legacy_option_name_OTELCPP_WITH_OTLP_UTF8_VALIDITY
     "WITH_OTLP_UTF8_VALIDITY")
 set(_otelcpp_legacy_option_name_OTELCPP_WITH_PROMETHEUS "WITH_PROMETHEUS")

exporters/otlp/BUILD

@@ -107,7 +107,7 @@ cc_library(
     defines = select({
         ":enable_otlp_grpc_credential_preview": ["ENABLE_OTLP_GRPC_CREDENTIAL_PREVIEW"],
         "//conditions:default": [],
-    }) + ["ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW"] + ["ENABLE_OTLP_RETRY_PREVIEW"],
+    }) + ["ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW"],
     strip_include_prefix = "include",
     tags = [
         "otlp",
@@ -796,7 +796,6 @@ cc_test(
 cc_test(
     name = "otlp_http_exporter_test",
     srcs = ["test/otlp_http_exporter_test.cc"],
-    defines = ["ENABLE_OTLP_RETRY_PREVIEW"],
     tags = [
         "otlp",
         "otlp_http",

exporters/otlp/src/otlp_grpc_client.cc

@@ -7,16 +7,19 @@
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
+#include <algorithm>
 #include <atomic>
 #include <chrono>
 #include <cstdint>
+#include <cstdio>
 #include <fstream>
 #include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "opentelemetry/ext/http/common/url_parser.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 
 // clang-format off
@@ -31,14 +34,11 @@
 // clang-format on
 
 #ifdef ENABLE_ASYNC_EXPORT
-#  include <algorithm>
 #  include <condition_variable>
-#  include <cstdio>
 #  include <mutex>
 #  include <unordered_set>
 
 #  include "opentelemetry/common/timestamp.h"
-#  include "opentelemetry/nostd/string_view.h"
 #endif /* ENABLE_ASYNC_EXPORT */
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -414,7 +414,6 @@ void OtlpGrpcClient::PopulateChannelArguments(const OtlpGrpcClientOptions &optio
     grpc_arguments.SetCompressionAlgorithm(GRPC_COMPRESS_GZIP);
   }
 
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
   if (options.retry_policy_max_attempts > 0U &&
       options.retry_policy_initial_backoff > std::chrono::duration<float>::zero() &&
       options.retry_policy_max_backoff > std::chrono::duration<float>::zero() &&
@@ -453,7 +452,6 @@ void OtlpGrpcClient::PopulateChannelArguments(const OtlpGrpcClientOptions &optio
 
     grpc_arguments.SetServiceConfigJSON(service_config);
   }
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
 }
 
 std::unique_ptr<grpc::ClientContext> OtlpGrpcClient::MakeClientContext(

exporters/otlp/test/otlp_grpc_exporter_test.cc

@@ -8,15 +8,19 @@
 #include <cstddef>
 #include <cstdlib>
 #include <functional>
+#include <future>
 #include <map>
 #include <mutex>
 #include <string>
 #include <thread>
+#include <tuple>
 #include <utility>
+#include <variant>
 #include <vector>
 #include "gmock/gmock.h"
 
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/span.h"
@@ -26,7 +30,9 @@
 #include "opentelemetry/sdk/trace/processor.h"
 #include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor.h"
+#include "opentelemetry/sdk/trace/simple_processor_factory.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
+#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/test_common/sdk/common/scoped_test_log_handler.h"
 #include "opentelemetry/trace/span.h"
 #include "opentelemetry/trace/tracer.h"
@@ -43,19 +49,8 @@
 
 // IWYU pragma: no_include <grpc/support/port_platform.h>
 // IWYU pragma: no_include <grpcpp/support/status.h>
-
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-#  include <future>
-#  include <tuple>
-#  include <variant>
-
 // IWYU pragma: no_include <grpcpp/security/server_credentials.h>
 
-#  include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#  include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#  include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#endif
-
 #if defined(_MSC_VER)
 #  include "opentelemetry/sdk/common/env_variables.h"
 using opentelemetry::sdk::common::setenv;
@@ -620,7 +615,6 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryGenericValuesFromEnv)
 }
 #endif  // NO_GETENV
 
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
 namespace
 {
 struct TestTraceService : public opentelemetry::proto::collector::trace::v1::TraceService::Service
@@ -780,7 +774,6 @@ TEST_P(OtlpGrpcExporterRetryIntegrationTests, StatusCodes)
 
   ASSERT_EQ(expected_attempts, service.request_count_);
 }
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
 
 }  // namespace otlp
 }  // namespace exporter