Merge branch 'main' into fix/4625-narrow-ext-headers

Author: ParthibanRajasekaran

.devcontainer/Dockerfile.conan

@@ -1,6 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:24.04@sha256:a853f94d226358a79c740cfc7bce0c289748f3fe3488d921d038ccd752c61b60
+FROM ubuntu:24.04@sha256:534baea6a22c03a63003dbc8dbe78fe34bc0d7e595d9a9dc9834884ff530eb55
 
 RUN apt update && apt install -y \
 	build-essential \

.devcontainer/Dockerfile.dev

@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ubuntu:24.04@sha256:a853f94d226358a79c740cfc7bce0c289748f3fe3488d921d038ccd752c61b60
+FROM ubuntu:24.04@sha256:534baea6a22c03a63003dbc8dbe78fe34bc0d7e595d9a9dc9834884ff530eb55
 
 ARG USER_UID=1000
 ARG USER_GID=1000

.github/workflows/publish-to-bcr.yml

@@ -25,7 +25,7 @@ jobs:
       contents: write
       id-token: write
       attestations: write
-    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@ca23149e55cd4db07a6bcce69c02dea314c5a357 # v1.5.0
+    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@fa5bb3803983c621c90721669ee7857afe139836 # v1.5.1
     with:
       tag_name: ${{ inputs.tag_name || github.event.release.tag_name }}
       registry_fork: ${{ inputs.registry_fork || 'open-telemetry/bazel-central-registry' }}

CHANGELOG.md

@@ -114,6 +114,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")