merged from upstream

Author: malkia

.github/workflows/ci.yml

@@ -735,32 +735,6 @@ jobs:
     - name: run tests
       run: ./ci/do_ci.sh bazel.test
 
-  bazel_no_bzlmod_test:
-    name: Bazel without bzlmod
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_test
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.no_bzlmod.test
-
   bazel_test_async:
     name: Bazel with async export
     runs-on: ubuntu-latest

.github/workflows/cmake_install.yml

@@ -238,7 +238,7 @@ jobs:
       - name: Install Conan
         run: |
           python3 -m pip install pip==25.0.1
-          pip install "conan==2.15.1"
+          pip install "conan==2.21.0"
           conan profile detect --force
       - name: Install or build all dependencies with Conan
         run: |

INSTALL.md

@@ -336,38 +336,10 @@ Bazel](https://docs.bazel.build/versions/3.7.0/install.html) guide.
 
 ### Incorporating into an existing Bazel Project
 
-- WORKSPACE file:
-
-```console
-http_archive(
-    name = "io_opentelemetry_cpp",
-    sha256 = "<sha256>",
-    strip_prefix = "opentelemetry-cpp-1.0.1",
-    urls = [
-        "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.0.1.tar.gz"
-    ],
-)
-
-# Load OpenTelemetry dependencies after load.
-load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
-
-opentelemetry_cpp_deps()
-
-# (required after v1.8.0) Load extra dependencies required for OpenTelemetry
-load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
-
-opentelemetry_extra_deps()
-
-# Load gRPC dependencies after load.
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
-# Load extra gRPC dependencies due to https://github.com/grpc/grpc/issues/20511
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
-
-grpc_extra_deps()
+- MODULE.bazel file:
 
+```bzl
+bazel_dep(name = "opentelemetry-cpp", version = "<VERSION>", repo_name = "io_opentelemetry_cpp")
 ```
 
 - Component level BUILD file:

WORKSPACE.bzlmod

@@ -545,13 +545,6 @@ EOF
   make load_plugin_example
   examples/plugin/load/load_plugin_example ${PLUGIN_DIR}/libexample_plugin.so /dev/null
   exit 0
-elif [[ "$1" == "bazel.no_bzlmod.test" ]]; then
-  # Rapidyaml 0.9.0 as is does not support bazel,
-  # modules in bazel central repository required
-  # to build configuration.
-  bazel $BAZEL_STARTUP_OPTIONS build --enable_bzlmod=false $BAZEL_OPTIONS -- //... -//examples/configuration/... -//sdk/src/configuration/... -//sdk/test/configuration/...
-  bazel $BAZEL_STARTUP_OPTIONS test --enable_bzlmod=false $BAZEL_TEST_OPTIONS -- //... -//examples/configuration/... -//sdk/src/configuration/... -//sdk/test/configuration/...
-  exit 0
 elif [[ "$1" == "bazel.test" ]]; then
   bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS $BAZEL_WITH_PREVIEW //...
   bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS $BAZEL_WITH_PREVIEW //...

ci/do_ci.sh

@@ -86,11 +86,6 @@ index 0bbf67f3..7362473f 100644
  vcpkg=2024.02.14
 ```
 
-#### file bazel/repository.bzl
-
-Please follow the guide [Upgrade a bazel dependency](#upgrade-a-bazel-dependency)
-for more details.
-
 #### file cmake/opentelemetry-proto.cmake
 
 Update the tag in the CMake logic:
@@ -141,16 +136,6 @@ In this case, it is better to:
 When the C++ code requires a newer minimum version of opentelemetry-proto,
 make sure to document this, including in the release notes.
 
-### Known issues (opentelemetry-proto)
-
-For bazel, two different methods to build exists.
-
-First, the code can build using file `bazel/repository.bzl`.
-This option does not depend on bazel central.
-
-Secondly, there is also a build using modules, with file `MODULE.bazel`.
-This option does depend on bazel central, and CI depends on it.
-
 ## semantic-conventions and weaver
 
 ### Comments (semantic-conventions)
@@ -378,50 +363,13 @@ index abc1234..def5678 100644
 +prometheus-cpp=v1.2.4
 ```
 
-In file bazel/repository.bzl locate the entry for prometheus-cpp:
-
-```shell
-# C++ Prometheus Client library.
-maybe(
-    http_archive,
-    name = "com_github_jupp0r_prometheus_cpp",
-    sha256 = "ac6e958405a29fbbea9db70b00fa3c420e16ad32e1baf941ab233ba031dd72ee",
-    strip_prefix = "prometheus-cpp-1.2.3",
-    urls = [
-        "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.2.3.tar.gz",
-    ],
-)
-```
-
-Update the URL to the new tag:
-
-```shell
-urls = [
-    "https://github.com/jupp0r/prometheus-cpp/archive/v1.2.4.tar.gz",
-],
-```
-
-Update strip_prefix to match the new version:
-
-```shell
-strip_prefix = "prometheus-cpp-1.2.4",
-```
-
-Download the new URL:
-
-```shell
-wget https://github.com/jupp0r/prometheus-cpp/archive/v1.2.4.tar.gz
-```
-
-Calculate the checksum:
+In file `MODULE.bazel` locate the entry for prometheus-cpp and update it
+to the new version:
 
-```shell
-sha256sum v1.2.4.tar.gz
-abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234  v1.2.4.tar.gz
+```bzl
+bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
 ```
 
-Update the `sha256`.
-
 ## Upgrade a git submodule
 
 All the git submodule are under the folder `third_party`.
@@ -502,89 +450,7 @@ git add third_party/opentelemetry-proto
 
 ## Upgrade a bazel dependency
 
-Same as git submodule, we will continue use `opentelemetry-proto` as example.
-
-All the bazel dependencies are defined in [repository.bzl](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/bazel/repository.bzl)
-and [MODULE.bazel](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/MODULE.bazel).
-
-### Update the dependency in repository.bzl
-
-Locate the entry for opentelemetry-proto:
-
-```text
-    # OTLP Protocol definition
-    maybe(
-        http_archive,
-        name = "com_github_opentelemetry_proto",
-        build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "bed250ceec8e4a83aa5604d7d5595a61945059dc662edd058a9da082283f7a00",
-        strip_prefix = "opentelemetry-proto-1.3.1",
-        urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.1.tar.gz",
-        ],
-    )
-```
-
-Update the URL to the new tag:
-
-```text
-        urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz",
-        ],
-```
-
-Update strip_prefix to the new tag:
-
-```text
-        strip_prefix = "opentelemetry-proto-1.3.2",
-```
-
-Download the new URL:
-
-```shell
-wget https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz
-```
-
-Run a checksum on the new file:
-
-```shell
-sha256sum v1.3.2.tar.gz
-```
-
-```shell
-c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7  v1.3.2.tar.gz
-```
-
-Update the checksum in file bazel/repository.bzl:
-
-```text
-        sha256 = "c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7",
-```
-
-Typical change:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ git diff bazel/repository.bzl
-diff --git a/bazel/repository.bzl b/bazel/repository.bzl
-index bac1e45b..508b95a3 100644
---- a/bazel/repository.bzl
-+++ b/bazel/repository.bzl
-@@ -88,10 +88,10 @@ def opentelemetry_cpp_deps():
-         http_archive,
-         name = "com_github_opentelemetry_proto",
-         build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
--        sha256 = "bed250ceec8e4a83aa5604d7d5595a61945059dc662edd058a9da082283f7a00",
--        strip_prefix = "opentelemetry-proto-1.3.1",
-+        sha256 = "c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7",
-+        strip_prefix = "opentelemetry-proto-1.3.2",
-         urls = [
--            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.1.tar.gz",
-+            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz",
-         ],
-     )
-```
-
-#### Update MODULE.bazel
+### Update MODULE.bazel
 
 > Remember, the link is different in your case.
 Replace `opentelemetry-proto` to correct target.