Skip to content

Commit b94aa7f

Browse files
malkiamalkia
committed
merged from upstream and 1.20
2 parents 7564b59 + ab81479 commit b94aa7f

Some content is hidden

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

45 files changed

+478
-360
lines changed

‎.devcontainer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment variables (for evaluation in `devcontainer.json`).
1212

1313
* **abseil-cpp version:**
1414
This is the version of abseil-cpp that will be used to build protobuf, gRPC,
15-
and opentelemetry-cpp (when WITH_ABSEIL is set).
15+
and opentelemetry-cpp.
1616
* Docker ARG:
1717
`ABSEIL_CPP_VERSION`
1818
* Host Environment Variable:

‎.github/workflows/ci.yml

+58-29
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,11 @@ jobs:
2525
# CXX: /usr/bin/g++-10
2626
# run: |
2727
# sudo -E ./ci/setup_gcc10.sh
28-
# sudo -E ./ci/setup_cmake.sh
2928
# sudo -E ./ci/setup_ci_environment.sh
29+
# sudo -E ./ci/setup_cmake.sh
3030
# sudo -E ./ci/setup_googletest.sh
3131
# sudo -E ./ci/install_abseil.sh
3232
# sudo -E ./ci/install_protobuf.sh
33-
# - name: run otlp exporter tests
34-
# env:
35-
# CC: /usr/bin/gcc-10
36-
# CXX: /usr/bin/g++-10
37-
# WITH_ABSEIL: 'ON'
38-
# CXX_STANDARD: '14'
39-
# run: |
40-
# sudo -E ./ci/setup_grpc.sh -m -p protobuf -p abseil-cpp
41-
# ./ci/do_ci.sh cmake.exporter.otprotocol.test
4233

4334
cmake_test:
4435
name: CMake test (prometheus, elasticsearch, zipkin)
@@ -51,8 +42,9 @@ jobs:
5142
submodules: 'recursive'
5243
- name: setup
5344
run: |
54-
sudo -E ./ci/setup_googletest.sh
5545
sudo -E ./ci/setup_ci_environment.sh
46+
sudo -E ./ci/setup_cmake.sh
47+
sudo -E ./ci/setup_googletest.sh
5648
- name: run cmake tests
5749
run: |
5850
./ci/do_ci.sh cmake.test
@@ -71,8 +63,9 @@ jobs:
7163
PROTOBUF_VERSION: 21.12
7264
run: |
7365
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
74-
sudo -E ./ci/setup_googletest.sh
7566
sudo -E ./ci/setup_ci_environment.sh
67+
sudo -E ./ci/setup_cmake.sh
68+
sudo -E ./ci/setup_googletest.sh
7669
sudo -E ./ci/install_protobuf.sh
7770
- name: setup grpc
7871
run: |
@@ -107,8 +100,9 @@ jobs:
107100
PROTOBUF_VERSION: 21.12
108101
run: |
109102
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
110-
sudo -E ./ci/setup_googletest.sh
111103
sudo -E ./ci/setup_ci_environment.sh
104+
sudo -E ./ci/setup_cmake.sh
105+
sudo -E ./ci/setup_googletest.sh
112106
sudo -E ./ci/install_protobuf.sh
113107
- name: setup grpc
114108
run: |
@@ -143,8 +137,9 @@ jobs:
143137
PROTOBUF_VERSION: 21.12
144138
run: |
145139
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
146-
sudo -E ./ci/setup_googletest.sh
147140
sudo -E ./ci/setup_ci_environment.sh
141+
sudo -E ./ci/setup_cmake.sh
142+
sudo -E ./ci/setup_googletest.sh
148143
sudo -E ./ci/install_protobuf.sh
149144
- name: setup grpc
150145
run: |
@@ -179,8 +174,9 @@ jobs:
179174
PROTOBUF_VERSION: 21.12
180175
run: |
181176
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
182-
sudo -E ./ci/setup_googletest.sh
183177
sudo -E ./ci/setup_ci_environment.sh
178+
sudo -E ./ci/setup_cmake.sh
179+
sudo -E ./ci/setup_googletest.sh
184180
sudo -E ./ci/install_protobuf.sh
185181
- name: setup grpc
186182
run: |
@@ -215,8 +211,9 @@ jobs:
215211
PROTOBUF_VERSION: 21.12
216212
run: |
217213
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
218-
sudo -E ./ci/setup_googletest.sh
219214
sudo -E ./ci/setup_ci_environment.sh
215+
sudo -E ./ci/setup_cmake.sh
216+
sudo -E ./ci/setup_googletest.sh
220217
sudo -E ./ci/install_protobuf.sh
221218
- name: setup grpc
222219
run: |
@@ -246,6 +243,7 @@ jobs:
246243
submodules: 'recursive'
247244
- name: setup
248245
run: |
246+
./ci/setup_cmake.ps1
249247
./ci/setup_windows_ci_environment.ps1
250248
- name: run tests
251249
run: ./ci/do_ci.ps1 cmake.maintainer.test
@@ -259,6 +257,7 @@ jobs:
259257
submodules: 'recursive'
260258
- name: setup
261259
run: |
260+
./ci/setup_cmake.ps1
262261
./ci/setup_windows_ci_environment.ps1
263262
- name: run tests
264263
env:
@@ -274,6 +273,7 @@ jobs:
274273
submodules: 'recursive'
275274
- name: setup
276275
run: |
276+
./ci/setup_cmake.ps1
277277
./ci/setup_windows_ci_environment.ps1
278278
- name: run tests
279279
env:
@@ -292,8 +292,9 @@ jobs:
292292
CC: /usr/bin/gcc-12
293293
CXX: /usr/bin/g++-12
294294
run: |
295-
sudo -E ./ci/setup_googletest.sh
296295
sudo -E ./ci/setup_ci_environment.sh
296+
sudo -E ./ci/setup_cmake.sh
297+
sudo -E ./ci/setup_googletest.sh
297298
- name: run cmake tests (without otlp-exporter)
298299
env:
299300
CC: /usr/bin/gcc-12
@@ -310,8 +311,10 @@ jobs:
310311
# submodules: 'recursive'
311312
# - name: setup
312313
# run: |
313-
# sudo -E ./ci/setup_googletest.sh
314+
314315
# sudo -E ./ci/setup_ci_environment.sh
316+
# sudo -E ./ci/setup_cmake.sh
317+
# sudo -E ./ci/setup_googletest.sh
315318
# - name: run cmake tests (enable abseil-cpp)
316319
# run: |
317320
# sudo ./ci/install_abseil.sh
@@ -326,8 +329,9 @@ jobs:
326329
submodules: 'recursive'
327330
- name: setup
328331
run: |
329-
sudo -E ./ci/setup_googletest.sh
330332
sudo -E ./ci/setup_ci_environment.sh
333+
sudo -E ./ci/setup_cmake.sh
334+
sudo -E ./ci/setup_googletest.sh
331335
- name: run cmake tests (enable opentracing-shim)
332336
run: ./ci/do_ci.sh cmake.opentracing_shim.test
333337

