From f17d9321a8ba429e7ea0f1fb76bbebc98eed9e7f Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 10 Jul 2023 21:39:55 +0200 Subject: [PATCH] Build cleanup --- api/CMakeLists.txt | 2 ++ docs/abi-version-policy.md | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt index eebaf0a900..fba94adcb4 100644 --- a/api/CMakeLists.txt +++ b/api/CMakeLists.txt @@ -101,6 +101,8 @@ endif() if(WITH_REMOVE_METER_PREVIEW) target_compile_definitions(opentelemetry_api INTERFACE ENABLE_REMOVE_METER_PREVIEW) +endif() + if(WITH_ABI_VERSION_2) target_compile_definitions(opentelemetry_api INTERFACE OPENTELEMETRY_ABI_VERSION_NO=2) diff --git a/docs/abi-version-policy.md b/docs/abi-version-policy.md index 438e93d230..e9bc2c7f47 100644 --- a/docs/abi-version-policy.md +++ b/docs/abi-version-policy.md @@ -431,7 +431,8 @@ to follow specification changes. See the issue description for all details: -* [Metrics API/SDK] Add InstrumentationScope attributes in MeterProvider::GetMeter() #2033 +* [Metrics API/SDK] + Add InstrumentationScope attributes in MeterProvider::GetMeter() #2033 #### API change @@ -471,7 +472,7 @@ change in the caller when providing up to 3 parameters. In the SDK class declaration, implement the expected API. -``` +```cpp class MeterProvider final : public opentelemetry::metrics::MeterProvider { public: @@ -500,7 +501,7 @@ In the SDK implementation: * either get the new parameters from the extended ABI v2 method * or provide default values for the old ABI v1 method -``` +```cpp nostd::shared_ptr MeterProvider::GetMeter( nostd::string_view name, nostd::string_view version,