couchbase 3.7.0 → 3.8.1

data/ext/cache/mozilla-ca-bundle.sha256

@@ -1 +1 @@
-f290e6acaf904a4121424ca3ebdd70652780707e28e8af999221786b86bb1975  cacert.pem
+86a1f3366afac7c6f8ae9f3c779ac221129328c43f0ab2b8817eb2f362a5025c  cacert.pem

data/ext/couchbase/CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 
 project(
   couchbase_cxx_client
-  VERSION "1.2.0"
+  VERSION "1.3.2"
   LANGUAGES CXX C)
 message(
   STATUS
@@ -61,6 +61,8 @@ endif()
 
 find_package(Threads REQUIRED)
 
+option(COUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY "Build with OpenTelemetry" ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT})
+
 include(cmake/ThirdPartyDependencies.cmake)
 
 include(cmake/VersionInfo.cmake)
@@ -75,15 +77,19 @@ set(couchbase_cxx_client_FILES
     core/agent_group.cxx
     core/agent_group_config.cxx
     core/analytics_query_options.cxx
+    core/app_telemetry_address.cxx
+    core/app_telemetry_meter.cxx
+    core/app_telemetry_reporter.cxx
     core/bucket.cxx
     core/cluster.cxx
     core/cluster_agent.cxx
     core/cluster_agent_config.cxx
+    core/cluster_credentials.cxx
     core/cluster_options.cxx
     core/collections_component.cxx
+    core/columnar/backoff_calculator.cxx
     core/columnar/columnar_agent.cxx
     core/columnar/columnar_agent_config.cxx
-    core/columnar/backoff_calculator.cxx
     core/columnar/columnar_error.cxx
     core/columnar/error_codes.cxx
     core/columnar/management_component.cxx
@@ -105,14 +111,13 @@ set(couchbase_cxx_client_FILES
     core/impl/binary_collection.cxx
     core/impl/boolean_field_query.cxx
     core/impl/boolean_query.cxx
-    core/impl/public_bucket.cxx
     core/impl/bucket_manager.cxx
-    core/impl/public_cluster.cxx
     core/impl/collection.cxx
     core/impl/collection_manager.cxx
     core/impl/common_error_category.cxx
     core/impl/configuration_profiles_registry.cxx
     core/impl/conjunction_query.cxx
+    core/impl/crypto.cxx
     core/impl/date_range.cxx
     core/impl/date_range_facet.cxx
     core/impl/date_range_facet_result.cxx
@@ -123,6 +128,7 @@ set(couchbase_cxx_client_FILES
     core/impl/doc_id_query.cxx
     core/impl/error.cxx
     core/impl/error_context.cxx
+    core/impl/node_id.cxx
     core/impl/expiry.cxx
     core/impl/fail_fast_retry_strategy.cxx
     core/impl/field_level_encryption_error_category.cxx
@@ -141,7 +147,6 @@ set(couchbase_cxx_client_FILES
     core/impl/internal_term_facet_result.cxx
     core/impl/key_value_error_category.cxx
     core/impl/key_value_error_context.cxx
-    core/impl/public_logger.cxx
     core/impl/lookup_in_replica.cxx
     core/impl/management_error_category.cxx
     core/impl/match_all_query.cxx
@@ -157,6 +162,11 @@ set(couchbase_cxx_client_FILES
     core/impl/observe_seqno.cxx
     core/impl/phrase_query.cxx
     core/impl/prefix_query.cxx
+    core/impl/public_bucket.cxx
+    core/impl/public_cluster.cxx
+    core/impl/public_logger.cxx
+    core/impl/public_scan_result.cxx
+    core/impl/public_transaction_get_result.cxx
     core/impl/query.cxx
     core/impl/query_error_category.cxx
     core/impl/query_error_context.cxx
@@ -166,7 +176,6 @@ set(couchbase_cxx_client_FILES
     core/impl/replica_utils.cxx
     core/impl/retry_action.cxx
     core/impl/retry_reason.cxx
-    core/impl/public_scan_result.cxx
     core/impl/scope.cxx
     core/impl/search.cxx
     core/impl/search_error_category.cxx
@@ -206,13 +215,13 @@ set(couchbase_cxx_client_FILES
     core/impl/transaction_error_category.cxx
     core/impl/transaction_get_multi_replicas_from_preferred_server_group_spec.cxx
     core/impl/transaction_get_multi_spec.cxx
-    core/impl/public_transaction_get_result.cxx
     core/impl/transaction_op_error_category.cxx
     core/impl/vector_query.cxx
     core/impl/vector_search.cxx
     core/impl/view_error_category.cxx
     core/impl/wildcard_query.cxx
     core/impl/crypto.cxx
+    core/impl/observability_recorder.cxx
     core/io/config_tracker.cxx
     core/io/dns_client.cxx
     core/io/dns_config.cxx
@@ -339,6 +348,7 @@ set(couchbase_cxx_client_FILES
     core/operations/management/view_index_get_all.cxx
     core/operations/management/view_index_upsert.cxx
     core/origin.cxx
+    core/orphan_reporter.cxx
     core/platform/base64.cc
     core/platform/dirutils.cc
     core/platform/random.cc
@@ -387,16 +397,19 @@ set(couchbase_cxx_client_FILES
     core/sasl/client.cc
     core/sasl/context.cc
     core/sasl/mechanism.cc
+    core/sasl/oauthbearer/oauthbearer.cc
     core/sasl/plain/plain.cc
     core/sasl/scram-sha/scram-sha.cc
     core/sasl/scram-sha/stringutils.cc
     core/scan_result.cxx
     core/search_query_options.cxx
     core/seed_config.cxx
+    core/tls_context_provider.cxx
     core/topology/capabilities.cxx
     core/topology/configuration.cxx
     core/tracing/threshold_logging_tracer.cxx
     core/tracing/tracer_wrapper.cxx
+    core/tracing/wrapper_sdk_tracer.cxx
     core/transactions/active_transaction_record.cxx
     core/transactions/async_attempt_context.cxx
     core/transactions/atr_cleanup_entry.cxx
@@ -424,6 +437,7 @@ set(couchbase_cxx_client_FILES
     core/transactions/utils.cxx
     core/utils/binary.cxx
     core/utils/connection_string.cxx
+    core/utils/contains_string.cxx
     core/utils/duration_parser.cxx
     core/utils/json.cxx
     core/utils/json_streaming_lexer.cxx
@@ -432,10 +446,8 @@ set(couchbase_cxx_client_FILES
     core/utils/url_codec.cxx
     core/view_query_options.cxx
     core/websocket_codec.cxx
-    core/app_telemetry_address.cxx
-    core/app_telemetry_meter.cxx
-    core/app_telemetry_reporter.cxx
-    core/cluster_credentials.cxx)
+    core/cluster_label_listener.cxx
+)
 
 set(couchbase_cxx_client_LIBRARIES)
 set(couchbase_cxx_client_DEFAULT_LIBRARY)
@@ -520,6 +532,9 @@ foreach(TARGET ${couchbase_cxx_client_LIBRARIES})
             $<BUILD_INTERFACE:asio>
             $<BUILD_INTERFACE:couchbase_backtrace>
             $<BUILD_INTERFACE:jsonsl>)
+  if(COUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY)
+    target_link_libraries(${TARGET} PRIVATE $<BUILD_INTERFACE:opentelemetry_api>)
+  endif()
 
   if(HAVE_BACKTRACE)
     target_link_libraries(${TARGET} PRIVATE ${PLATFORM_LIBRARIES})

data/ext/couchbase/cmake/APKBUILD.in

@@ -5,8 +5,19 @@ pkgname=couchbase-cxx-client
 pkgver=@COUCHBASE_CXX_CLIENT_PACKAGE_VERSION@
 pkgrel=1
 _number_of_commits=@COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS@
+_git_revision_short=@COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT@
 if [ "${_number_of_commits}" -gt 0 ]; then
-	pkgver="${pkgver}_p${_number_of_commits}"
+	# Encode commit count and git hash into _p version for uniqueness
+	# Extract first 3 hex bytes from git hash, convert to decimal
+	# Map each byte mod 100 to create 6-digit suffix
+	# Formula: p = commits × 10_000_000 + (byte1%100)*10000 + (byte2%100)*100 + (byte3%100)
+	# Example: 1.2.0-75-gfeb729b2 → 1.2.0_p750548341
+	_b1=$((0x${_git_revision_short:0:2}))
+	_b2=$((0x${_git_revision_short:2:2}))
+	_b3=$((0x${_git_revision_short:4:2}))
+	_sha_pack=$(( (_b1 % 100) * 10000 + (_b2 % 100) * 100 + (_b3 % 100) ))
+	_p_version=$(( _number_of_commits * 10000000 + _sha_pack ))
+	pkgver="${pkgver}_p${_p_version}"
 fi
 source="${pkgname}-${pkgver}.tar.gz"
 pkgdesc="Couchbase C++ SDK"
@@ -18,6 +29,10 @@ makedepends="
 	linux-headers
 	cmake
 	ninja
+	curl-dev
+	protobuf-dev
+	grpc-dev
+	nlohmann-json
 "
 subpackages="${pkgname}-dev ${pkgname}-tools"
 options="!check"
@@ -36,6 +51,7 @@ build() {
 		-DCOUCHBASE_CXX_CLIENT_STATIC_BORINGSSL=ON \
 		-DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \
 		-DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF \
+		-DCOUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY=ON \
 		-DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=ON \
 		-DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON \
 		-DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON

data/ext/couchbase/cmake/Bundler.cmake

@@ -88,10 +88,18 @@ function(bundle_static_library tgt_name bundled_tgt_name)
       set(ar_tool ${CMAKE_CXX_COMPILER_AR})
     endif()
 
+    if(APPLE)
+      find_program(SED gsed)
+    else()
+      find_program(SED sed)
+    endif()
+
     add_custom_command(
-      COMMAND ${ar_tool} -M < ${CMAKE_BINARY_DIR}/${bundled_tgt_name}.ar
+      COMMAND ${SED} -i "s|${CMAKE_BINARY_DIR}/||g" ${bundled_tgt_name}.ar
+      COMMAND ${ar_tool} -M < ${bundled_tgt_name}.ar
       OUTPUT ${bundled_tgt_full_name}
       DEPENDS ${tgt_name} ${static_libs}
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMENT "Bundling ${bundled_tgt_name}"
       VERBATIM)
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")

data/ext/couchbase/cmake/Cache.cmake

@@ -3,27 +3,56 @@ if(NOT ENABLE_CACHE)
   return()
 endif()
 
-set(CACHE_OPTION
-    "ccache"
-    CACHE STRING "Compiler cache to be used")
-set(CACHE_OPTION_VALUES "ccache" "sccache")
-set_property(CACHE CACHE_OPTION PROPERTY STRINGS ${CACHE_OPTION_VALUES})
-list(
-  FIND
-  CACHE_OPTION_VALUES
-  ${CACHE_OPTION}
-  CACHE_OPTION_INDEX)
+if(NOT DEFINED CACHE_OPTION)
+  set(CACHE_OPTION "")
+endif()
+
+set(CACHE_OPTION_VALUES "sccache" "ccache")
 
-if(${CACHE_OPTION_INDEX} EQUAL -1)
-  message(
-    STATUS
-      "Using custom compiler cache system: '${CACHE_OPTION}', explicitly supported entries are ${CACHE_OPTION_VALUES}")
+if(CACHE_OPTION STREQUAL "")
+  find_program(SCCACHE_BIN sccache)
+  if(SCCACHE_BIN)
+    set(CACHE_OPTION "sccache")
+    set(CACHE_BINARY ${SCCACHE_BIN})
+  else()
+    find_program(CCACHE_BIN ccache)
+    if(CCACHE_BIN)
+      set(CACHE_OPTION "ccache")
+      set(CACHE_BINARY ${CCACHE_BIN})
+    else()
+      set(CACHE_OPTION "none")
+      set(CACHE_BINARY "")
+    endif()
+  endif()
+else()
+  if(NOT
+     CACHE_OPTION
+     IN_LIST
+     CACHE_OPTION_VALUES)
+    message(
+      STATUS
+        "Using custom compiler cache system: '${CACHE_OPTION}', explicitly supported entries are ${CACHE_OPTION_VALUES}"
+    )
+  endif()
+  find_program(CACHE_BINARY ${CACHE_OPTION})
 endif()
 
-find_program(CACHE_BINARY ${CACHE_OPTION})
-if(CACHE_BINARY)
-  message(STATUS "${CACHE_OPTION} found and enabled")
-  set(CMAKE_CXX_COMPILER_LAUNCHER ${CACHE_BINARY})
+if(CACHE_OPTION STREQUAL "none" OR CACHE_BINARY STREQUAL "")
+  message(WARNING "No compiler cache found or enabled; building without compiler cache")
 else()
-  message(WARNING "${CACHE_OPTION} is enabled but was not found. Not using it")
+  if(CMAKE_GENERATOR MATCHES "Visual Studio")
+    message(WARNING "Compiler cache (sccache/ccache) ignored with Visual Studio generator + MSVC. Use -GNinja instead.")
+    return()
+  endif()
+
+  message(STATUS "Compiler cache '${CACHE_OPTION}' found at: ${CACHE_BINARY}")
+  set(CMAKE_CXX_COMPILER_LAUNCHER ${CACHE_BINARY})
+  set(CMAKE_C_COMPILER_LAUNCHER ${CACHE_BINARY})
+  if(MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
+    set(CMAKE_C_FLAGS_DEBUG "/Z7 /Od /RTC1 /FS")
+    set(CMAKE_CXX_FLAGS_DEBUG "/Z7 /Od /RTC1 /FS")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Z7 /O2 /FS")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Z7 /O2 /FS")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+  endif()
 endif()

data/ext/couchbase/cmake/CompilerOptions.cmake

@@ -42,7 +42,9 @@ function(set_project_options target_name)
   endif()
 
   if(HAVE_BACKTRACE OR HAVE_DLADDR)
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+       AND NOT APPLE
+       AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
       target_compile_options(${target_name} PRIVATE -ggdb3)
     endif()
     target_compile_definitions(${target_name} PRIVATE -D_GNU_SOURCE=1)

data/ext/couchbase/cmake/OpenSSL.cmake

@@ -209,10 +209,18 @@ if(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE)
   file(READ "${COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT}/mozilla-ca-bundle.crt" CA_BUNDLE_CONTENT)
   string(
     REGEX MATCH
-          "Certificate data from Mozilla as of: ([^\n]*)"
+          "Certificate data from Mozilla (as of|last updated on): ([^\n]*)"
           CA_BUNDLE_DATE_LINE
           ${CA_BUNDLE_CONTENT})
-  set(COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "${CMAKE_MATCH_1}")
+  if(CA_BUNDLE_DATE_LINE)
+    set(COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "${CMAKE_MATCH_2}")
+  else()
+    message(
+      WARNING
+        "Failed to extract Mozilla CA bundle date from certificate file; "
+        "COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE will be set to 'unknown'.")
+    set(COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "unknown")
+  endif()
 else()
   set(CA_BUNDLE_CONTENT "")
 endif()

data/ext/couchbase/cmake/Packaging.cmake

@@ -84,6 +84,12 @@ add_custom_command(
 set(COUCHBASE_CXX_TARBALL_THIRD_PARTY_GLOB_FILE ${PROJECT_SOURCE_DIR}/cmake/tarball_glob.txt)
 
 if(COUCHBASE_CXX_RECORD_BUILD_INFO_FOR_TARBALL)
+  if(CPM_USE_NAMED_CACHE_DIRECTORIES)
+    get_filename_component(opentelemetry_SOURCE_DIR_PARENT "${opentelemetry_SOURCE_DIR}" DIRECTORY)
+    get_filename_component(opentelemetry_CPM_HASH "${opentelemetry_SOURCE_DIR_PARENT}" NAME)
+  else()
+    get_filename_component(opentelemetry_CPM_HASH "${opentelemetry_SOURCE_DIR}" NAME)
+  endif()
   file(
     WRITE "${CMAKE_SOURCE_DIR}/cmake/TarballRelease.cmake"
     "
@@ -91,6 +97,7 @@ set(CPM_DOWNLOAD_ALL OFF CACHE BOOL \"\" FORCE)
 set(CPM_USE_NAMED_CACHE_DIRECTORIES ON CACHE BOOL \"\" FORCE)
 set(CPM_USE_LOCAL_PACKAGES OFF CACHE BOOL \"\" FORCE)
 set(CPM_SOURCE_CACHE \"\${PROJECT_SOURCE_DIR}/third_party_cache\" CACHE STRING \"\" FORCE)
+set(OTELCPP_PROTO_PATH \"\${PROJECT_SOURCE_DIR}/third_party_cache/opentelemetry/${opentelemetry_CPM_HASH}/opentelemetry/third_party/opentelemetry-proto\" CACHE STRING \"\" FORCE)
 set(COUCHBASE_CXX_CLIENT_GIT_REVISION \"${COUCHBASE_CXX_CLIENT_GIT_REVISION}\")
 set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE \"${COUCHBASE_CXX_CLIENT_GIT_DESCRIBE}\")
 set(COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP \"${COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP}\")
@@ -112,16 +119,36 @@ add_custom_command(
     -DCPM_SOURCE_CACHE="${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache"
     -DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT="${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache"
     -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF -DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=ON -DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF
+    -DCOUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY=ON
     -DCOUCHBASE_CXX_CLIENT_STATIC_BORINGSSL=ON -DCPM_DOWNLOAD_ALL=ON -DCPM_USE_NAMED_CACHE_DIRECTORIES=ON
     -DCPM_USE_LOCAL_PACKAGES=OFF -DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON
     -DCOUCHBASE_CXX_CLIENT_INSTALL=ON -DCOUCHBASE_CXX_RECORD_BUILD_INFO_FOR_TARBALL=ON
   COMMAND
-    ${XARGS} --arg-file=${COUCHBASE_CXX_TARBALL_THIRD_PARTY_GLOB_FILE} -I {} find
+    ${XARGS} -a ${COUCHBASE_CXX_TARBALL_THIRD_PARTY_GLOB_FILE} -I {} find
     "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache" -wholename "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/cache/{}"
-    -type f | grep -v "crypto_test_data\\|googletest" | uniq >
+    -type f
+    | grep -v
+        -e "/benchmark"
+        -e "/opentelemetry.*/functional"
+        -e "/opentelemetry.*/install"
+        -e "/opentelemetry.*/test"
+        -e "/opentelemetry/examples"
+        -e "/opentelemetry/docker"
+        -e "/opentelemetry/exporters/elasticsearch"
+        -e "/opentelemetry/exporters/etw"
+        -e "/opentelemetry/exporters/prometheus"
+        -e "/opentelemetry/exporters/zipkin"
+        -e "/opentelemetry/opentracing-.*"
+        -e "/opentelemetry/third_party/ms-gsl"
+        -e "/opentelemetry/third_party/nlohmann-json"
+        -e "/opentelemetry/third_party/prometheus-cpp"
+        -e "/opentelemetry/tools"
+        -e "crypto_test_data"
+        -e "googletest"
+    | uniq >
     "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/third_party_manifest.txt"
   COMMAND ${CMAKE_COMMAND} -E make_directory "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/filtered_cache"
-  COMMAND ${XARGS} --arg-file="${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/third_party_manifest.txt" -I {} ${CP} --parents
+  COMMAND ${XARGS} -a "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/third_party_manifest.txt" -I {} ${CP} --parents
           {} "${COUCHBASE_CXX_CLIENT_TARBALL_NAME}/tmp/filtered_cache"
   COMMAND
     ${CMAKE_COMMAND} -E rename
@@ -263,7 +290,7 @@ if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
   set(COUCHBASE_CXX_CLIENT_SPEC "${PROJECT_BINARY_DIR}/packaging/couchbase-cxx-client.spec")
   configure_file(${PROJECT_SOURCE_DIR}/cmake/couchbase-cxx-client.spec.in "${COUCHBASE_CXX_CLIENT_SPEC}" @ONLY)
 
-  set(COUCHBASE_CXX_CLIENT_DEFAULT_ROOT "rocky-9-${CMAKE_SYSTEM_PROCESSOR}")
+  set(COUCHBASE_CXX_CLIENT_DEFAULT_ROOT "rocky+epel-9-${CMAKE_SYSTEM_PROCESSOR}")
   set(COUCHBASE_CXX_CLIENT_RPM_NAME
       "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}-${COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE}")
   set(COUCHBASE_CXX_CLIENT_SRPM "${PROJECT_BINARY_DIR}/packaging/srpm/${COUCHBASE_CXX_CLIENT_RPM_NAME}.el9.src.rpm")
@@ -282,9 +309,9 @@ if(COUCHBASE_CXX_CLIENT_RPM_TARGETS)
     APPEND
     COUCHBASE_CXX_CLIENT_SUPPORTED_ROOTS
     "opensuse-leap-15.6-${CMAKE_SYSTEM_PROCESSOR}"
-    "rocky-10-${CMAKE_SYSTEM_PROCESSOR}"
-    "rocky-9-${CMAKE_SYSTEM_PROCESSOR}"
-    "rocky-8-${CMAKE_SYSTEM_PROCESSOR}"
+    "rocky+epel-10-${CMAKE_SYSTEM_PROCESSOR}"
+    "rocky+epel-9-${CMAKE_SYSTEM_PROCESSOR}"
+    "rocky+epel-8-${CMAKE_SYSTEM_PROCESSOR}"
     "amazonlinux-2023-${CMAKE_SYSTEM_PROCESSOR}"
     "fedora-43-${CMAKE_SYSTEM_PROCESSOR}"
     "fedora-42-${CMAKE_SYSTEM_PROCESSOR}"
@@ -327,8 +354,21 @@ if(COUCHBASE_CXX_CLIENT_APK_TARGETS)
   set(COUCHBASE_CXX_CLIENT_TARBALL_ALPINE
       "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE}.tar.gz")
   if(${COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS} GREATER 0)
+    # Encode commit count and git hash into _p version for uniqueness
+    # Extract first 3 bytes from git hash (7-char short hash), convert to decimal
+    # Map each byte mod 100 to create 6-digit suffix
+    # Formula: p = commits × 10_000_000 + (byte1%100)*10000 + (byte2%100)*100 + (byte3%100)
+    # Example: 1.2.0-75-gfeb729b2 → 1.2.0_p750548341
+    string(SUBSTRING "${COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT}" 0 2 _b1_hex)
+    string(SUBSTRING "${COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT}" 2 2 _b2_hex)
+    string(SUBSTRING "${COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT}" 4 2 _b3_hex)
+    math(EXPR _b1 "0x${_b1_hex}")
+    math(EXPR _b2 "0x${_b2_hex}")
+    math(EXPR _b3 "0x${_b3_hex}")
+    math(EXPR _sha_pack "(${_b1} % 100) * 10000 + (${_b2} % 100) * 100 + (${_b3} % 100)")
+    math(EXPR _p_version "${COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS} * 10000000 + ${_sha_pack}")
     set(COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE
-        "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}_p${COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS}")
+        "couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_PACKAGE_VERSION}_p${_p_version}")
     set(COUCHBASE_CXX_CLIENT_TARBALL_ALPINE
         "${PROJECT_BINARY_DIR}/packaging/${COUCHBASE_CXX_CLIENT_TARBALL_NAME_ALPINE}.tar.gz")
   endif()

data/ext/couchbase/cmake/ThirdPartyDependencies.cmake

@@ -39,6 +39,46 @@ if(NOT TARGET spdlog::spdlog)
     "SPDLOG_FMT_EXTERNAL OFF")
 endif()
 
+if(COUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY)
+  if(NOT TARGET opentelemetry)
+    # Disable curl HTTP client to avoid curl downloading and linking to BoringSSL
+    # OpenTelemetry will fall back to using its own HTTP client implementation
+    # This avoids CMake export errors when curl tries to reference ssl/crypto targets
+    
+    # https://github.com/open-telemetry/opentelemetry-cpp/releases
+    cpmaddpackage(
+      NAME
+      opentelemetry
+      VERSION
+      1.23.0
+      GITHUB_REPOSITORY
+      "open-telemetry/opentelemetry-cpp"
+      EXCLUDE_FROM_ALL ON
+      OPTIONS
+      "protobuf_MSVC_STATIC_RUNTIME OFF"
+      "OPENTELEMETRY_INSTALL OFF"
+      "WITH_ABI_VERSION_1 OFF"
+      "WITH_ABI_VERSION_2 ON"
+      "WITH_BENCHMARK OFF"
+      "WITH_EXAMPLES OFF"
+      "WITH_FUNC_TESTS OFF"
+      "WITH_OTLP_GRPC OFF"
+      "WITH_OTLP_HTTP ON"
+      "WITH_HTTP_CLIENT_CURL OFF"
+      "WITH_PROMETHEUS OFF"
+      "WITH_OPENTRACING OFF"
+      "WITH_STL CXX17"
+      "BUILD_TESTING OFF"
+      "BUILD_SHARED_LIBS OFF"
+      "CMAKE_C_VISIBILITY_PRESET hidden"
+      "CMAKE_CXX_VISIBILITY_PRESET hidden"
+      "CMAKE_POSITION_INDEPENDENT_CODE ON")
+  endif()
+
+  declare_system_library(opentelemetry_exporter_otlp_http)
+  declare_system_library(opentelemetry_exporter_otlp_http_metric)
+endif()
+
 if(NOT TARGET Microsoft.GSL::GSL)
   # https://github.com/microsoft/GSL/releases
   cpmaddpackage(
@@ -185,8 +225,9 @@ if(asio_ADDED)
   target_link_libraries(asio PRIVATE Threads::Threads)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
     target_link_libraries(asio PUBLIC $<TARGET_OBJECTS:ssl> $<TARGET_OBJECTS:crypto>)
+    # Add BoringSSL include directories before asio's own include directories.
     target_include_directories(
-      asio SYSTEM PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:ssl,INTERFACE_INCLUDE_DIRECTORIES>>
+      asio BEFORE PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:ssl,INTERFACE_INCLUDE_DIRECTORIES>>
                           $<BUILD_INTERFACE:$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>>)
   elseif(NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
     target_link_libraries(asio PRIVATE OpenSSL::SSL OpenSSL::Crypto)
@@ -264,3 +305,4 @@ declare_system_library(Microsoft.GSL::GSL)
 declare_system_library(spdlog::spdlog)
 declare_system_library(asio)
 declare_system_library(taocpp::json)
+declare_system_library(snappy)

data/ext/couchbase/cmake/build_config.hxx.in

@@ -24,3 +24,5 @@
 #cmakedefine COUCHBASE_CXX_CLIENT_BORINGSSL_SHA "@COUCHBASE_CXX_CLIENT_BORINGSSL_SHA@"
 #cmakedefine COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL
 #cmakedefine COUCHBASE_CXX_CLIENT_COLUMNAR
+#cmakedefine COUCHBASE_CXX_CLIENT_CREATE_OPERATION_SPAN_IN_CORE
+#cmakedefine COUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY

data/ext/couchbase/cmake/couchbase-cxx-client.spec.in

@@ -12,6 +12,19 @@ BuildRequires: gcc13, gcc13-c++
 BuildRequires: gcc, gcc-c++
 %endif
 BuildRequires: cmake >= 3.19
+%if 0%{?suse_version} > 0
+BuildRequires: libcurl-devel
+BuildRequires: protobuf-devel
+BuildRequires: nlohmann_json-devel
+%else
+%if 0%{?amzn} == 0 && (0%{?rhel} >= 9 || 0%{?fedora} > 0)
+BuildRequires: curl-devel
+BuildRequires: protobuf-devel
+BuildRequires: json-devel
+%else
+# CentOS 8 / Rocky 8 - skip these packages (no OpenTelemetry)
+%endif
+%endif
 Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
 
 %if 0%{?amzn}
@@ -50,6 +63,11 @@ Development files for the Couchbase C++ SDK.
     -DCOUCHBASE_CXX_CLIENT_STATIC_BORINGSSL=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \
     -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF \
+%if 0%{?amzn} == 0 && (0%{?rhel} >= 9 || 0%{?fedora} > 0 || 0%{?suse_version} > 0)
+    -DCOUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY=ON \
+%else
+    -DCOUCHBASE_CXX_CLIENT_BUILD_OPENTELEMETRY=OFF \
+%endif
     -DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON

data/ext/couchbase/cmake/tarball_glob.txt

@@ -90,3 +90,13 @@ spdlog/*/spdlog/include/*
 spdlog/*/spdlog/include/**/*
 spdlog/*/spdlog/src/*
 spdlog/*/spdlog/src/**/*
+opentelemetry/*/opentelemetry/CMakeLists.txt
+opentelemetry/*/opentelemetry/CMakeSettings.json
+opentelemetry/*/opentelemetry/LICENSE
+opentelemetry/*/opentelemetry/*/CMakeLists.txt
+opentelemetry/*/opentelemetry/cmake/*
+opentelemetry/*/opentelemetry/**/CMakeLists.txt
+opentelemetry/*/opentelemetry/**/LICENSE
+opentelemetry/*/opentelemetry/**/*.h
+opentelemetry/*/opentelemetry/**/*.cc
+opentelemetry/*/opentelemetry/third_party/opentelemetry-proto/opentelemetry/proto/**/*.proto

data/ext/couchbase/core/app_telemetry_meter.cxx

@@ -18,6 +18,7 @@
 #include "logger/logger.hxx"
 #include "meta/version.hxx"
 #include "topology/configuration.hxx"
+#include "utils/binary.hxx"
 #include "utils/json.hxx"
 
 #include <spdlog/fmt/bin_to_hex.h>