Skip to content

Commit b4d45c5

Browse files
authored
Merge branch 'prepare-for-v3.0.0' into v3_remove_forwarding_headers
2 parents 9ed3105 + 34150e7 commit b4d45c5

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,4 @@ build:msan --linkopt=-L/usr/lib/x86_64-unknown-linux-gnu
131131

132132
# --config otel2: Open Telemetery ABI version 2
133133
build:otel2 --cxxopt=-DOPENTELEMETRY_ABI_VERSION_NO=2
134+
build:otel2 --@opentelemetry-cpp//api:abi_version_no=2

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf"
3333
bazel_dep(name = "boringssl", version = "0.20251124.0")
3434
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
3535
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
36-
bazel_dep(name = "opentelemetry-cpp", version = "1.22.0")
36+
bazel_dep(name = "opentelemetry-cpp", version = "1.24.0")
3737
bazel_dep(name = "rules_proto", version = "7.1.0")
3838
bazel_dep(name = "rules_python", version = "1.6.3")
3939
bazel_dep(name = "rules_apple", version = "4.3.2")

google/cloud/bigtable/internal/metrics_test.cc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,17 @@ class MockMeter : public opentelemetry::metrics::Meter {
142142
opentelemetry::nostd::string_view,
143143
opentelemetry::nostd::string_view),
144144
(noexcept, override));
145+
146+
MOCK_METHOD(uintptr_t,
147+
RegisterCallback, // NOLINT(bugprone-exception-escape)
148+
(opentelemetry::metrics::MultiObservableCallbackPtr, void*,
149+
opentelemetry::nostd::span<
150+
opentelemetry::metrics::ObservableInstrument*>),
151+
(noexcept, override));
152+
153+
MOCK_METHOD(void,
154+
DeregisterCallback, // NOLINT(bugprone-exception-escape)
155+
(uintptr_t), (noexcept, override));
145156
#endif
146157

147158
MOCK_METHOD(opentelemetry::nostd::shared_ptr<ObservableInstrument>,

0 commit comments

Comments
 (0)