Skip to content

Commit acf9451

Browse files
malkiamalkia
authored
Merge pull request #353 from open-telemetry/main
merged from the upstream
2 parents b3c1759 + 4561fc2 commit acf9451

18 files changed

+187
-135
lines changed

‎.devcontainer/Dockerfile.dev‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ ARG USER_GID=1000
88
ARG INSTALL_PACKAGES=
99

1010
ARG CXX_STANDARD=17
11-
ARG CMAKE_VERSION=3.31.6
1211
ARG ABSEIL_CPP_VERSION=20230125.3
1312
ARG PROTOBUF_VERSION=23.3
1413
ARG GRPC_VERSION=v1.55.0
1514

1615
ENV CXX_STANDARD=${CXX_STANDARD}
17-
ENV CMAKE_VERSION=${CMAKE_VERSION}
1816
ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
1917
ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
2018
ENV GRPC_VERSION=${GRPC_VERSION}
@@ -27,9 +25,9 @@ RUN apt update && apt install -y wget \
2725
libclang-dev \
2826
libcurl4-openssl-dev \
2927
clang-tidy \
30-
shellcheck
28+
shellcheck \
29+
cmake
3130

32-
RUN cd /opt/ci && bash setup_cmake.sh
3331
RUN cd /opt/ci && bash setup_ci_environment.sh
3432
RUN cd /opt/ci && bash install_iwyu.sh
3533
RUN cd /opt && bash ci/setup_googletest.sh \

‎.devcontainer/README.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
Customize your dev container using build arguments (for direct Docker builds) or
44
environment variables (for evaluation in `devcontainer.json`).
55

