Merge branch 'main' into fuzztest

.github/workflows/benchmark.yml

@@ -35,7 +35,7 @@ jobs:
           mv api-benchmark_result.json benchmarks
           mv sdk-benchmark_result.json benchmarks
           mv exporters-benchmark_result.json benchmarks
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: benchmark_results
           path: benchmarks

.github/workflows/ci.yml

@@ -202,6 +202,22 @@ jobs:
     - name: run tests
       run: ./ci/do_ci.ps1 cmake.maintainer.test
 
+  cmake_msvc_maintainer_test_stl_cxx20:
+    name: CMake msvc (maintainer mode) with C++20
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: setup
+      run: |
+        ./ci/setup_windows_cmake.ps1
+        ./ci/setup_windows_ci_environment.ps1
+    - name: run tests
+      env:
+        CXX_STANDARD: '20'
+      run: ./ci/do_ci.ps1 cmake.maintainer.cxx20.stl.test
+
   cmake_with_async_export_test:
     name: CMake test (without otlp-exporter and with async export)
     runs-on: ubuntu-latest
@@ -683,7 +699,7 @@ jobs:
         env BENCHMARK_DIR=/benchmark
         ./ci/do_ci.sh benchmark
     - name: Upload benchmark results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: benchmark_reports
         path: /home/runner/benchmark

.github/workflows/codeql-analysis.yml

@@ -27,10 +27,10 @@ jobs:
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
        languages: cpp
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/dependencies_image.yml

@@ -39,7 +39,7 @@ jobs:
         docker save -o /opt/otel-cpp-deps-debian.tar otel-cpp-deps
     -
       name: Upload Image
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: otel-cpp-deps
         path: /opt/otel-cpp-deps-debian.tar

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: "This issue was marked as stale due to lack of activity."
           days-before-issue-stale: 60

CHANGELOG.md

@@ -15,20 +15,88 @@ Increment the:
 
 ## [Unreleased]
 