@@ -341,6 +345,7 @@ jobs:
341345
- name: setup
342346
run: |
343347
sudo -E ./ci/setup_ci_environment.sh
348+
sudo -E ./ci/setup_cmake.sh
344349
sudo -E ./ci/setup_googletest.sh
345350
- name: run tests (enable stl)
346351
env:
@@ -357,6 +362,7 @@ jobs:
357362
- name: setup
358363
run: |
359364
sudo -E ./ci/setup_ci_environment.sh
365+
sudo -E ./ci/setup_cmake.sh
360366
sudo -E ./ci/setup_googletest.sh
361367
- name: run tests (enable stl)
362368
env:
@@ -373,6 +379,7 @@ jobs:
373379
- name: setup
374380
run: |
375381
sudo -E ./ci/setup_ci_environment.sh
382+
sudo -E ./ci/setup_cmake.sh
376383
sudo -E ./ci/setup_googletest.sh
377384
- name: run tests
378385
env:
@@ -397,6 +404,7 @@ jobs:
397404
CXXFLAGS: "-stdlib=libc++"
398405
run: |
399406
sudo -E ./ci/setup_ci_environment.sh
407+
sudo -E ./ci/setup_cmake.sh
400408
sudo -E ./ci/setup_googletest.sh
401409
- name: run tests
402410
env:
@@ -423,6 +431,7 @@ jobs:
423431
- name: setup
424432
run: |
425433
sudo -E ./ci/setup_ci_environment.sh
434+
sudo -E ./ci/setup_cmake.sh
426435
sudo -E ./ci/setup_googletest.sh
427436
- name: run tests
428437
env:
@@ -447,6 +456,7 @@ jobs:
447456
CXXFLAGS: "-stdlib=libc++"
448457
run: |
449458
sudo -E ./ci/setup_ci_environment.sh
459+
sudo -E ./ci/setup_cmake.sh
450460
sudo -E ./ci/setup_googletest.sh
451461
- name: run tests
452462
env:
@@ -472,8 +482,9 @@ jobs:
472482
submodules: 'recursive'
473483
- name: setup
474484
run: |
475-
sudo -E ./ci/setup_googletest.sh
476485
sudo -E ./ci/setup_ci_environment.sh
486+
sudo -E ./ci/setup_cmake.sh
487+
sudo -E ./ci/setup_googletest.sh
477488
- name: run otlp exporter tests
478489
run: |
479490
sudo ./ci/setup_grpc.sh
@@ -501,13 +512,13 @@ jobs:
501512
ABSEIL_CPP_VERSION: '20230125.3'
502513
CXX_STANDARD: '14'
503514
run: |
504-
sudo ./ci/setup_googletest.sh
505-
sudo ./ci/setup_ci_environment.sh
515+
sudo -E ./ci/setup_ci_environment.sh
516+
sudo -E ./ci/setup_cmake.sh
517+
sudo -E ./ci/setup_googletest.sh
506518
sudo -E ./ci/install_abseil.sh
507519
sudo -E ./ci/install_protobuf.sh
508520
- name: run otlp exporter tests
509521
env:
510-
WITH_ABSEIL: 'ON'
511522
CXX_STANDARD: '14'
512523
run: |
513524
sudo -E ./ci/setup_grpc.sh -m -p protobuf -p abseil-cpp
@@ -522,8 +533,9 @@ jobs:
522533
submodules: 'recursive'
523534
- name: setup
524535
run: |
525-
sudo -E ./ci/setup_googletest.sh
526536
sudo -E ./ci/setup_ci_environment.sh
537+
sudo -E ./ci/setup_cmake.sh
538+
sudo -E ./ci/setup_googletest.sh
527539
- name: run otlp exporter tests
528540
run: |
529541
sudo ./ci/setup_grpc.sh
@@ -538,8 +550,9 @@ jobs:
538550
submodules: 'recursive'
539551
- name: setup
540552
run: |
541-
sudo -E ./ci/setup_googletest.sh
542553
sudo -E ./ci/setup_ci_environment.sh
554+
sudo -E ./ci/setup_cmake.sh
555+
sudo -E ./ci/setup_googletest.sh
543556
- name: run otlp exporter tests
544557
run: |
545558
sudo ./ci/setup_grpc.sh -T
@@ -554,8 +567,9 @@ jobs:
554567
# submodules: 'recursive'
555568
# - name: setup
556569
# run: |
557-
# sudo -E ./ci/setup_googletest.sh
558570
# sudo -E ./ci/setup_ci_environment.sh
571+
# sudo -E ./ci/setup_cmake.sh
572+
# sudo -E ./ci/setup_googletest.sh
559573
# - name: run cmake install (with abseil)
560574
# run: |
561575
# sudo ./ci/install_abseil.sh
@@ -576,8 +590,9 @@ jobs:
576590
CC: /usr/bin/gcc-12
577591
CXX: /usr/bin/g++-12
578592
run: |
579-
sudo -E ./ci/setup_googletest.sh
580593
sudo -E ./ci/setup_ci_environment.sh
594+
sudo -E ./ci/setup_cmake.sh
595+
sudo -E ./ci/setup_googletest.sh
581596
- name: run tests
582597
env:
583598
CC: /usr/bin/gcc-12
@@ -601,6 +616,7 @@ jobs:
601616
- name: setup
602617
run: |
603618
sudo ./ci/setup_ci_environment.sh
619+
sudo ./ci/setup_cmake.sh
604620
sudo ./ci/install_bazelisk.sh
605621
- name: run tests
606622
run: ./ci/do_ci.sh bazel.test
@@ -622,6 +638,7 @@ jobs:
622638
- name: setup
623639
run: |
624640
sudo ./ci/setup_ci_environment.sh
641+
sudo ./ci/setup_cmake.sh
625642
sudo ./ci/install_bazelisk.sh
626643
- name: run tests
627644
run: ./ci/do_ci.sh bazel.no_bzlmod.test
@@ -643,6 +660,7 @@ jobs:
643660
- name: setup
644661
run: |
645662
sudo ./ci/setup_ci_environment.sh
663+
sudo ./ci/setup_cmake.sh
646664
sudo ./ci/install_bazelisk.sh
647665
- name: run tests
648666
run: ./ci/do_ci.sh bazel.with_async_export.test
@@ -664,6 +682,7 @@ jobs:
664682
- name: setup
665683
run: |
666684
sudo ./ci/setup_ci_environment.sh
685+
sudo ./ci/setup_cmake.sh
667686
sudo ./ci/install_bazelisk.sh
668687
- name: run tests
669688
run: ./ci/do_ci.sh bazel.valgrind
@@ -685,6 +704,7 @@ jobs:
685704
- name: setup
686705
run: |
687706
sudo ./ci/setup_ci_environment.sh
707+
sudo ./ci/setup_cmake.sh
688708
sudo ./ci/install_bazelisk.sh
689709
- name: run tests
690710
run: ./ci/do_ci.sh bazel.noexcept
@@ -706,6 +726,7 @@ jobs:
706726
- name: setup
707727
run: |
708728
sudo ./ci/setup_ci_environment.sh
729+
sudo ./ci/setup_cmake.sh
709730
sudo ./ci/install_bazelisk.sh
710731
- name: run tests
711732
run: ./ci/do_ci.sh bazel.nortti
@@ -727,6 +748,7 @@ jobs:
727748
- name: setup
728749
run: |
729750
sudo ./ci/setup_ci_environment.sh
751+
sudo ./ci/setup_cmake.sh
730752
sudo ./ci/install_bazelisk.sh
731753
- name: run tests
732754
run: ./ci/do_ci.sh bazel.asan
@@ -748,6 +770,7 @@ jobs:
748770
- name: setup
749771
run: |
750772
sudo ./ci/setup_ci_environment.sh
773+
sudo ./ci/setup_cmake.sh
751774
sudo ./ci/install_bazelisk.sh
752775
- name: run tests
753776
run: ./ci/do_ci.sh bazel.tsan
@@ -824,6 +847,7 @@ jobs:
824847
submodules: 'recursive'
825848
- name: setup
826849
run: |
850+
./ci/setup_cmake.ps1
827851
./ci/setup_windows_ci_environment.ps1
828852
./ci/install_windows_protobuf.ps1
829853
- name: run cmake test
@@ -840,6 +864,7 @@ jobs:
840864
submodules: 'recursive'
841865
- name: setup
842866
run: |
867+
./ci/setup_cmake.ps1
843868
./ci/setup_windows_ci_environment.ps1
844869
./ci/install_windows_protobuf.ps1
845870
- name: run cmake test (DLL build)
@@ -858,6 +883,7 @@ jobs:
858883
submodules: 'recursive'
859884
- name: setup
860885
run: |
886+
./ci/setup_cmake.ps1
861887
./ci/setup_windows_ci_environment.ps1
862888
./ci/install_windows_protobuf.ps1
863889
- name: run cmake test
@@ -887,6 +913,7 @@ jobs:
887913
submodules: 'recursive'
888914
- name: setup
889915
run: |
916+
./ci/setup_cmake.ps1
890917
./ci/setup_windows_ci_environment.ps1
891918
- name: run tests
892919
run: ./ci/do_ci.ps1 cmake.test_example_plugin
@@ -903,8 +930,9 @@ jobs:
903930
CC: /usr/bin/gcc-10
904931
CXX: /usr/bin/g++-10
905932
run: |
906-
sudo -E ./ci/setup_googletest.sh
907933
sudo -E ./ci/setup_ci_environment.sh
934+
sudo -E ./ci/setup_cmake.sh
935+
sudo -E ./ci/setup_googletest.sh
908936
- name: run tests and generate report
909937
env:
910938
CC: /usr/bin/gcc-10
@@ -974,8 +1002,9 @@ jobs:
9741002
CC: /usr/bin/gcc-12
9751003
CXX: /usr/bin/g++-12
9761004
run: |
977-
sudo -E ./ci/setup_googletest.sh
9781005
sudo -E ./ci/setup_ci_environment.sh
1006+
sudo -E ./ci/setup_cmake.sh
1007+
sudo -E ./ci/setup_googletest.sh
9791008
- name: run w3c trace-context test server (background)
9801009
env:
9811010
CXX_STANDARD: '14'

‎.github/workflows/clang-tidy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ jobs:
7878
COUNT=$(grep -c "warning:" clang-tidy.log)
7979
echo "clang-tidy reported ${COUNT} warning(s)"
8080
81-
# TODO: include WITH_OTLP_GRPC and WITH_ABSEIL flags.
81+
# TODO: include WITH_OTLP_GRPC flags.

0 commit comments

Comments
 (0)