Skip to content

Commit c9323e9

Browse files
committed
Merge remote-tracking branch 'github/main' into validate_utf8_string_in_setters
2 parents 83cb1d3 + 70daba9 commit c9323e9

File tree

201 files changed

+4181
-1026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+4181
-1026
lines changed

.github/workflows/ci.yml

Lines changed: 93 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# submodules: 'recursive'
2222
# - name: setup
2323
# env:
24-
# CXX_STANDARD: '14'
24+
# CXX_STANDARD: '17'
2525
# CC: /usr/bin/gcc-10
2626
# CXX: /usr/bin/g++-10
2727
# run: |
@@ -59,15 +59,18 @@ jobs:
5959
env:
6060
CXX_STANDARD: '17'
6161
CMAKE_VERSION: '3.16.0'
62-
BUILD_TYPE: 'Debug'
62+
BUILD_TYPE: 'Release'
6363
steps:
6464
- name: Harden the runner (Audit all outbound calls)
6565
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
6666
with:
6767
egress-policy: audit
6868
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6969
with:
70-
submodules: 'recursive'
70+
submodules: 'false'
71+
- name: checkout googletest
72+
run: |
73+
git submodule update --init --recursive ./third_party/googletest
7174
- name: setup
7275
run: |
7376
sudo -E ./ci/setup_ci_environment.sh
@@ -86,7 +89,7 @@ jobs:
8689
env:
8790
CC: /usr/bin/gcc-14
8891
CXX: /usr/bin/g++-14
89-
CXX_STANDARD: '14'
92+
CXX_STANDARD: '17'
9093
steps:
9194
- name: Harden the runner (Audit all outbound calls)
9295
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -120,7 +123,7 @@ jobs:
120123
env:
121124
CC: /usr/bin/gcc-14
122125
CXX: /usr/bin/g++-14
123-
CXX_STANDARD: '14'
126+
CXX_STANDARD: '17'
124127
steps:
125128
- name: Harden the runner (Audit all outbound calls)
126129
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -154,7 +157,7 @@ jobs:
154157
env:
155158
CC: /usr/bin/clang-18
156159
CXX: /usr/bin/clang++-18
157-
CXX_STANDARD: '14'
160+
CXX_STANDARD: '17'
158161
steps:
159162
- name: Harden the runner (Audit all outbound calls)
160163
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -182,13 +185,86 @@ jobs:
182185
run: |
183186
(cd ./functional/otlp; ./run_test.sh)
184187
188+
cmake_clang_maintainer_cxx14_async_test:
189+
name: CMake clang 18 with C++14 (maintainer mode, async)
190+
runs-on: ubuntu-24.04
191+
env:
192+
CC: /usr/bin/clang-18
193+
CXX: /usr/bin/clang++-18
194+
CXX_STANDARD: '14'
195+
steps:
196+
- name: Harden the runner (Audit all outbound calls)
197+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
198+
with:
199+
egress-policy: audit
200+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
201+
with:
202+
submodules: 'recursive'
203+
- name: setup
204+
run: |
205+
sudo -E ./ci/setup_ci_environment.sh
206+
- name: install dependencies
207+
run: | # install c++14 compatible third-party versions
208+
sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file ./install/cmake/third_party_stable
209+
- name: run cmake clang (maintainer mode, async)
210+
run: |
211+
./ci/do_ci.sh cmake.maintainer.async.test
212+
- name: generate test cert
213+
env:
214+
CFSSL_VERSION: 1.6.3
215+
run: |
216+
sudo -E ./tools/setup-cfssl.sh
217+
(cd ./functional/cert; ./generate_cert.sh)
218+
- name: run func test
219+
run: |
220+
(cd ./functional/otlp; ./run_test.sh)
221+
222+
cmake_clang_yaml_config:
223+
name: CMake clang 18 (maintainer mode, yaml config)
224+
runs-on: ubuntu-24.04
225+
env:
226+
CC: /usr/bin/clang-18
227+
CXX: /usr/bin/clang++-18
228+
CXX_STANDARD: '17'
229+
steps:
230+
- name: Harden the runner (Audit all outbound calls)
231+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
232+
with:
233+
egress-policy: audit
234+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
235+
with:
236+
submodules: 'recursive'
237+
- name: setup
238+
run: |
239+
sudo -E ./ci/setup_ci_environment.sh
240+
- name: install dependencies
241+
run: |
242+
sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release
243+
- name: run cmake clang (maintainer mode, sync)
244+
run: |
245+
./ci/do_ci.sh cmake.maintainer.yaml.test
246+
- name: install shelltest
247+
run: sudo apt update && sudo apt-get install -y shelltestrunner
248+
- name: generate test cert
249+
env:
250+
CFSSL_VERSION: 1.6.3
251+
run: |
252+
sudo -E ./tools/setup-cfssl.sh
253+
(cd ./functional/cert; ./generate_cert.sh)
254+
- name: run otlp func test
255+
run: |
256+
(cd ./functional/otlp; ./run_test.sh)
257+
- name: run configuration func test
258+
run: |
259+
(cd ./functional/configuration; ./run_test.sh)
260+
185261
cmake_clang_maintainer_async_test:
186262
name: CMake clang 18 (maintainer mode, async)
187263
runs-on: ubuntu-24.04
188264
env:
189265
CC: /usr/bin/clang-18
190266
CXX: /usr/bin/clang++-18
191-
CXX_STANDARD: '14'
267+
CXX_STANDARD: '17'
192268
steps:
193269
- name: Harden the runner (Audit all outbound calls)
194270
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -222,7 +298,7 @@ jobs:
222298
env:
223299
CC: /usr/bin/clang-18
224300
CXX: /usr/bin/clang++-18
225-
CXX_STANDARD: '14'
301+
CXX_STANDARD: '17'
226302
steps:
227303
- name: Harden the runner (Audit all outbound calls)
228304
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -367,6 +443,9 @@ jobs:
367443
- name: setup
368444
run: |
369445
sudo -E ./ci/setup_ci_environment.sh
446+
- name: install dependencies
447+
run: |
448+
sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file ./install/cmake/third_party_stable --packages "googletest;benchmark"
370449
- name: run tests (enable stl)
371450
env:
372451
CXX_STANDARD: '14'
@@ -656,32 +735,6 @@ jobs:
656735
- name: run tests
657736
run: ./ci/do_ci.sh bazel.test
658737

