Merge branch 'main' into kjtsanaktsidis/fix_hang

Author: ThomsonTan

.devcontainer/Dockerfile.dev

@@ -22,13 +22,16 @@ ENV GRPC_VERSION=${GRPC_VERSION}
 COPY ci /opt/ci
 
 RUN apt update && apt install -y wget \
-	ninja-build \
-	libcurl4-openssl-dev \
-	clang-tidy \
-	shellcheck
+    ninja-build \
+    llvm-dev \
+    libclang-dev \
+    libcurl4-openssl-dev \
+    clang-tidy \
+    shellcheck
 
 RUN cd /opt/ci && bash setup_cmake.sh
 RUN cd /opt/ci && bash setup_ci_environment.sh
+RUN cd /opt/ci && bash install_iwyu.sh
 RUN cd /opt && bash ci/setup_googletest.sh \
     && bash ci/install_abseil.sh \
     && bash ci/install_protobuf.sh \

.github/workflows/clang-tidy.yaml

@@ -31,7 +31,6 @@ jobs:
           sudo apt update -y
           sudo apt install -y --no-install-recommends --no-install-suggests \
           build-essential \
-          iwyu \
           cmake \
           libssl-dev \
           libcurl4-openssl-dev \

.github/workflows/codeql-analysis.yml

@@ -39,10 +39,10 @@ jobs:
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/setup_ci_environment.sh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
       with:
        languages: cpp
     - name: Autobuild
-      uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19

.github/workflows/iwyu.yml

@@ -28,22 +28,23 @@ jobs:
           sudo apt update -y
           sudo apt install -y --no-install-recommends --no-install-suggests \
             build-essential \
-            iwyu \
             ninja-build \
             libssl-dev \
             libcurl4-openssl-dev \
+            libabsl-dev \
             libprotobuf-dev \
+            libgrpc++-dev \
             protobuf-compiler \
+            protobuf-compiler-grpc \
             libgmock-dev \
             libgtest-dev \
-            libbenchmark-dev
+            libbenchmark-dev \
+            llvm-dev \
+            libclang-dev
           sudo ./ci/setup_cmake.sh
-
-
-      - name: setup grpc
+      - name: Install include-what-you-use
         run: |
-          sudo ./ci/setup_grpc.sh
-
+          sudo ./ci/install_iwyu.sh
       - name: Prepare CMake
         run: |
           TOPDIR=`pwd`
@@ -53,6 +54,8 @@ jobs:
             -DWITH_STL=CXX14 \
             -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
             -DBUILD_TESTING=ON \
+            -DWITH_EXAMPLES=ON \
+            -DWITH_EXAMPLES_HTTP=ON \
             -DBUILD_W3CTRACECONTEXT_TEST=ON \
             -DWITH_OTLP_GRPC=ON \
             -DWITH_OTLP_HTTP=ON \
@@ -78,11 +81,13 @@ jobs:
       - name: count warnings
         run: |
           set +e
