Skip to content

Commit 5aa1f67

Browse files
ThomsonTanThomsonTan
authored
Merge branch 'main' into SetExemplarInSDK
2 parents ea56f06 + a06fd25 commit 5aa1f67

File tree

20 files changed

+49
-33
lines changed

20 files changed

+49
-33
lines changed

‎buildscripts/pre_release.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Copyright The OpenTelemetry Authors
44
# SPDX-License-Identifier: Apache-2.0
5+
set -e
56

67
usage() { echo "Usage: $0 -t <tag>" 1>&2; exit 1; }
78

@@ -25,13 +26,13 @@ if [[ ${tag} =~ ${semver_regex} ]]; then
2526
echo "${tag} is valid semver tag"
2627
else
2728
echo "Error: ${tag} is not a valid semver tag. Exiting"
28-
exit -1
29+
exit 1
2930
fi
3031

3132
#ensure tag doesn't exits
3233
if [[ $(git tag --list ${tag}) ]]; then
3334
echo "Error: Tag ${tag} already exists. Exiting"
34-
exit -1
35+
exit 1
3536
fi
3637

3738
if ! git diff --quiet; then \

‎buildscripts/semantic-convention/generate.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# opentelemetry-java/buildscripts/semantic-convention/generate.sh
99
# for opentelemetry-cpp
1010
#
11+
set -e
1112

1213
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1314
ROOT_DIR="${SCRIPT_DIR}/../../"