+* [REMOVAL] Remove option WITH_OTLP_HTTP_SSL_PREVIEW
+  [#2435](https://github.com/open-telemetry/opentelemetry-cpp/pull/2435)
+* [BUILD] Fix removing of NOMINMAX on Windows
+  [#2449](https://github.com/open-telemetry/opentelemetry-cpp/pull/2449)
+* [BUILD] Introduce CXX 20 CI pipeline for MSVC/Windows
+  [#2450](https://github.com/open-telemetry/opentelemetry-cpp/pull/2450)
+* [EXPORTER] Set `is_monotonic` flag for Observable Counters
+  [#2478](https://github.com/open-telemetry/opentelemetry-cpp/pull/2478)
+
+Important changes:
+
+Breaking changes:
+
+* [REMOVAL] Remove option WITH_OTLP_HTTP_SSL_PREVIEW
+  [#2435](https://github.com/open-telemetry/opentelemetry-cpp/pull/2435)
+  * CMake options `WITH_OTLP_HTTP_SSL_PREVIEW`
+    and `WITH_OTLP_HTTP_SSL_TLS_PREVIEW` are removed.
+    Building opentelemetry-cpp without SSL support is no longer possible.
+
+## [1.13.0] 2023-12-06
+
 * [BUILD] Remove WITH_REMOVE_METER_PREVIEW, use WITH_ABI_VERSION_2 instead
   [#2370](https://github.com/open-telemetry/opentelemetry-cpp/pull/2370)
+* [SDK] Metrics ObservableRegistry Cleanup
+  [#2376](https://github.com/open-telemetry/opentelemetry-cpp/pull/2376)
 * [BUILD] Make WITH_OTLP_HTTP_SSL_PREVIEW mainstream
   [#2378](https://github.com/open-telemetry/opentelemetry-cpp/pull/2378)
+* [SDK] Creating DoubleUpDownCounter with no matching view
+  [#2379](https://github.com/open-telemetry/opentelemetry-cpp/pull/2379)
 * [API] Add InstrumentationScope attributes in TracerProvider::GetTracer()
   [#2371](https://github.com/open-telemetry/opentelemetry-cpp/pull/2371)
+* [BUILD] DLL export interface for Metrics
+  [#2344](https://github.com/open-telemetry/opentelemetry-cpp/pull/2344)
 * [BUILD] enum CanonicalCode names too generic... conflict with old C defines
   [#2385](https://github.com/open-telemetry/opentelemetry-cpp/pull/2385)
+* [BUILD] Fix cpack broken package version
+  [#2386](https://github.com/open-telemetry/opentelemetry-cpp/pull/2386)
 * [API] Add a new AddLink() operation to Span
   [#2380](https://github.com/open-telemetry/opentelemetry-cpp/pull/2380)
+* [opentracing-shim] Add check for sampled context
+  [#2390](https://github.com/open-telemetry/opentelemetry-cpp/pull/2390)
+* [BUILD] Fix exported definitions when building DLL with STL
+  [#2387](https://github.com/open-telemetry/opentelemetry-cpp/pull/2387)
+* [BUILD] Add missing includes to runtime_context_test
+  [#2395](https://github.com/open-telemetry/opentelemetry-cpp/pull/2395)
+* [ADMIN] Add file .github/repository-settings.md
+  [#2392](https://github.com/open-telemetry/opentelemetry-cpp/pull/2392)
 * [SDK] Fix GetLogger with empty library name
   [#2398](https://github.com/open-telemetry/opentelemetry-cpp/pull/2398)
+* [TEST] Fix compiling problem and removed -DENABLE_TEST
+  [#2401](https://github.com/open-telemetry/opentelemetry-cpp/pull/2401)
+* [BUILD] Check windows options are not passed to non-Windows build
+  [#2399](https://github.com/open-telemetry/opentelemetry-cpp/pull/2399)
 * [EXPORTER] Rework OTLP/HTTP and OTLP/GRPC exporter options
   [#2388](https://github.com/open-telemetry/opentelemetry-cpp/pull/2388)
+* [Build] Update vcpkg to latest release
+  [#2412](https://github.com/open-telemetry/opentelemetry-cpp/pull/2412)
+* [SDK] Cardinality limits for metrics streams
+  (Sync Instruments + Delta Temporality)
+  [#2255](https://github.com/open-telemetry/opentelemetry-cpp/pull/2255)
+* [EXPORTER] Prometheus: Add unit to names, convert to word
+  [#2213](https://github.com/open-telemetry/opentelemetry-cpp/pull/2213)
+* [Metrics] Make context optional for histogram instruments in Metrics SDK
+  [#2416](https://github.com/open-telemetry/opentelemetry-cpp/pull/2416)
+* [BUILD] Fix references to trace namespace to be fully qualified
+  [#2422](https://github.com/open-telemetry/opentelemetry-cpp/pull/2422)
+* [BUILD] Bump third_party/googletest to same version as bazel
+  [#2421](https://github.com/open-telemetry/opentelemetry-cpp/pull/2421)
+* [BUILD] Remove defining NOMINMAX from api
+  [#2420](https://github.com/open-telemetry/opentelemetry-cpp/pull/2420)
+* [BUILD] 'uint8_t' not declared in this scope with gcc 13.2.1
+  [#2423](https://github.com/open-telemetry/opentelemetry-cpp/pull/2423)
+* [BUILD] Improve the handling of OPENTELEMETRY_HAVE_WORKING_REGEX
+  [#2430](https://github.com/open-telemetry/opentelemetry-cpp/pull/2430)
+* [SEMANTIC CONVENTION] Upgrade to semconv 1.23.1
+  [#2428](https://github.com/open-telemetry/opentelemetry-cpp/pull/2428)
+* [BUILD] Use fully qualified references to trace/common namespace
+  [#2424](https://github.com/open-telemetry/opentelemetry-cpp/pull/2424)
+* [API] Create root span with active span
+  [#2427](https://github.com/open-telemetry/opentelemetry-cpp/pull/2427)
+* [REMOVAL] Remove ZPAGES
+  [#2433](https://github.com/open-telemetry/opentelemetry-cpp/pull/2433)
 
 Important changes:
 
@@ -101,6 +169,11 @@ Breaking changes:
   * Please check configuration variables,
     to make sure `_LOGS_` variables are set as expected.
 
+* [REMOVAL] Remove ZPAGES
+  [#2433](https://github.com/open-telemetry/opentelemetry-cpp/pull/2433)
+  * As announced in release 1.12.0,
+    the deprecated ZPAGES exporter is now removed.
+
 ## [1.12.0] 2023-10-16
 
 * [BUILD] Support `pkg-config`

CMakeLists.txt

@@ -212,9 +212,6 @@ option(WITH_PROMETHEUS "Whether to include the Prometheus Client in the SDK"
 option(WITH_ELASTICSEARCH
        "Whether to include the Elasticsearch Client in the SDK" OFF)
 
-option(WITH_ZPAGES
-       "DEPRECATED - Whether to include the Zpages Server in the SDK" OFF)
-
 option(WITH_NO_GETENV "Whether the platform supports environment variables" OFF)
 
 option(BUILD_TESTING "Whether to enable tests" ON)
@@ -281,25 +278,10 @@ endif()
 
 option(WITH_ASYNC_EXPORT_PREVIEW "Whether to enable async export" OFF)
 
-# STABLE
-option(WITH_OTLP_HTTP_SSL_PREVIEW "Whether to enable otlp http ssl export" ON)
-
-# STABLE
-option(WITH_OTLP_HTTP_SSL_TLS_PREVIEW
-       "Whether to enable otlp http ssl tls min/max/cipher options" ON)
-
 # Exemplar specs status is experimental, so behind feature flag by default
 option(WITH_METRICS_EXEMPLAR_PREVIEW
        "Whether to enable exemplar within metrics" OFF)
 
-if(WITH_ZPAGES)
-  if(WITH_NO_DEPRECATED_CODE)
-    message(FATAL_ERROR "WITH_ZPAGES is DEPRECATED.")
-  else()
-    message(WARNING "WITH_ZPAGES is DEPRECATED.")
-  endif()
-endif()
-
 #
 # Verify options dependencies
 #
@@ -308,13 +290,6 @@ if(WITH_EXAMPLES_HTTP AND NOT WITH_EXAMPLES)
   message(FATAL_ERROR "WITH_EXAMPLES_HTTP=ON requires WITH_EXAMPLES=ON")
 endif()
 
-if(WITH_OTLP_HTTP_SSL_TLS_PREVIEW AND NOT WITH_OTLP_HTTP_SSL_PREVIEW)
-  message(
-    FATAL_ERROR
-      "WITH_OTLP_HTTP_SSL_TLS_PREVIEW=ON requires WITH_OTLP_HTTP_SSL_PREVIEW=ON"
-  )
-endif()
-
 find_package(Threads)
 
 function(install_windows_deps)
@@ -482,7 +457,6 @@ endif()
 if(WITH_ELASTICSEARCH
    OR WITH_ZIPKIN
    OR WITH_OTLP_HTTP
-   OR WITH_ZPAGES
    OR BUILD_W3CTRACECONTEXT_TEST
    OR WITH_ETW)
   set(USE_NLOHMANN_JSON ON)
@@ -592,12 +566,10 @@ if(BUILD_TESTING)
         ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/include
         ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googlemock/include)
     if(TARGET gtest)
-      set(GTEST_BOTH_LIBRARIES gtest gtest_main gmock)
+      set(GTEST_BOTH_LIBRARIES gtest gtest_main)
     else()
-      set(GTEST_BOTH_LIBRARIES
-          ${CMAKE_BINARY_DIR}/lib/libgtest.a
-          ${CMAKE_BINARY_DIR}/lib/libgtest_main.a
-          ${CMAKE_BINARY_DIR}/lib/libgmock.a)
+      set(GTEST_BOTH_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libgtest.a
+                               ${CMAKE_BINARY_DIR}/lib/libgtest_main.a)
     endif()
   elseif(WIN32)
     # Make sure we are always bootsrapped with vcpkg on Windows
@@ -614,7 +586,7 @@ if(BUILD_TESTING)
   if(NOT GTEST_BOTH_LIBRARIES)
     # New GTest package names
     if(TARGET GTest::gtest)
-      set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main GTest::gmock)
+      set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main)
     elseif(TARGET GTest::GTest)
       set(GTEST_BOTH_LIBRARIES GTest::GTest GTest::Main)
     endif()

DEPRECATED.md

@@ -92,89 +92,7 @@ N/A
 
 ## [opentelemetry-cpp Exporter]
 
-### ZPages exporter
-
-#### Announcement (ZPages)
-
-* Version: 1.11.0
-* Date: 2023-09-01
-* PR: [DEPRECATION] Deprecate ZPAGES
-  [#2291](https://github.com/open-telemetry/opentelemetry-cpp/pull/2291)
-
-#### Motivation (ZPages)
-
-The ZPages specification itself was introduced in 2020,
-and has been experimental ever since,
-not getting a lot of attention, and never reaching a stable status.
-
-Several other opentelemetry projects have implemented support for zpages,
-only to later deprecate and then remove the zpages implementation (Java,
-C#), abandoning the zpages feature.
-
-In this context, it does not make sense to continue to maintain the zpages
-code in opentelemetry-cpp.
-
-#### Scope (ZPages)
-
-The following are deprecated and planned for removal:
-
-* all the API headers located under
-  `ext/include/opentelemetry/ext/zpages/`, including:
-  * the C++ class `ThreadsafeSpanData`
-  * the C++ class `TracezDataAggregator`
-  * the C++ class `TracezHttpServer`
-  * the C++ class `TracezSpanProcessor`
-  * the C++ class `TracezSharedData`
-  * the C++ class `ZPages`
-  * the C++ class `zPagesHttpServer`
-* all the code and doc located under `ext/src/zpages/`
-* all the tests located under `ext/test/zpages/`
-* the zpages exporter library(`opentelemetry_zpages`)
-* the zpages build options in CMake (`WITH_ZPAGES`)
-
-The following code is no longer considered public, will no longer be
-installed, and will no longer be useable outside of
-the opentelemetry-cpp implementation:
-
-* all the API headers located under
-  `ext/include/opentelemetry/ext/http/server`, including:
-  * the C++ class `FileHttpServer`
-  * the C++ class `HttpRequestCallback`
-  * the C++ class `HttpServer`
-  * the C++ class `HttpRequestHandler`
-  * the C++ class `SocketCallback`
-
-This implementation of an HTTP server is meant to be used for testing only,
-it is not production ready.
-
-#### Mitigation (ZPages)
-
-Consider using a different exporter,
-for example the OTLP exporter (both OTLP HTTP and OTLP GRPC are supported),
-to expose trace data to a separate trace backend.
-
-Note that this changes the access pattern:
-
-* with zpages, data is only available locally (in process)
-* with other exporters, data is available externally (not in process)
-
-Our assessment is that the zpages implementation is no longer in use,
-and can be removed.
-
-If that assessment is incorrect (i.e., if you own a project that depends
-on the zpage exporter from opentelemetry-cpp), please comment on the
-removal issue
-[#2292](https://github.com/open-telemetry/opentelemetry-cpp/issues/2292).
-
-An alternative to zpage removal is to move the code to the
-opentelemetry-cpp-contrib github
-[repository](https://github.com/open-telemetry/opentelemetry-cpp-contrib).
-
-Contributions to migrate the code, and maintain zpages, are welcome.
-
-#### Planned removal (ZPages)
-
-* Date: December, 2023
+N/A
 
 ## [Documentation]
 

INSTALL.md

@@ -124,10 +124,6 @@ You can link OpenTelemetry C++ SDK with libraries provided in
    -- Installing: /<install-root>/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config.cmake
    -- Installing: /<install-root>/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config-version.cmake
    ...
-   -- Installing: /<install-root>/include/opentelemetry//ext/zpages/static/tracez_index.h
-   -- Installing: /<install-root>/include/opentelemetry//ext/zpages/static/tracez_style.h
-   -- Installing: /<install-root>/include/opentelemetry//ext/zpages/threadsafe_span_data.h
-   -- Installing: /<install-root>/lib/libopentelemetry_zpages.a
    $
    ```