659-
bazel_no_bzlmod_test:
660-
name: Bazel without bzlmod
661-
runs-on: ubuntu-latest
662-
steps:
663-
- name: Harden the runner (Audit all outbound calls)
664-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
665-
with:
666-
egress-policy: audit
667-
668-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
669-
with:
670-
submodules: 'recursive'
671-
- name: Mount Bazel Cache
672-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
673-
env:
674-
cache-name: bazel_cache
675-
with:
676-
path: /home/runner/.cache/bazel
677-
key: bazel_test
678-
- name: setup
679-
run: |
680-
sudo ./ci/setup_ci_environment.sh
681-
sudo ./ci/install_bazelisk.sh
682-
- name: run tests
683-
run: ./ci/do_ci.sh bazel.no_bzlmod.test
684-
685738
bazel_test_async:
686739
name: Bazel with async export
687740
runs-on: ubuntu-latest
@@ -850,6 +903,11 @@ jobs:
850903
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
851904
with:
852905
submodules: 'recursive'
906+
- name: Install CMake
907+
env:
908+
CMAKE_VERSION: 3.31.6 # the macos runner installs CMake 4.x and is not compatible with opentracing
909+
run: |
910+
./ci/setup_cmake_macos.sh
853911
- name: Mount Bazel Cache
854912
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
855913
env:
@@ -1138,7 +1196,7 @@ jobs:
11381196
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
11391197
- name: run w3c trace-context test server (background)
11401198
env:
1141-
CXX_STANDARD: '14'
1199+
CXX_STANDARD: '17'
11421200
run: |
11431201
./ci/do_ci.sh cmake.w3c.trace-context.build-server
11441202
cd $HOME/build/ext/test/w3c_tracecontext_http_test_server