‎ci/do_ci.sh‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export CTEST_OUTPUT_ON_FAILURE=1
9595
if [[ "$1" == "cmake.test" ]]; then
9696
cd "${BUILD_DIR}"
9797
rm -rf *
98-
cmake ${CMAKE_OPTIONS[@]} \
98+
cmake "${CMAKE_OPTIONS[@]}" \
9999
-DWITH_PROMETHEUS=ON \
100100
-DWITH_ZIPKIN=ON \
101101
-DWITH_ELASTICSEARCH=ON \
@@ -108,7 +108,7 @@ if [[ "$1" == "cmake.test" ]]; then
108108
elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
109109
cd "${BUILD_DIR}"
110110
rm -rf *
111-
cmake ${CMAKE_OPTIONS[@]} \
111+
cmake "${CMAKE_OPTIONS[@]}" \
112112
-DWITH_OTLP_HTTP=ON \
113113
-DWITH_PROMETHEUS=ON \
114114
-DWITH_EXAMPLES=ON \
@@ -129,7 +129,7 @@ elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
129129
elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
130130
cd "${BUILD_DIR}"
131131
rm -rf *
132-
cmake ${CMAKE_OPTIONS[@]} \
132+
cmake "${CMAKE_OPTIONS[@]}" \
133133
-DWITH_OTLP_HTTP=ON \
134134
-DWITH_PROMETHEUS=ON \
135135
-DWITH_EXAMPLES=ON \
@@ -150,7 +150,7 @@ elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
150150
elif [[ "$1" == "cmake.maintainer.cpp11.async.test" ]]; then
151151
cd "${BUILD_DIR}"
152152
rm -rf *
153-
cmake ${CMAKE_OPTIONS[@]} \
153+
cmake "${CMAKE_OPTIONS[@]}" \
154154
-DCMAKE_CXX_STANDARD=11 \
155155
-DWITH_OTLP_HTTP=ON \
156156
-DWITH_PROMETHEUS=ON \
@@ -171,7 +171,7 @@ elif [[ "$1" == "cmake.maintainer.cpp11.async.test" ]]; then
171171
elif [[ "$1" == "cmake.maintainer.abiv2.test" ]]; then
172172
cd "${BUILD_DIR}"
173173
rm -rf *
174-
cmake ${CMAKE_OPTIONS[@]} \
174+
cmake "${CMAKE_OPTIONS[@]}" \
175175
-DWITH_OTLP_HTTP=ON \
176176
-DWITH_PROMETHEUS=ON \
177177
-DWITH_EXAMPLES=ON \
@@ -194,7 +194,7 @@ elif [[ "$1" == "cmake.maintainer.abiv2.test" ]]; then
194194
elif [[ "$1" == "cmake.with_async_export.test" ]]; then
195195
cd "${BUILD_DIR}"
196196
rm -rf *
197-
cmake ${CMAKE_OPTIONS[@]} \
197+
cmake "${CMAKE_OPTIONS[@]}" \
198198
-DWITH_PROMETHEUS=ON \
199199
-DWITH_ZIPKIN=ON \
200200
-DWITH_ELASTICSEARCH=ON \
@@ -208,7 +208,7 @@ elif [[ "$1" == "cmake.with_async_export.test" ]]; then
208208
elif [[ "$1" == "cmake.abseil.test" ]]; then
209209
cd "${BUILD_DIR}"
210210
rm -rf *
211-
cmake ${CMAKE_OPTIONS[@]} \
211+
cmake "${CMAKE_OPTIONS[@]}" \
212212
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
213213
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
214214
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -220,7 +220,7 @@ elif [[ "$1" == "cmake.abseil.test" ]]; then
220220
elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
221221
cd "${BUILD_DIR}"
222222
rm -rf *
223-
cmake ${CMAKE_OPTIONS[@]} \
223+
cmake "${CMAKE_OPTIONS[@]}" \
224224
-DCMAKE_CXX_FLAGS="-Werror -Wno-error=redundant-move $CXXFLAGS" \
225225
-DWITH_OPENTRACING=ON \
226226
"${SRC_DIR}"
@@ -230,7 +230,7 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
230230
elif [[ "$1" == "cmake.c++20.test" ]]; then
231231
cd "${BUILD_DIR}"
232232
rm -rf *
233-
cmake ${CMAKE_OPTIONS[@]} \
233+
cmake "${CMAKE_OPTIONS[@]}" \
234234
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
235235
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
236236
-DWITH_STL=CXX20 \
@@ -242,7 +242,7 @@ elif [[ "$1" == "cmake.c++20.test" ]]; then
242242
elif [[ "$1" == "cmake.c++23.test" ]]; then
243243
cd "${BUILD_DIR}"
244244
rm -rf *
245-
cmake ${CMAKE_OPTIONS[@]} \
245+
cmake "${CMAKE_OPTIONS[@]}" \
246246
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
247247
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
248248
-DWITH_STL=CXX23 \
@@ -254,7 +254,7 @@ elif [[ "$1" == "cmake.c++23.test" ]]; then
254254
elif [[ "$1" == "cmake.c++14.stl.test" ]]; then
255255
cd "${BUILD_DIR}"
256256
rm -rf *
257-
cmake ${CMAKE_OPTIONS[@]} \
257+
cmake "${CMAKE_OPTIONS[@]}" \
258258
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
259259
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
260260
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -267,7 +267,7 @@ elif [[ "$1" == "cmake.c++14.stl.test" ]]; then
267267
elif [[ "$1" == "cmake.c++17.stl.test" ]]; then
268268
cd "${BUILD_DIR}"
269269
rm -rf *
270-
cmake ${CMAKE_OPTIONS[@]} \
270+
cmake "${CMAKE_OPTIONS[@]}" \
271271
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
272272
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
273273
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -280,7 +280,7 @@ elif [[ "$1" == "cmake.c++17.stl.test" ]]; then
280280
elif [[ "$1" == "cmake.c++20.stl.test" ]]; then
281281
cd "${BUILD_DIR}"
282282
rm -rf *
283-
cmake ${CMAKE_OPTIONS[@]} \
283+
cmake "${CMAKE_OPTIONS[@]}" \
284284
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
285285
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
286286
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -293,7 +293,7 @@ elif [[ "$1" == "cmake.c++20.stl.test" ]]; then
293293
elif [[ "$1" == "cmake.c++23.stl.test" ]]; then
294294
cd "${BUILD_DIR}"
295295
rm -rf *
296-
cmake ${CMAKE_OPTIONS[@]} \
296+
cmake "${CMAKE_OPTIONS[@]}" \
297297
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
298298
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
299299
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -308,7 +308,7 @@ elif [[ "$1" == "cmake.legacy.test" ]]; then
308308
rm -rf *
309309
export BUILD_ROOT="${BUILD_DIR}"
310310
${SRC_DIR}/tools/build-benchmark.sh
311-
cmake ${CMAKE_OPTIONS[@]} \
311+
cmake "${CMAKE_OPTIONS[@]}" \
312312
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
313313
"${SRC_DIR}"
314314
make -j $(nproc)
@@ -319,7 +319,7 @@ elif [[ "$1" == "cmake.legacy.exporter.otprotocol.test" ]]; then
319319
rm -rf *
320320
export BUILD_ROOT="${BUILD_DIR}"
321321
${SRC_DIR}/tools/build-benchmark.sh
322-
cmake ${CMAKE_OPTIONS[@]} \
322+
cmake "${CMAKE_OPTIONS[@]}" \
323323
-DCMAKE_CXX_STANDARD=11 \
324324
-DWITH_OTLP_GRPC=ON \
325325
-DWITH_OTLP_HTTP=ON \
@@ -337,7 +337,7 @@ elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then
337337
if [[ ! -z "${WITH_ABSEIL}" ]]; then
338338
CMAKE_OPTIONS=(${CMAKE_OPTIONS[@]} "-DWITH_ABSEIL=${WITH_ABSEIL}")
339339
fi
340-
cmake ${CMAKE_OPTIONS[@]} \
340+
cmake "${CMAKE_OPTIONS[@]}" \
341341
-DWITH_OTLP_GRPC=ON \
342342
-DWITH_OTLP_HTTP=ON \
343343
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
@@ -351,7 +351,7 @@ elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then
351351
elif [[ "$1" == "cmake.exporter.otprotocol.shared_libs.with_static_grpc.test" ]]; then
352352
cd "${BUILD_DIR}"
353353
rm -rf *
354-
cmake ${CMAKE_OPTIONS[@]} \
354+
cmake "${CMAKE_OPTIONS[@]}" \
355355
-DWITH_OTLP_GRPC=ON \
356356
-DWITH_OTLP_HTTP=ON \
357357
-DBUILD_SHARED_LIBS=ON \
@@ -365,7 +365,7 @@ elif [[ "$1" == "cmake.exporter.otprotocol.shared_libs.with_static_grpc.test" ]]
365365
elif [[ "$1" == "cmake.exporter.otprotocol.with_async_export.test" ]]; then
366366
cd "${BUILD_DIR}"
367367
rm -rf *
368-
cmake ${CMAKE_OPTIONS[@]} \
368+
cmake "${CMAKE_OPTIONS[@]}" \
369369
-DWITH_OTLP_GRPC=ON \
370370
-DWITH_OTLP_HTTP=ON \
371371
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -379,7 +379,7 @@ elif [[ "$1" == "cmake.exporter.otprotocol.with_async_export.test" ]]; then
379379
elif [[ "$1" == "cmake.do_not_install.test" ]]; then
380380
cd "${BUILD_DIR}"
381381
rm -rf *
382-
cmake ${CMAKE_OPTIONS[@]} \
382+
cmake "${CMAKE_OPTIONS[@]}" \
383383
-DWITH_OTLP_GRPC=ON \
384384
-DWITH_OTLP_HTTP=ON \
385385
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -394,7 +394,7 @@ elif [[ "$1" == "cmake.do_not_install.test" ]]; then
394394
elif [[ "$1" == "cmake.install.test" ]]; then
395395
cd "${BUILD_DIR}"
396396
rm -rf *
397-
cmake ${CMAKE_OPTIONS[@]} \
397+
cmake "${CMAKE_OPTIONS[@]}" \
398398
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
399399
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
400400
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
@@ -424,7 +424,7 @@ EOF
424424
-static-libgcc \
425425
-Wl,--version-script=${PWD}/export.map \
426426
"
427-
cmake ${CMAKE_OPTIONS[@]} \
427+
cmake "${CMAKE_OPTIONS[@]}" \
428428
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
429429
-DCMAKE_EXE_LINKER_FLAGS="$LINKER_FLAGS" \
430430
-DCMAKE_SHARED_LINKER_FLAGS="$LINKER_FLAGS" \
@@ -435,7 +435,7 @@ EOF
435435
# Verify we can load the plugin
436436
cd "${BUILD_DIR}"
437437
rm -rf *
438-
cmake ${CMAKE_OPTIONS[@]} \
438+
cmake "${CMAKE_OPTIONS[@]}" \
439439
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
440440
"${SRC_DIR}"
441441
make load_plugin_example
@@ -517,7 +517,7 @@ elif [[ "$1" == "format" ]]; then
517517
elif [[ "$1" == "code.coverage" ]]; then
518518
cd "${BUILD_DIR}"
519519
rm -rf *
520-
cmake ${CMAKE_OPTIONS[@]} \
520+
cmake "${CMAKE_OPTIONS[@]}" \
521521
-DCMAKE_CXX_FLAGS="-Werror --coverage $CXXFLAGS" \
522522
"${SRC_DIR}"
523523
make

