Skip to content

Commit 328f8c0

Browse files
msiddhuowentBYVoidCorristomarcalff
authored
hello (#7)
* [EXPORTER] Ignore exception when create thread in OTLP file exporter. (open-telemetry#3012) * [BUILD] Update MODULE.bazel (open-telemetry#3015) * [BUILD] Fix build without vcpkg on Windows when gRPC is disabled (open-telemetry#3016) * [BUILD] Add abi_version_no bazel flag. (open-telemetry#3020) * [Code health] Expand iwyu coverage to include unit tests. (open-telemetry#3022) * [BUILD] Version opentelemetry_proto/proto_grpc shared libraries (open-telemetry#2992) * [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.27.0 (open-telemetry#3023) * [SDK] Support empty histogram buckets (open-telemetry#3027) * support empty buckets * Update histogram_test.cc * Update histogram_test.cc * test for negative values * fix count * [TEST] Fix sync problems in OTLP File exporter tests. (open-telemetry#3031) --------- Co-authored-by: WenTao Ou <[email protected]> Co-authored-by: Carbo Kuo <[email protected]> Co-authored-by: Manuel Bergler <[email protected]> Co-authored-by: Marc Alff <[email protected]> Co-authored-by: Troels Hoffmeyer <[email protected]> Co-authored-by: Lalit Kumar Bhasin <[email protected]>
1 parent 19996b5 commit 328f8c0

File tree

17 files changed

+2069
-655
lines changed

17 files changed

+2069
-655
lines changed

.github/workflows/iwyu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
-DCMAKE_CXX_STANDARD=14 \
4040
-DWITH_STL=CXX14 \
4141
-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
42-
-DBUILD_TESTING=OFF \
43-
-DBUILD_W3CTRACECONTEXT_TEST=OFF \
42+
-DBUILD_TESTING=ON \
43+
-DBUILD_W3CTRACECONTEXT_TEST=ON \
4444
-DWITH_OTLP_GRPC=OFF \
4545
-DWITH_OTLP_HTTP=ON \
4646
-DWITH_OTLP_FILE=ON \

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ if(WITH_OTLP_GRPC
385385
if(WITH_OTLP_GRPC)
386386
find_package(gRPC)
387387
endif()
388-
if((NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND) OR (NOT gRPC_FOUND))
388+
if((NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND) OR (WITH_OTLP_GRPC
389+
AND NOT gRPC_FOUND))
389390
if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
390391
install_windows_deps()
391392
endif()

MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
module(
55
name = "opentelemetry-cpp",
6-
version = "0",
6+
version = "1.16.1",
77
compatibility_level = 0,
88
repo_name = "io_opentelemetry_cpp",
99
)

RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Pre Release
44

5-
1: Upgrade to latest [semantic-conventions](docs/semantic-conventions.md)
5+
1: Upgrade to latest [dependencies](docs/maintaining-dependencies.md)
66
if required.
77

88
2: Make sure all relevant changes for this release are included under

api/BUILD

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
4+
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "int_flag", "string_flag")
55

66
package(default_visibility = ["//visibility:public"])
77

@@ -35,6 +35,9 @@ cc_library(
3535
":set_cxx_stdlib_2020": ["OPENTELEMETRY_STL_VERSION=2020"],
3636
":set_cxx_stdlib_2023": ["OPENTELEMETRY_STL_VERSION=2023"],
3737
"//conditions:default": [],
38+
}) + select({
39+
":abi_version_no_1": ["OPENTELEMETRY_ABI_VERSION_NO=1"],
40+
":abi_version_no_2": ["OPENTELEMETRY_ABI_VERSION_NO=2"],
3841
}),
3942
strip_include_prefix = "include",
4043
tags = ["api"],
@@ -61,3 +64,18 @@ bool_flag(
6164
build_setting_default = False,
6265
deprecation = "The value of this flag is ignored. Bazel builds always depend on Abseil for its pre-adopted `std::` types. You should remove this flag from your build command.",
6366
)
67+
68+
int_flag(
69+
name = "abi_version_no",
70+
build_setting_default = 1,
71+
)
72+
73+
config_setting(
74+
name = "abi_version_no_1",
75+
flag_values = {":abi_version_no": "1"},
76+
)
77+
78+
config_setting(
79+
name = "abi_version_no_2",
80+
flag_values = {":abi_version_no": "2"},
81+
)

0 commit comments

Comments
 (0)