Merge branch 'main' into process_detector_attr

Author: ThomsonTan

.github/copilot-instructions.md

@@ -0,0 +1,302 @@
+# OpenTelemetry C++
+
+OpenTelemetry C++ is a comprehensive telemetry SDK providing APIs and
+implementations for traces, metrics, and logs. It supports both CMake and Bazel
+build systems and runs on Linux, macOS, and Windows with modern C++ compilers
+(C++14/17/20).
+
+Always reference these instructions first and fallback to search or bash
+commands only when you encounter unexpected information that does not match the
+info here.
+
+## Working Effectively
+
+### Bootstrap, Build, and Test the Repository
+
+**CRITICAL: NEVER CANCEL builds or long-running commands. Set appropriate
+timeouts.**
+
+#### CMake Build (Recommended for Development)
+
+```bash
+# Install basic dependencies (Ubuntu/Debian)
+sudo apt-get update
+sudo apt-get install -y build-essential cmake git pkg-config
+
+# Configure CMake build
+mkdir -p build && cd build
+cmake ..
+# Takes ~12 seconds. Always completes quickly.
+
+# Build the project
+make -j$(nproc)
+# Takes ~3 minutes. NEVER CANCEL. Set timeout to 15+ minutes.
+
+# Run all tests
+ctest --output-on-failure
+# Takes ~24 seconds. Set timeout to 5+ minutes.
+```
+
+#### CI Build (Full Validation)
+
+```bash
+# Run the full CI validation (includes additional exporters)
+./ci/do_ci.sh cmake.test
+# Takes ~5.2 minutes. NEVER CANCEL. Set timeout to 20+ minutes.
+```
+
+#### Bazel Build (Alternative)
+
+```bash
+# Install bazelisk (managed Bazel)
+sudo ./ci/install_bazelisk.sh
+
+# Build simple example
+bazel build //examples/simple:example_simple
+# Time varies. NEVER CANCEL. Set timeout to 15+ minutes.
+
+# Run simple example
+bazel-bin/examples/simple/example_simple
+```
+
+**Note**: Bazel may have network connectivity issues in some environments when
+downloading the required Bazel version (7.1.1).
+
+### Validation
+
+Always validate your changes using these steps after making code modifications:
+
+#### Core Validation Scenario
+
+```bash
+# 1. Build and test successfully
+cd build && make -j$(nproc) && ctest --output-on-failure
+
+# 2. Run a simple example to verify functionality
+./examples/simple/example_simple
+# Should output telemetry spans with service.name, trace_id, span_id
+
+# 3. Format code properly
+./tools/format.sh
+# Takes ~30 seconds. Must complete without errors.
+
+# 4. Validate with maintainer mode (CRITICAL for warnings)
+./ci/do_ci.sh cmake.maintainer.sync.test
+# Takes ~4-6 minutes. NEVER CANCEL. Ensures all warnings are resolved.
+```
+
+#### Required Tools for Formatting
+
+```bash
+# Install formatting dependencies
+pip install cmake_format                    # For CMake files
+go install github.com/bazelbuild/buildtools/buildifier@latest  # For Bazel files
+# clang-format should already be available on most systems
+```
+
+### Maintainer Mode Validation
+
+**CRITICAL**: Always run maintainer mode builds to ensure warning-free code:
+
+```bash
+# Run maintainer mode validation
+./ci/do_ci.sh cmake.maintainer.sync.test
+
+# What this does:
+# - Enables -Wall -Werror -Wextra compiler flags
+# - Treats all warnings as errors
+# - Ensures strict code quality standards
+# - Required for all contributions
+```
+
+Maintainer mode (`-DOTELCPP_MAINTAINER_MODE=ON`) is essential for catching potential issues that would cause CI failures. It enables the strictest warning levels and treats warnings as compilation errors.
+
+### CI Integration
+
+Always run these before committing to ensure CI will pass:
+
+```bash
+# Format all code
+./tools/format.sh
+
+# Run linting (if shellcheck available for shell scripts)
+shellcheck --severity=error ci/*.sh
+
+# CRITICAL: Validate with maintainer mode to catch all warnings
+./ci/do_ci.sh cmake.maintainer.sync.test
+# Takes ~4-6 minutes. Enables -Wall -Werror -Wextra for strict validation.
+
+# Validate build with additional exporters
+./ci/do_ci.sh cmake.test
+```
+
+## Common Tasks
+
+### Building and Running Examples
+
+Examples demonstrate OpenTelemetry functionality and validate your environment:
+
+```bash
+# Build and run simple tracing example
+cd build
+make example_simple
+./examples/simple/example_simple
+
+# Build and run logs example
+make logs_simple_example
+./examples/logs_simple/logs_simple_example
+
+# Build and run batch processing example
+make batch_example
+./examples/batch/batch_example
+```
+
+### Testing Changes
+
+```bash
+# Run specific test groups
+ctest -R trace                    # Run only trace tests
+ctest -R metrics                  # Run only metrics tests
+ctest -R logs                     # Run only logs tests
+
+# Run tests with verbose output for debugging
+ctest --verbose --output-on-failure
+
+# Run a specific test by name
+ctest -R "trace.SystemTimestampTest.Construction" --verbose
+```
+
+### Key Directories and Navigation
+
+```text
+api/                  - Public OpenTelemetry API headers
+sdk/                  - SDK implementation (most business logic)
+exporters/            - Output plugins (ostream, memory, etc.)
+examples/             - Sample applications demonstrating usage
+  ├── simple/         - Basic tracing example (start here)
+  ├── logs_simple/    - Basic logging example
+  ├── metrics_simple/ - Basic metrics example (may be disabled)
+  └── batch/          - Batch processing example
+ci/                   - CI scripts and build automation
+tools/                - Development tools (formatting, etc.)
+test_common/          - Shared test utilities
+third_party/          - External dependencies
+```
+
+### Important Files
+
+- `CMakeLists.txt` - Main CMake configuration
+- `WORKSPACE` - Bazel workspace configuration
+- `third_party_release` - Dependency version specifications
+- `ci/do_ci.sh` - Main CI script with build targets
+- `tools/format.sh` - Code formatting script
+- `.github/workflows/ci.yml` - GitHub Actions CI configuration
+
+## Build Targets and Options
+
+### CI Script Targets (./ci/do_ci.sh)
+
+```bash
+cmake.test                       # Standard CMake build with exporters (~5.2 min)
+cmake.maintainer.sync.test       # Maintainer mode: -Wall -Werror -Wextra (~4-6 min)
+cmake.maintainer.async.test      # Maintainer mode with async export enabled
+cmake.maintainer.cpp11.async.test # Maintainer mode with C++11
+cmake.maintainer.abiv2.test      # Maintainer mode with ABI v2
+cmake.legacy.test                # GCC 4.8 compatibility testing
+cmake.c++20.test                # C++20 standard testing
+bazel.test                      # Standard Bazel build and test
+format                          # Run formatting tools
+code.coverage                   # Build with coverage analysis
+```
+
+### CMake Configuration Options
+
+Key options you can pass to `cmake ..`:
+
+```bash
+-DWITH_EXAMPLES=ON           # Build examples (default ON)
+-DWITH_PROMETHEUS=ON         # Enable Prometheus exporter
+-DWITH_ZIPKIN=ON            # Enable Zipkin exporter
+-DWITH_OTLP_GRPC=ON         # Enable OTLP gRPC exporter
+-DWITH_OTLP_HTTP=ON         # Enable OTLP HTTP exporter
+-DBUILD_TESTING=ON          # Build tests (default ON)
+-DCMAKE_BUILD_TYPE=Debug    # Debug build
+```
+
+## Timing Expectations
+
+**CRITICAL**: These are measured times. Always set longer timeouts to prevent
+premature cancellation.
+
+| Operation | Measured Time | Recommended Timeout |
+|-----------|---------------|-------------------|
+| CMake configure | 12 seconds | 2 minutes |
+| CMake build (parallel) | 3 minutes | 15 minutes |
+| Test execution (ctest) | 24 seconds | 5 minutes |
+| CI cmake.test | 5.2 minutes | 20 minutes |
+| CI cmake.maintainer.sync.test | 4-6 minutes | 20 minutes |
+| Format script | 17 seconds | 2 minutes |
+| Bazel build | Varies | 15+ minutes |
+
+**NEVER CANCEL** any build or test operation. Build systems may appear to hang
+but are typically downloading dependencies or performing intensive compilation.
+
+## Troubleshooting
+
+### Common Issues
+
+**Build Fails**:
+
+- Ensure all dependencies installed:
+  `sudo apt-get install build-essential cmake git pkg-config`
+- Clean build directory: `rm -rf build && mkdir build`
+
+**Tests Fail**:
+
+- Set `CTEST_OUTPUT_ON_FAILURE=1` for detailed test output
+- Run specific failing test: `ctest -R <test_name> --verbose`
+
+**Format Script Fails**:
+
+- Install missing tools: `pip install cmake_format` and buildifier via Go
+- Check clang-format version: should be 14+ (18+ preferred)
+
+**Bazel Issues**:
+
+- Network connectivity may prevent Bazel version download
+- Use CMake as primary build system for development
+- Check `.bazelversion` file for required version (7.1.1)
+
+### Network/Connectivity Issues
+
+Some tools require internet access:
+
+- Bazel downloading specific version
+- Third-party dependencies during first build
+- CI scripts pulling Docker images for benchmarks
+
+For offline development, use CMake with pre-installed dependencies.
+
+## Repository Structure Summary
+
+**Core Components**:
+
+- **API**: Header-only library in `api/` for instrumentation
+- **SDK**: Implementation in `sdk/` with resource detection, processors, exporters
+- **Exporters**: Output backends in `exporters/` (console, memory, Prometheus, etc.)
+
+**Development Workflow**:
+
+1. Make changes to relevant component
+2. Build and test: `cd build && make -j$(nproc) && ctest`
+3. Run example: `./examples/simple/example_simple`
+4. Format code: `./tools/format.sh`
+5. Validate warnings: `./ci/do_ci.sh cmake.maintainer.sync.test`
+6. Final validation: `./ci/do_ci.sh cmake.test`
+
+**Key Standards**:
+
+- C++14 minimum, C++17/20 supported
+- Google C++ Style Guide for naming
+- Automatic formatting via clang-format
+- Comprehensive test coverage with GoogleTest