‎ci/install_abseil.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ ! -z "${CXX_STANDARD}" ]; then
2323
fi
2424

2525
mkdir build && pushd build
26-
cmake ${ABSEIL_CPP_BUILD_OPTIONS[@]} ..
26+
cmake "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
2727
make -j $(nproc)
2828
make install
2929
popd

‎ci/install_protobuf.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ tar zxf ${CPP_PROTOBUF_PACKAGE_NAME}.tar.gz --no-same-owner
6161

6262
mkdir protobuf-${CPP_PROTOBUF_VERSION}/build && pushd protobuf-${CPP_PROTOBUF_VERSION}/build
6363
if [ -e "../CMakeLists.txt" ]; then
64-
cmake .. ${CPP_PROTOBUF_BUILD_OPTIONS[@]}
64+
cmake .. "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
6565
else
66-
cmake ../cmake ${CPP_PROTOBUF_BUILD_OPTIONS[@]}
66+
cmake ../cmake "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
6767
fi
6868
cmake --build . -j $(nproc)
6969
cmake --install .

‎ci/setup_grpc.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ if [[ $build_internal_abseil_cpp -ne 0 ]]; then
107107
if [ ! -z "$build_shared_libs" ]; then
108108
ABSEIL_CPP_BUILD_OPTIONS=(${ABSEIL_CPP_BUILD_OPTIONS[@]} "-DBUILD_SHARED_LIBS=$build_shared_libs")
109109
fi
110-
cmake ${ABSEIL_CPP_BUILD_OPTIONS[@]} ..
110+
cmake "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
111111
cmake --build . -j${nproc} --target install && popd
112112
fi
113113
mkdir -p build && pushd build
@@ -124,7 +124,7 @@ if [ ! -z "$build_shared_libs" ]; then
124124
GRPC_BUILD_OPTIONS=(${GRPC_BUILD_OPTIONS[@]} "-DBUILD_SHARED_LIBS=$build_shared_libs")
125125
fi
126126

127-
cmake ${GRPC_BUILD_OPTIONS[@]} ..
127+
cmake "${GRPC_BUILD_OPTIONS[@]}" ..
128128
cmake --build . -j$(nproc)
129129
cmake --install .
130130
popd

‎examples/prometheus/run.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#!/bin/bash
12
# Copyright The OpenTelemetry Authors
23
# SPDX-License-Identifier: Apache-2.0
4+
set -e
35

46
docker run -p 9090:9090 -v $(pwd):/etc/prometheus --network="host" prom/prometheus

‎functional/otlp/run_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright The OpenTelemetry Authors
44
# SPDX-License-Identifier: Apache-2.0
55

6-
# set -e
6+
set -e
77

88
# To run tests in a local dev environment:
99
# - make sure docker is running

‎functional/otlp/run_test_mode.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Https collector listening on endpoint.
1717
#
1818

19-
# set -e
19+
set -e
2020

2121
[ -z "${BUILD_DIR}" ] && export BUILD_DIR=$HOME/build
2222

‎tools/build-benchmark.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Copyright The OpenTelemetry Authors
44
# SPDX-License-Identifier: Apache-2.0
5+
set -e
56

67
# Switch to workspace root directory first
78
DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"

0 commit comments

Comments
 (0)