6-
* **CMake version:**
7-
The version of cmake to install. (Default: 3.31.6)
8-
* Docker ARG:
9-
`CMAKE_VERSION`
10-
* Host Environment Variable:
11-
`OTEL_CPP_DEVCONTAINER_CMAKE_VERSION`
12-
136
* **CXX standard:**
147
This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17)
158
* Docker ARG:

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}",
1212
"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
1313
"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
14-
"CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}",
1514
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
1615
"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
1716
"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
# run: |
3030
# sudo -E ./ci/setup_gcc10.sh
3131
# sudo -E ./ci/setup_ci_environment.sh
32-
# sudo -E ./ci/setup_cmake.sh
3332
# sudo -E ./ci/setup_googletest.sh
3433
# sudo -E ./ci/install_abseil.sh
3534
# sudo -E ./ci/install_protobuf.sh
@@ -51,7 +50,6 @@ jobs:
5150
- name: setup
5251
run: |
5352
sudo -E ./ci/setup_ci_environment.sh
54-
sudo -E ./ci/setup_cmake.sh
5553
sudo -E ./ci/setup_googletest.sh
5654
- name: run cmake tests
5755
run: |
@@ -74,7 +72,6 @@ jobs:
7472
- name: setup
7573
run: |
7674
sudo -E ./ci/setup_ci_environment.sh
77-
sudo -E ./ci/setup_cmake.sh
7875
sudo -E ./ci/setup_googletest.sh
7976
- name: Install abseil, protobuf, and grpc with apt
8077
run: |
@@ -104,7 +101,6 @@ jobs:
104101
run: |
105102
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
106103
sudo -E ./ci/setup_ci_environment.sh
107-
sudo -E ./ci/setup_cmake.sh
108104
sudo -E ./ci/setup_googletest.sh
109105
sudo -E ./ci/install_protobuf.sh
110106
- name: setup grpc
@@ -146,7 +142,6 @@ jobs:
146142
run: |
147143
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
148144
sudo -E ./ci/setup_ci_environment.sh
149-
sudo -E ./ci/setup_cmake.sh
150145
sudo -E ./ci/setup_googletest.sh
151146
sudo -E ./ci/install_protobuf.sh
152147
- name: setup grpc
@@ -188,7 +183,6 @@ jobs:
188183
run: |
189184
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
190185
sudo -E ./ci/setup_ci_environment.sh
191-
sudo -E ./ci/setup_cmake.sh
192186
sudo -E ./ci/setup_googletest.sh
193187
sudo -E ./ci/install_protobuf.sh
194188
- name: setup grpc
@@ -230,7 +224,6 @@ jobs:
230224
run: |
231225
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
232226
sudo -E ./ci/setup_ci_environment.sh
233-
sudo -E ./ci/setup_cmake.sh
234227
sudo -E ./ci/setup_googletest.sh
235228
sudo -E ./ci/install_protobuf.sh
236229
- name: setup grpc
@@ -272,7 +265,6 @@ jobs:
272265
run: |
273266
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
274267
sudo -E ./ci/setup_ci_environment.sh
275-
sudo -E ./ci/setup_cmake.sh
276268
sudo -E ./ci/setup_googletest.sh
277269
sudo -E ./ci/install_protobuf.sh
278270
- name: setup grpc
@@ -308,7 +300,6 @@ jobs:
308300
submodules: 'recursive'
309301
- name: setup
310302
run: |
311-
./ci/setup_cmake.ps1
312303
./ci/setup_windows_ci_environment.ps1
313304
- name: run tests
314305
run: ./ci/do_ci.ps1 cmake.maintainer.test
@@ -327,7 +318,6 @@ jobs:
327318
submodules: 'recursive'
328319
- name: setup
329320
run: |
330-
./ci/setup_cmake.ps1
331321
./ci/setup_windows_ci_environment.ps1
332322
- name: run tests
333323
env:
@@ -348,7 +338,6 @@ jobs:
348338
submodules: 'recursive'
349339
- name: setup
350340
run: |
351-
./ci/setup_cmake.ps1
352341
./ci/setup_windows_ci_environment.ps1
353342
- name: run tests
354343
env:
@@ -373,7 +362,6 @@ jobs:
373362
CXX: /usr/bin/g++-12
374363
run: |
375364
sudo -E ./ci/setup_ci_environment.sh
376-
sudo -E ./ci/setup_cmake.sh
377365
sudo -E ./ci/setup_googletest.sh
378366
- name: run cmake tests (without otlp-exporter)
379367
env:
@@ -397,7 +385,6 @@ jobs:
397385
- name: setup
398386
run: |
399387
sudo -E ./ci/setup_ci_environment.sh
400-
sudo -E ./ci/setup_cmake.sh
401388
sudo -E ./ci/setup_googletest.sh
402389
- name: run cmake tests (enable opentracing-shim)
403390
run: ./ci/do_ci.sh cmake.opentracing_shim.test
@@ -417,7 +404,6 @@ jobs:
417404
- name: setup
418405
run: |
419406
sudo -E ./ci/setup_ci_environment.sh
420-
sudo -E ./ci/setup_cmake.sh
421407
sudo -E ./ci/setup_googletest.sh
422408
- name: run tests (enable stl)
423409
env:
@@ -439,7 +425,6 @@ jobs:
439425
- name: setup
440426
run: |
441427
sudo -E ./ci/setup_ci_environment.sh
442-
sudo -E ./ci/setup_cmake.sh
443428
sudo -E ./ci/setup_googletest.sh
444429
- name: run tests (enable stl)
445430
env:
@@ -461,7 +446,6 @@ jobs:
461446
- name: setup
462447
run: |
463448
sudo -E ./ci/setup_ci_environment.sh
464-
sudo -E ./ci/setup_cmake.sh
465449
sudo -E ./ci/setup_googletest.sh
466450
- name: run tests
467451
env:
@@ -491,7 +475,6 @@ jobs:
491475
CXXFLAGS: "-stdlib=libc++"
492476
run: |
493477
sudo -E ./ci/setup_ci_environment.sh
494-
sudo -E ./ci/setup_cmake.sh
495478
sudo -E ./ci/setup_googletest.sh
496479
- name: run tests
497480
env:
@@ -523,7 +506,6 @@ jobs:
523506
- name: setup
524507
run: |
525508
sudo -E ./ci/setup_ci_environment.sh
526-
sudo -E ./ci/setup_cmake.sh
527509
sudo -E ./ci/setup_googletest.sh
528510
- name: run tests
529511
env:
@@ -553,7 +535,6 @@ jobs:
553535
CXXFLAGS: "-stdlib=libc++"
554536
run: |
555537
sudo -E ./ci/setup_ci_environment.sh
556-
sudo -E ./ci/setup_cmake.sh
557538
sudo -E ./ci/setup_googletest.sh
558539
- name: run tests
559540
env:
@@ -585,7 +566,6 @@ jobs:
585566
- name: setup
586567
run: |
587568
sudo -E ./ci/setup_ci_environment.sh
588-
sudo -E ./ci/setup_cmake.sh
589569
sudo -E ./ci/setup_googletest.sh
590570
- name: run otlp exporter tests
591571
run: |
@@ -620,7 +600,6 @@ jobs:
620600
CXX_STANDARD: '14'
621601
run: |
622602
sudo -E ./ci/setup_ci_environment.sh
623-
sudo -E ./ci/setup_cmake.sh
624603
sudo -E ./ci/setup_googletest.sh
625604
sudo -E ./ci/install_abseil.sh
626605
sudo -E ./ci/install_protobuf.sh
@@ -646,7 +625,6 @@ jobs:
646625
- name: setup
647626
run: |
648627
sudo -E ./ci/setup_ci_environment.sh
649-
sudo -E ./ci/setup_cmake.sh
650628
sudo -E ./ci/setup_googletest.sh
651629
- name: run otlp exporter tests
652630
run: |
@@ -668,7 +646,6 @@ jobs:
668646
- name: setup
669647
run: |
670648
sudo -E ./ci/setup_ci_environment.sh
671-
sudo -E ./ci/setup_cmake.sh
672649
sudo -E ./ci/setup_googletest.sh
673650
- name: run otlp exporter tests
674651
run: |
@@ -693,7 +670,6 @@ jobs:
693670
CXX: /usr/bin/g++-12
694671
run: |
695672
sudo -E ./ci/setup_ci_environment.sh
696-
sudo -E ./ci/setup_cmake.sh
697673
sudo -E ./ci/setup_googletest.sh
698674
- name: run tests
699675
env:
@@ -723,7 +699,6 @@ jobs:
723699
- name: setup
724700
run: |
725701
sudo ./ci/setup_ci_environment.sh
726-
sudo ./ci/setup_cmake.sh
727702
sudo ./ci/install_bazelisk.sh
728703
- name: run tests
729704
run: ./ci/do_ci.sh bazel.test
@@ -750,7 +725,6 @@ jobs:
750725
- name: setup
751726
run: |
752727
sudo ./ci/setup_ci_environment.sh
753-
sudo ./ci/setup_cmake.sh
754728
sudo ./ci/install_bazelisk.sh
755729
- name: run tests
756730
run: ./ci/do_ci.sh bazel.no_bzlmod.test
@@ -777,7 +751,6 @@ jobs:
777751
- name: setup
778752
run: |
779753
sudo ./ci/setup_ci_environment.sh
780-
sudo ./ci/setup_cmake.sh
781754
sudo ./ci/install_bazelisk.sh
782755
- name: run tests
783756
run: ./ci/do_ci.sh bazel.with_async_export.test
@@ -804,7 +777,6 @@ jobs:
804777
- name: setup
805778
run: |
806779
sudo ./ci/setup_ci_environment.sh
807-
sudo ./ci/setup_cmake.sh
808780
sudo ./ci/install_bazelisk.sh
809781
- name: run tests
810782
run: ./ci/do_ci.sh bazel.valgrind
@@ -831,7 +803,6 @@ jobs:
831803
- name: setup
832804
run: |
833805
sudo ./ci/setup_ci_environment.sh
834-
sudo ./ci/setup_cmake.sh
835806
sudo ./ci/install_bazelisk.sh
836807
- name: run tests
837808
run: ./ci/do_ci.sh bazel.noexcept
@@ -858,7 +829,6 @@ jobs:
858829
- name: setup
859830
run: |
860831
sudo ./ci/setup_ci_environment.sh
861-
sudo ./ci/setup_cmake.sh
862832
sudo ./ci/install_bazelisk.sh
863833
- name: run tests
864834
run: ./ci/do_ci.sh bazel.nortti
@@ -885,7 +855,6 @@ jobs:
885855
- name: setup
886856
run: |
887857
sudo ./ci/setup_ci_environment.sh
888-
sudo ./ci/setup_cmake.sh
889858
sudo ./ci/install_bazelisk.sh
890859
- name: run tests
891860
run: ./ci/do_ci.sh bazel.asan
@@ -912,7 +881,6 @@ jobs:
912881
- name: setup
913882
run: |
914883
sudo ./ci/setup_ci_environment.sh
915-
sudo ./ci/setup_cmake.sh
916884
sudo ./ci/install_bazelisk.sh
917885
- name: run tests
918886
run: ./ci/do_ci.sh bazel.tsan
@@ -1014,7 +982,6 @@ jobs:
1014982
submodules: 'recursive'
1015983
- name: setup
1016984
run: |
1017-
./ci/setup_cmake.ps1
1018985
./ci/setup_windows_ci_environment.ps1
1019986
./ci/install_windows_protobuf.ps1
1020987
- name: run cmake test
@@ -1036,7 +1003,6 @@ jobs:
10361003
submodules: 'recursive'
10371004
- name: setup
10381005
run: |
1039-
./ci/setup_cmake.ps1
10401006
./ci/setup_windows_ci_environment.ps1
10411007
./ci/install_windows_protobuf.ps1
10421008
- name: run cmake test (DLL build)
@@ -1060,7 +1026,6 @@ jobs:
10601026
submodules: 'recursive'
10611027
- name: setup
10621028
run: |
1063-
./ci/setup_cmake.ps1
10641029
./ci/setup_windows_ci_environment.ps1
10651030
./ci/install_windows_protobuf.ps1
10661031
- name: run cmake test
@@ -1100,7 +1065,6 @@ jobs:
11001065
submodules: 'recursive'
11011066
- name: setup
11021067
run: |
1103-
./ci/setup_cmake.ps1
11041068
./ci/setup_windows_ci_environment.ps1
11051069
- name: run tests
11061070
run: ./ci/do_ci.ps1 cmake.test_example_plugin
@@ -1123,7 +1087,6 @@ jobs:
11231087
CXX: /usr/bin/g++-10
11241088
run: |
11251089
sudo -E ./ci/setup_ci_environment.sh
1126-
sudo -E ./ci/setup_cmake.sh
11271090
sudo -E ./ci/setup_googletest.sh
11281091
- name: run tests and generate report
11291092
env:
@@ -1220,7 +1183,6 @@ jobs:
12201183
CXX: /usr/bin/g++-12
12211184
run: |
12221185
sudo -E ./ci/setup_ci_environment.sh
1223-
sudo -E ./ci/setup_cmake.sh
12241186
sudo -E ./ci/setup_googletest.sh
12251187
- name: run w3c trace-context test server (background)
12261188
env:

0 commit comments

Comments
 (0)