Skip to content

Commit c11856e

Browse files
Merge branch 'main' into process_detector_attr
2 parents 07cd812 + dfa7118 commit c11856e

File tree

34 files changed

+40
-68
lines changed

34 files changed

+40
-68
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-24.04
5959
env:
6060
CXX_STANDARD: '17'
61-
CMAKE_VERSION: '3.14.0'
61+
CMAKE_VERSION: '3.16.0'
6262
BUILD_TYPE: 'Debug'
6363
steps:
6464
- name: Harden the runner (Audit all outbound calls)
@@ -1046,7 +1046,7 @@ jobs:
10461046
CXX: /usr/bin/g++-10
10471047
run: ./ci/do_ci.sh code.coverage
10481048
- name: upload report
1049-
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
1049+
uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
10501050
with:
10511051
files: /home/runner/build/coverage.info
10521052

.github/workflows/cmake_install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
env:
154154
INSTALL_TEST_DIR: '/home/runner/install_test'
155155
# Set to the current minimum version of cmake
156-
CMAKE_VERSION: '3.14.0'
156+
CMAKE_VERSION: '3.16.0'
157157
# cxx14 is the default for Ubuntu 22.04
158158
CXX_STANDARD: '14'
159159
BUILD_TYPE: 'Debug'

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
run: |
3838
sudo -E ./ci/setup_ci_environment.sh
3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
40+
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
4141
with:
4242
languages: cpp
4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
44+
uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
46+
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747
# Upload the results to GitHub's code scanning dashboard (optional).
4848
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4949
- name: "Upload to code-scanning"
50-
uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
50+
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
5151
with:
5252
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ Increment the:
3030
* [SDK] View should not have a unit
3131
[#3552](https://github.com/open-telemetry/opentelemetry-cpp/pull/3552)
3232

33+
Important changes:
34+
35+
* [CMAKE] Upgrade CMake minimum version to 3.16
36+
[#3599](https://github.com/open-telemetry/opentelemetry-cpp/pull/3599)
37+
3338
Breaking changes:
3439

3540
* [SDK] View should not have a unit

CMakeLists.txt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.14)
5-
6-
# See https://cmake.org/cmake/help/latest/policy/CMP0074.html required by
7-
# certain version of zlib which CURL depends on.
8-
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12")
9-
cmake_policy(SET CMP0074 NEW)
10-
endif()
11-
12-
# Allow to use normal variable for option()
13-
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
14-
cmake_policy(SET CMP0077 NEW)
15-
endif()
16-
17-
# Prefer CMAKE_MSVC_RUNTIME_LIBRARY if possible
18-
if(POLICY CMP0091)
19-
cmake_policy(SET CMP0091 NEW)
20-
endif()
4+
cmake_minimum_required(VERSION 3.16)
215

226
if(POLICY CMP0092)
237
# https://cmake.org/cmake/help/latest/policy/CMP0092.html#policy:CMP0092 Make
248
# sure the /W3 is not removed from CMAKE_CXX_FLAGS since CMake 3.15
259
cmake_policy(SET CMP0092 OLD)
2610
endif()
2711

28-
# MSVC RTTI flag /GR should not be not added to CMAKE_CXX_FLAGS by default. @see
12+
# MSVC RTTI flag /GR should not be added to CMAKE_CXX_FLAGS by default. @see
2913
# https://cmake.org/cmake/help/latest/policy/CMP0117.html
3014
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
3115
cmake_policy(SET CMP0117 NEW)
@@ -36,11 +20,6 @@ project(opentelemetry-cpp)
3620
# Mark variables as used so cmake doesn't complain about them
3721
mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
3822

39-
# Don't use customized cmake modules if vcpkg is used to resolve dependence.
40-
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
41-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
42-
endif()
43-
4423
# Set the third-party release git tags.
4524
if(EXISTS "${opentelemetry-cpp_SOURCE_DIR}/third_party_release")
4625
file(STRINGS "${opentelemetry-cpp_SOURCE_DIR}/third_party_release"

INSTALL.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ You can link OpenTelemetry C++ SDK with libraries provided in
2323
repository. To install Git, consult the [Set up
2424
Git](https://help.github.com/articles/set-up-git/) guide on GitHub.
2525
- [CMake](https://cmake.org/) for building opentelemetry-cpp API, SDK with their
26-
unittests. The minimum CMake version is 3.14.
27-
CMake 3.15+ is recommended on Windows due to known CI test failures with 3.14.
26+
unittests. The minimum CMake version is 3.16.
2827
To install CMake,
2928
consult the [Installing CMake](https://cmake.org/install/) guide.
3029
- [GoogleTest](https://github.com/google/googletest) framework to build and run

bazel/extra_deps.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55

66
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
77
load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
8-
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
98

109
def opentelemetry_extra_deps():
1110
prometheus_cpp_repositories()
1211
bazel_skylib_workspace()
13-
rules_foreign_cc_dependencies()

bazel/repository.bzl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,6 @@ def opentelemetry_cpp_deps():
141141
],
142142
)
143143

144-
# rules foreign cc
145-
maybe(
146-
http_archive,
147-
name = "rules_foreign_cc",
148-
sha256 = "69023642d5781c68911beda769f91fcbc8ca48711db935a75da7f6536b65047f",
149-
strip_prefix = "rules_foreign_cc-0.6.0",
150-
url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.6.0.tar.gz",
151-
)
152-
153144
# bazel skylib
154145
maybe(
155146
http_archive,

install/cmake/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# CMAKE_CXX_STANDARD: The C++ standard to use for all third-party packages.
2323
# Defaults to 14 if not set.
2424

25-
cmake_minimum_required(VERSION 3.14)
25+
cmake_minimum_required(VERSION 3.16)
2626
project(opentelemetry-cpp-thirdparty-install LANGUAGES CXX)
2727

2828
# Added in CMake 3.16. ExternalProject_Add() with GIT_SUBMODULES "" initializes

0 commit comments

Comments
 (0)