merged from upstream

Author: malkia

.devcontainer/Dockerfile.dev

@@ -15,17 +15,24 @@ ENV THIRD_PARTY_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
 
 COPY ci /opt/ci
 
-RUN apt update && apt install -y wget \
+RUN apt update && apt install -y wget gnupg lsb-release software-properties-common && \
+    wget -qO- https://apt.llvm.org/llvm.sh | bash -s -- 22 && \
+    apt install -y \
     ninja-build \
-    llvm-20-dev \
-    libclang-20-dev \
-    clang-tidy-20 \
+    llvm-22-dev \
+    libclang-22-dev \
+    clang-22 \
+    clang-tidy-22 \
     shellcheck \
     sudo \
     cmake
 
-RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-20 200 && \
-    update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-20 200 && \
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-22 200 && \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 200 && \
+    update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-22 200 && \
+    update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-22 200 && \
+    update-alternatives --config clang && \
+    update-alternatives --config clang++ && \
     update-alternatives --config clang-tidy && \
     update-alternatives --config llvm-config
 

.github/workflows/clang-tidy.yaml

@@ -11,18 +11,18 @@ permissions:
 
 jobs:
   clang-tidy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         include:
           - cmake_options: all-options-abiv1-preview
-            warning_limit: 29
+            warning_limit: 879
           - cmake_options: all-options-abiv2-preview
-            warning_limit: 29
+            warning_limit: 882
     env:
-      CC: /usr/bin/clang-18
-      CXX: /usr/bin/clang++-18
+      CC: /usr/bin/clang-22
+      CXX: /usr/bin/clang++-22
       CXX_STANDARD: '14' # Run clang-tidy on the minimum supported c++ standard
     steps:
       - name: Harden the runner (Audit all outbound calls)
@@ -53,18 +53,19 @@ jobs:
           libgtest-dev \
           libbenchmark-dev
 
-      - name: Install rapidyaml
-        run: |
-          sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release --packages "ryml"
-
-      - name: Install clang-tidy-20
+      - name: Install clang-22 toolchain
         run: |
-          sudo apt install -y clang-tidy-20
-          sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-20 200
+          wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- 22
+          sudo apt install -y clang-22 clang-tidy-22
+          sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-22 200
           sudo update-alternatives --config clang-tidy
           echo "Using clang-tidy version: $(clang-tidy --version)"
           echo "clang-tidy installed at: $(which clang-tidy)"
 
+      - name: Install rapidyaml
+        run: |
+          sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release --packages "ryml"
+
       - name: Build and run clang-tidy
         id: build
         env:

.github/workflows/iwyu.yml

@@ -12,17 +12,17 @@ permissions:
 
 jobs:
   iwyu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         include:
           - cmake_options: all-options-abiv1
-            warning_limit: 0
+            warning_limit: 161
           - cmake_options: all-options-abiv1-preview
-            warning_limit: 0
+            warning_limit: 190
           - cmake_options: all-options-abiv2-preview
-            warning_limit: 0
+            warning_limit: 187
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
@@ -37,6 +37,7 @@ jobs:
       - name: setup dependencies
         run: |
           sudo apt update -y
+          wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- 22
           sudo apt install -y --no-install-recommends --no-install-suggests \
             build-essential \
             ninja-build \
@@ -50,9 +51,11 @@ jobs:
             libgmock-dev \
             libgtest-dev \
             libbenchmark-dev \
-            llvm-dev \
-            libclang-dev \
+            llvm-22-dev \
+            libclang-22-dev \
+            clang-22 \
             cmake
+          sudo update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-22 200
 
       - name: Install rapidyaml
         run: |
@@ -62,22 +65,13 @@ jobs:
         run: |
           sudo ./ci/install_iwyu.sh
 
-      - name: Prepare CMake
+      - name: Build with include-what-you-use
         env:
-          CC: clang
-          CXX: clang++
+          OTELCPP_CMAKE_CACHE_FILE: ${{ matrix.cmake_options }}.cmake
+          BUILD_DIR: build-${{ matrix.cmake_options }}
         run: |