.github/workflows/codeql-analysis.yml

@@ -37,10 +37,10 @@ jobs:
       run: |
         sudo -E ./ci/setup_ci_environment.sh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+      uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
       with:
        languages: cpp
     - name: Autobuild
-      uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+      uses: github/codeql-action/autobuild@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+      uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0

.github/workflows/ossf-scorecard.yml

@@ -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@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -30,11 +30,22 @@ Increment the:
 * [SDK] View should not have a unit
   [#3552](https://github.com/open-telemetry/opentelemetry-cpp/pull/3552)
 
+* [BUILD] Use -dev versions in main branch
+  [#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609)
+
 Important changes:
 
 * [CMAKE] Upgrade CMake minimum version to 3.16
   [#3599](https://github.com/open-telemetry/opentelemetry-cpp/pull/3599)
 
+* [BUILD] Use -dev versions in main branch
+  [#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609)
+  * The version number in the main branch has changed,
+    to better differentiate with the latest release.
+  * For example:
+    * With a latest release 1.22.0, the main branch is 1.23.0-dev
+    * Upon release of 1.23.0, the main branch becomes 1.24.0-dev
+
 Breaking changes:
 
 * [SDK] View should not have a unit

CMakeLists.txt

@@ -15,8 +15,8 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
   cmake_policy(SET CMP0117 NEW)
 endif()
 
-set(OPENTELEMETRY_VERSION_NUMBER "1.22.0")
-set(OPENTELEMETRY_VERSION_SUFFIX "")
+set(OPENTELEMETRY_VERSION_NUMBER "1.23.0")
+set(OPENTELEMETRY_VERSION_SUFFIX "-dev")
 set(OPENTELEMETRY_VERSION
     "${OPENTELEMETRY_VERSION_NUMBER}${OPENTELEMETRY_VERSION_SUFFIX}")
 

MODULE.bazel

@@ -3,23 +3,23 @@
 
 module(
     name = "opentelemetry-cpp",
-    version = "1.22.0",
+    version = "1.23.0-dev",
     compatibility_level = 0,
     repo_name = "io_opentelemetry_cpp",
 )
 
 bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl")
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "curl", version = "8.8.0")
-bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
+bazel_dep(name = "grpc", version = "1.66.0.bcr.2", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json")
 bazel_dep(name = "opentelemetry-proto", version = "1.7.0", repo_name = "com_github_opentelemetry_proto")
 bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
-bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
-bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
-bazel_dep(name = "zlib", version = "1.3.1.bcr.1")
+bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_proto", version = "7.0.2")
+bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 
-bazel_dep(name = "google_benchmark", version = "1.8.3", dev_dependency = True, repo_name = "com_github_google_benchmark")
+bazel_dep(name = "google_benchmark", version = "1.8.4", dev_dependency = True, repo_name = "com_github_google_benchmark")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True, repo_name = "com_google_googletest")