.github/workflows/clang-tidy.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
matrix:
1818
include:
1919
- cmake_options: all-options-abiv1-preview
20-
warning_limit: 61
20+
warning_limit: 63
2121
- cmake_options: all-options-abiv2-preview
22-
warning_limit: 61
22+
warning_limit: 63
2323
steps:
2424
- name: Harden the runner (Audit all outbound calls)
2525
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -49,6 +49,12 @@ jobs:
4949
libgtest-dev \
5050
libbenchmark-dev
5151
52+
- name: Install rapidyaml
53+
run: |
54+
sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release --packages "ryml"
55+
56+
- name: Check clang-tidy
57+
run: |
5258
if ! command -v clang-tidy &> /dev/null; then
5359
echo "clang-tidy could not be found"
5460
exit 1

.github/workflows/cmake_install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
- name: Install Conan
239239
run: |
240240
python3 -m pip install pip==25.0.1
241-
pip install "conan==2.15.1"
241+
pip install "conan==2.21.0"
242242
conan profile detect --force
243243
- name: Install or build all dependencies with Conan
244244
run: |

.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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
40+
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
4141
with:
4242
languages: cpp
4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
44+
uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
46+
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9

.github/workflows/cppcheck.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
--inline-suppr \
3737
--suppress=unknownMacro:exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h \
3838
--language=c++ \
39-
--std=c++14 \
39+
--std=c++17 \
4040
-I api/include \
4141
-I exporters/elasticsearch/include \
4242
-I exporters/etw/include \
@@ -51,6 +51,7 @@ jobs:
5151
-i build \
5252
-i test \
5353
-i third_party \
54+
-i tools \
5455
-j $(nproc) \
5556
. 2>&1 | tee --append cppcheck.log
5657

.github/workflows/iwyu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,15 @@ jobs:
5353
llvm-dev \
5454
libclang-dev \
5555
cmake
56+
57+
- name: Install rapidyaml
58+
run: |
59+
sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release --packages "ryml"
60+
5661
- name: Install include-what-you-use
5762
run: |
5863
sudo ./ci/install_iwyu.sh
64+
5965
- name: Prepare CMake
6066
env:
6167
CC: clang

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
persist-credentials: false
3030

31-
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
31+
- uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3232
with:
3333
results_file: results.sarif
3434
results_format: sarif
@@ -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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
50+
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
5151
with:
5252
sarif_file: results.sarif

.github/workflows/project_management_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
egress-policy: audit
2121

2222
- name: Add comment
23-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
23+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9
2424
with:
2525
issue-number: ${{ github.event.issue.number }}
2626
body: |

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for actions/stale to close stale PRs
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
16+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
1717
with:
1818
stale-issue-message: "This issue was marked as stale due to lack of activity."
1919
days-before-issue-stale: 60

.iwyu.imp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
{ "include": ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
1212
{ "include": ["<bits/types/struct_FILE.h>", "private", "<stdio.h>", "public"] },
1313

14+
# Work around for ryml
15+
{ "include": ["<c4/std/string.hpp>", "private", "<ryml_std.hpp>", "public"] },
16+
17+
{ "include": ["<c4/yml/common.hpp>", "private", "<ryml.hpp>", "public"] },
18+
{ "include": ["<c4/yml/node.hpp>", "private", "<ryml.hpp>", "public"] },
19+
{ "include": ["<c4/yml/parse.hpp>", "private", "<ryml.hpp>", "public"] },
20+
{ "include": ["<c4/yml/parse_engine.hpp>", "private", "<ryml.hpp>", "public"] },
21+
{ "include": ["<c4/yml/tree.hpp>", "private", "<ryml.hpp>", "public"] },
22+
{ "include": ["<c4/yml/event_handler_tree.hpp>", "private", "<ryml.hpp>", "public"] },
23+
{ "include": ["<c4/substr.hpp>", "private", "<ryml.hpp>", "public"] },
24+
{ "include": ["<c4/substr_fwd.hpp>", "private", "<ryml.hpp>", "public"] },
25+
1426
# Local opentelemetry-cpp style
1527

1628
# We prefer to include <gtest/gtest.h> for simplicity

0 commit comments

Comments
 (0)