-          TOPDIR=`pwd`
-          cmake -B build-${{ matrix.cmake_options }} \
-            -C ./test_common/cmake/${{ matrix.cmake_options }}.cmake \
-            -DCMAKE_CXX_STANDARD=14 \
-            -DWITH_STL=CXX14 \
-            -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
-            -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;"
-
-      - name: iwyu_tool
-        run: |
-          cmake --build build-${{ matrix.cmake_options }} -- -j$(nproc) -k 2>&1 | tee -a iwyu-${{ matrix.cmake_options }}.log
+          ./ci/do_ci.sh cmake.iwyu.test
+          cp "${BUILD_DIR}/opentelemetry-cpp-iwyu-${{ matrix.cmake_options }}.log" iwyu-${{ matrix.cmake_options }}.log
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: success() || failure()

CHANGELOG.md

@@ -15,6 +15,9 @@ Increment the:
 
 ## [Unreleased]
 
+* [API] Fix `Logger::Enabled()`
+  [#2667](https://github.com/open-telemetry/opentelemetry-cpp/issues/2667)
+
 * [CONFIGURATION] File configuration - composable samplers
   [#3966](https://github.com/open-telemetry/opentelemetry-cpp/issues/3966)
 * [SDK] Fix PeriodicExportingMetricReader shutdown race on destruction

CONTRIBUTING.md

@@ -127,6 +127,22 @@ bash ci/do_ci.sh cmake.exporter.otprotocol.test
 This command initiates the CI pipeline, executing tests specifically for the
 **cmake.exporter.otprotocol** module.
 
+To reproduce CI's `include-what-you-use` warnings locally, run from inside
+the dev container (where IWYU is preinstalled):
+
+```bash
+OTELCPP_CMAKE_CACHE_FILE=all-options-abiv1-preview.cmake \
+  bash ci/do_ci.sh cmake.iwyu.test
+```
+
+The target defaults to `clang-22`/`clang++-22` to match the LLVM version
+the dev container's IWYU was built against. Export `CC`/`CXX` to override
+if you need a different compiler.
+
+Set `OTELCPP_CMAKE_CACHE_FILE` to any of `all-options-abiv1.cmake`,
+`all-options-abiv1-preview.cmake`, or `all-options-abiv2-preview.cmake`
+to match each CI matrix entry.
+
 #### Troubleshooting
 
 If you encounter issues:

api/include/opentelemetry/logs/logger.h

@@ -3,9 +3,13 @@
 
 #pragma once
 
-#include <atomic>
+#include <stdint.h>
+#include <type_traits>
+#include <utility>
 
 #include "opentelemetry/version.h"
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/logs/event_id.h"
 #include "opentelemetry/logs/logger_type_traits.h"
 #include "opentelemetry/logs/severity.h"
 #include "opentelemetry/nostd/string_view.h"
@@ -273,6 +277,29 @@ class Logger
   // OpenTelemetry C++ user-facing Logs API
   //
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  inline bool Enabled(const opentelemetry::context::Context &context,
+                      Severity severity = Severity::kInvalid) const noexcept
+  {
+    if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
+    {
+      return false;
+    }
+    return EnabledImplementation(context, severity);
+  }
+
+  inline bool Enabled(const opentelemetry::context::Context &context,
+                      Severity severity,
+                      const EventId &event_id) const noexcept
+  {
+    if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
+    {
+      return false;
+    }
+    return EnabledImplementation(context, severity, event_id);
+  }
+#endif  // OPENTELEMETRY_ABI_VERSION_NO >= 2
+
   inline bool Enabled(Severity severity, const EventId &event_id) const noexcept
   {
     if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
@@ -466,7 +493,6 @@ class Logger
   //
 
 protected:
-  // TODO: discuss with community about naming for internal methods.
   virtual bool EnabledImplementation(Severity /*severity*/,
                                      const EventId & /*event_id*/) const noexcept
   {
@@ -478,6 +504,21 @@ class Logger
     return false;
   }
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  virtual bool EnabledImplementation(const opentelemetry::context::Context & /*context*/,
+                                     Severity /*severity*/) const noexcept
+  {
+    return false;
+  }
+
+  virtual bool EnabledImplementation(const opentelemetry::context::Context & /*context*/,
+                                     Severity /*severity*/,
+                                     const EventId & /*event_id*/) const noexcept
+  {
+    return false;
+  }
+#endif  // OPENTELEMETRY_ABI_VERSION_NO >= 2
+
   void SetMinimumSeverity(uint8_t severity_or_max) noexcept
   {
     minimum_severity_ = severity_or_max;