+          echo "include-what-you-use version:"
+          include-what-you-use --version
           cd build
           readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log`
           echo "include-what-you-use reported ${WARNING_COUNT} warning(s)"
           # Acceptable limit, to decrease over time down to 0
-          readonly WARNING_LIMIT=0
+          readonly WARNING_LIMIT=122
           # FAIL the build if WARNING_COUNT > WARNING_LIMIT
           if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
             exit 1

.github/workflows/ossf-scorecard.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -47,6 +47,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -15,67 +15,185 @@ Increment the:
 
 ## [Unreleased]
 
-* [BUILD] Propagate INTERFACE_COMPILE_DEFINITIONS from API through common_foo_library
-  [#3440](https://github.com/open-telemetry/opentelemetry-cpp/pull/3440)
+## [1.21 2025-05-28]
 
-* [BUILD] Error out when building DLL without MSVC
-  [#3438](https://github.com/open-telemetry/opentelemetry-cpp/pull/3438)
+* [BUILD] Remove WITH_ABSEIL
+  [#3318](https://github.com/open-telemetry/opentelemetry-cpp/pull/3318)
 
-* [Metrics SDK] Use nostd::function_ref in AttributesHashMap
-  [#3393](https://github.com/open-telemetry/opentelemetry-cpp/pull/3393)
+* [INSTALL] Add CMake components to the opentelemetry-cpp package
+  [#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220)
 
-* [SDK] Base2 exponential histogram aggregation
-  [#3175](https://github.com/open-telemetry/opentelemetry-cpp/pull/3346)
+* [CI] Harden GitHub Actions
+  [#3338](https://github.com/open-telemetry/opentelemetry-cpp/pull/3338)
 
-  New Features:
+* [StepSecurity] Harden GibHub Actions, part 2
+  [#3340](https://github.com/open-telemetry/opentelemetry-cpp/pull/3340)
 
-  Add base2 exponential histogram aggregation. Includes a new aggregation type,
-  ostream exporter, and otlp/grpc exporter. Updated histogram aggregation and
-  benchmark tests.
+* Bump github/codeql-action from 3.28.12 to 3.28.13
+  [#3341](https://github.com/open-telemetry/opentelemetry-cpp/pull/3341)
 
-* [API] Remove `WITH_ABSEIL` and `HAVE_ABSEIL`
-  [#3318](https://github.com/open-telemetry/opentelemetry-cpp/pull/3318)
+* [DEVCONTAINER] expose cmake version setting as docker arg and environment variable
+  [#3347](https://github.com/open-telemetry/opentelemetry-cpp/pull/3347)
+
+* [CI] disable bzip2 in conan builds
+  [#3352](https://github.com/open-telemetry/opentelemetry-cpp/pull/3352)
+
+* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.32.0
+  [#3351](https://github.com/open-telemetry/opentelemetry-cpp/pull/3351)
 
-* [CMAKE] Bump cmake minimum required version to 3.14
+* Bump github/codeql-action from 3.28.13 to 3.28.15
+  [#3353](https://github.com/open-telemetry/opentelemetry-cpp/pull/3353)
+
+* [CMAKE] bump cmake minimum required version to 3.14
   [#3349](https://github.com/open-telemetry/opentelemetry-cpp/pull/3349)
 
+* Bump codecov/codecov-action from 5.4.0 to 5.4.2
+  [#3362](https://github.com/open-telemetry/opentelemetry-cpp/pull/3362)
+
+* [DOC] Fix documentation tags in logger API
+  [#3371](https://github.com/open-telemetry/opentelemetry-cpp/pull/3371)
+
+* [CI] fix artifacts download/upload
+  [#3369](https://github.com/open-telemetry/opentelemetry-cpp/pull/3369)
+
 * [API] Add Enabled method to Tracer
   [#3357](https://github.com/open-telemetry/opentelemetry-cpp/pull/3357)
 
-* [SDK] Optimize PeriodicExportingMetricReader thread usage
+* [BUILD] Fixes warnings of ciso646 in C++17
+  [#3360](https://github.com/open-telemetry/opentelemetry-cpp/pull/3360)
+
+* Bump github/codeql-action from 3.28.15 to 3.28.16
+  [#3377](https://github.com/open-telemetry/opentelemetry-cpp/pull/3377)
+
+* Bump step-security/harden-runner from 2.11.1 to 2.12.0
+  [#3373](https://github.com/open-telemetry/opentelemetry-cpp/pull/3373)
+
+* Bump docker/build-push-action from 6.15.0 to 6.16.0
+  [#3382](https://github.com/open-telemetry/opentelemetry-cpp/pull/3382)
+
+* Bump actions/download-artifact from 4.2.1 to 4.3.0
+  [#3381](https://github.com/open-telemetry/opentelemetry-cpp/pull/3381)
+
+* [CI] Harden Github actions - pinned-dependencies (part -1)
+  [#3380](https://github.com/open-telemetry/opentelemetry-cpp/pull/3380)
+
+* [StepSecurity] ci: Harden GitHub Actions
+  [#3378](https://github.com/open-telemetry/opentelemetry-cpp/pull/3378)
+
+* [SDK] Base2 exponential histogram aggregation
+  [#3346](https://github.com/open-telemetry/opentelemetry-cpp/pull/3346)
+
+* [StepSecurity] ci: Harden GitHub Actions
+  [#3379](https://github.com/open-telemetry/opentelemetry-cpp/pull/3379)
+
+* [BUILD] Fixes glibc++ 5 checking
+  [#3355](https://github.com/open-telemetry/opentelemetry-cpp/pull/3355)
+
+* [TEST] Add stress test for histogram metric for multiple threads validation
+  [#3388](https://github.com/open-telemetry/opentelemetry-cpp/pull/3388)
+
+* Bump github/codeql-action from 3.28.16 to 3.28.17
+  [#3389](https://github.com/open-telemetry/opentelemetry-cpp/pull/3389)
+
+* [SDK] Optimize PeriodicExportingMetricReader Thread Usage
   [#3383](https://github.com/open-telemetry/opentelemetry-cpp/pull/3383)
 
-* [SDK] Aggregate identical metrics instruments and detect duplicates
+* [Metrics SDK] Use nostd::function_ref in AttributesHashMap
+  [#3393](https://github.com/open-telemetry/opentelemetry-cpp/pull/3393)
+
+* [SDK] support aggregation of identical instruments
   [#3358](https://github.com/open-telemetry/opentelemetry-cpp/pull/3358)
 
-* [INSTALL] Add CMake components to the opentelemetry-cpp package
-  [#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220)
-  [#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368)
+* [BUILD] Fixes unused var
+  [#3397](https://github.com/open-telemetry/opentelemetry-cpp/pull/3397)
 
-* [BUILD] Upgrade opentelemetry-proto to 1.6.0
-  [#3407](https://github.com/open-telemetry/opentelemetry-cpp/pull/3407)
+* [INSTALL] Unify cmake install functions and dynamically set component dependencies
+  [#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368)
 
 * [BUILD] Upgrade nlohmann_json to 3.12.0
   [#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406)
 
-* [CMAKE] Add generated protobuf headers to the opentelemetry_proto target
+* [BUILD] Upgrade opentelemetry-proto to 1.6.0
+  [#3407](https://github.com/open-telemetry/opentelemetry-cpp/pull/3407)
+
+* [CMAKE] add generated protobuf headers to the opentelemetry_proto target
   [#3400](https://github.com/open-telemetry/opentelemetry-cpp/pull/3400)
 
-* [CMAKE] Remove include_directories usage and rely on target properties
+* [MERGE] Fix accidental rollback of nlohmann-json submodule
+  [#3415](https://github.com/open-telemetry/opentelemetry-cpp/pull/3415)
+
+* Bump fossas/fossa-action from 1.6.0 to 1.7.0
+  [#3414](https://github.com/open-telemetry/opentelemetry-cpp/pull/3414)
+
+* Bump docker/build-push-action from 6.16.0 to 6.17.0
+  [#3420](https://github.com/open-telemetry/opentelemetry-cpp/pull/3420)
+
+* Bump codecov/codecov-action from 5.4.2 to 5.4.3
+  [#3419](https://github.com/open-telemetry/opentelemetry-cpp/pull/3419)
+
+* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.33
+  [#3416](https://github.com/open-telemetry/opentelemetry-cpp/pull/3416)
+
+* [DOCS] update the INSTALL guide on cmake components
+  [#3422](https://github.com/open-telemetry/opentelemetry-cpp/pull/3422)
+
+* Bump github/codeql-action from 3.28.17 to 3.28.18
+  [#3423](https://github.com/open-telemetry/opentelemetry-cpp/pull/3423)
+
+* [CMAKE] update cmake files in examples directory
+  [#3421](https://github.com/open-telemetry/opentelemetry-cpp/pull/3421)
+
+* [SDK] Fix Base2ExponentialHistogramAggregation Merge with empty buckets
+  [#3425](https://github.com/open-telemetry/opentelemetry-cpp/pull/3425)
+
+* [SDK] Fix MetricProducer interface
+  [#3413](https://github.com/open-telemetry/opentelemetry-cpp/pull/3413)
+
+* [CMAKE] remove global include_directories usage and rely on target properties
   [#3426](https://github.com/open-telemetry/opentelemetry-cpp/pull/3426)
 
+* [BUILD] remove unused WITH_CURL build flag
+  [#3429](https://github.com/open-telemetry/opentelemetry-cpp/pull/3429)
+
 * [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.34.0
   [#3428](https://github.com/open-telemetry/opentelemetry-cpp/pull/3428)
 
-* [EXPORTER] ostream log exporter, fixed memory ownership issues
+* [EXPORTER] ostream log exporter, fix memory ownership issues
   [#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417)
 
-* [TEST] Test all components in a CMake super build
+* [TEST] add all components to the cmake fetch content test
   [#3433](https://github.com/open-telemetry/opentelemetry-cpp/pull/3433)
 
+* [BUILD] Error out when building DLL without MSVC
+  [#3438](https://github.com/open-telemetry/opentelemetry-cpp/pull/3438)
+
+* [BUILD] Add missing CMake keyword for target_link_libraries
+  [#3442](https://github.com/open-telemetry/opentelemetry-cpp/pull/3442)
+
+* [CMAKE] Remove third-party version mismatch warning
+  [#3432](https://github.com/open-telemetry/opentelemetry-cpp/pull/3432)
+
+* Bump docker/build-push-action from 6.17.0 to 6.18.0
+  [#3446](https://github.com/open-telemetry/opentelemetry-cpp/pull/3446)
+
 * [SEMANTIC CONVENTIONS] Fix comment style to preserve markup.
   [#3444](https://github.com/open-telemetry/opentelemetry-cpp/pull/3444)
 
+* [EXPORTER] support unix sockets in grpc client
+  [#3410](https://github.com/open-telemetry/opentelemetry-cpp/pull/3410)
+
+* [BUILD] Propagate INTERFACE_COMPILE_DEFINITIONS from API through common_foo_library
+  [#3440](https://github.com/open-telemetry/opentelemetry-cpp/pull/3440)
+
+New Features:
+
+* [SDK] Base2 exponential histogram aggregation
+  [#3346](https://github.com/open-telemetry/opentelemetry-cpp/pull/3346)
+
+  * Add base2 exponential histogram aggregation. Includes a new aggregation type,
+    ostream exporter, and otlp/grpc exporter. Updated histogram aggregation and
+    benchmark tests.
+
 Important changes:
 
 * [EXPORTER] ostream log exporter, fixed memory ownership issues
@@ -95,6 +213,19 @@ Important changes:
 
   * Applications not using these SDK classes directly are not affected.
 
+* [BUILD] Remove WITH_ABSEIL
+  [#3318](https://github.com/open-telemetry/opentelemetry-cpp/pull/3318)
+
+  * The build option `WITH_ABSEIL` is no longer used, and opentelemetry-cpp
+    will no longer use any release of abseil provided externally,
+    for its own use.
+
+  * Instead, opentelemetry-cpp will only use an internal abseil version.
+
+  * This change resolves long standing binary integrity issues,
+    that occurred in the past when mixing several versions of abseil
+    in the build.
+
 ## [1.20 2025-04-01]
 
 * [BUILD] Update opentelemetry-proto version

MODULE.bazel

@@ -3,7 +3,7 @@
 
 module(
     name = "opentelemetry-cpp",
-    version = "1.17.0",
+    version = "1.21.0",
     compatibility_level = 0,
     repo_name = "io_opentelemetry_cpp",
 )

README.md

@@ -84,15 +84,15 @@ doc](https://docs.google.com/document/d/1i1E4-_y4uJ083lCutKGDhkpi3n4_e774SBLi9hP
 For edit access, get in touch on
 [Slack](https://cloud-native.slack.com/archives/C01N3AT62SJ).
 
-[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
+[Maintainers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer)
 ([@open-telemetry/cpp-maintainers](https://github.com/orgs/open-telemetry/teams/cpp-maintainers)):
 
 * [Ehsan Saei](https://github.com/esigo)
 * [Lalit Kumar Bhasin](https://github.com/lalitb), Microsoft
 * [Marc Alff](https://github.com/marcalff), Oracle
 * [Tom Tan](https://github.com/ThomsonTan), Microsoft
 
-[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
+[Approvers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver)
 ([@open-telemetry/cpp-approvers](https://github.com/orgs/open-telemetry/teams/cpp-approvers)):
 
 * [Doug Barker](https://github.com/dbarker)
@@ -101,7 +101,7 @@ For edit access, get in touch on
 * [WenTao Ou](https://github.com/owent), Tencent
 
 [Emeritus
-Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager):
+Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager):
 
 * [Alolita Sharma](https://github.com/alolita)
 * [Emil Mikulic](https://github.com/g-easy)

api/include/opentelemetry/version.h

@@ -10,9 +10,9 @@
 #  define OPENTELEMETRY_ABI_VERSION_NO 1
 #endif
 
-#define OPENTELEMETRY_VERSION "1.20.0"
+#define OPENTELEMETRY_VERSION "1.21.0"
 #define OPENTELEMETRY_VERSION_MAJOR 1
-#define OPENTELEMETRY_VERSION_MINOR 20
+#define OPENTELEMETRY_VERSION_MINOR 21
 #define OPENTELEMETRY_VERSION_PATCH 0
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)