Rename to REMOVE_METER (singular)

open-telemetry · Jul 3, 2023 · 819d3cf · 819d3cf
1 parent 8bd1659
commit 819d3cf
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,7 +33,7 @@ Important changes:
 
 * [API] Remove Meters
   [#2205](https://github.com/open-telemetry/opentelemetry-cpp/pull/2205)
-  * The CMake option `WITH_REMOVE_METERS_PREVIEW` was added.
+  * The CMake option `WITH_REMOVE_METER_PREVIEW` was added.
   * This option is experimental, and may change in the future.
   * Enabling it is an ABI breaking change.
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -202,8 +202,8 @@ option(OTELCPP_VERSIONED_LIBS "Whether to generate the versioned shared libs"
 #
 # * https://github.com/open-telemetry/opentelemetry-specification/issues/2232
 #
-option(WITH_REMOVE_METERS_PREVIEW
-       "EXPERIMENTAL, ABI BREAKING: Allow to remove meters" OFF)
+option(WITH_REMOVE_METER_PREVIEW
+       "EXPERIMENTAL, ABI BREAKING: Allow to remove a meter" OFF)
 
 if(OTELCPP_VERSIONED_LIBS AND NOT BUILD_SHARED_LIBS)
   message(FATAL_ERROR "OTELCPP_VERSIONED_LIBS=ON requires BUILD_SHARED_LIBS=ON")

diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
@@ -98,9 +98,9 @@ if(WITH_ASYNC_EXPORT_PREVIEW)
   target_compile_definitions(opentelemetry_api INTERFACE ENABLE_ASYNC_EXPORT)
 endif()
 
-if(WITH_REMOVE_METERS_PREVIEW)
+if(WITH_REMOVE_METER_PREVIEW)
   target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_REMOVE_METERS_PREVIEW)
+                             INTERFACE ENABLE_REMOVE_METER_PREVIEW)
 endif()
 
 # A better place should be in sdk, not api

diff --git a/api/include/opentelemetry/metrics/meter_provider.h b/api/include/opentelemetry/metrics/meter_provider.h
@@ -29,7 +29,7 @@ class MeterProvider
   virtual nostd::shared_ptr<Meter> GetMeter(nostd::string_view library_name,
                                             nostd::string_view library_version = "",
                                             nostd::string_view schema_url      = "") noexcept = 0;
-#ifdef ENABLE_REMOVE_METERS_PREVIEW
+#ifdef ENABLE_REMOVE_METER_PREVIEW
   virtual void RemoveMeter(nostd::string_view library_name,
                            nostd::string_view library_version = "",
                            nostd::string_view schema_url      = "") noexcept = 0;

diff --git a/api/include/opentelemetry/metrics/noop.h b/api/include/opentelemetry/metrics/noop.h
@@ -203,7 +203,7 @@ class NoopMeterProvider final : public MeterProvider
     return meter_;
   }
 
-#ifdef ENABLE_REMOVE_METERS_PREVIEW
+#ifdef ENABLE_REMOVE_METER_PREVIEW
   void RemoveMeter(nostd::string_view /* name */,
                    nostd::string_view /* version */,
                    nostd::string_view /* schema_url */) noexcept override

diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h
@@ -53,7 +53,7 @@ class MeterProvider final : public opentelemetry::metrics::MeterProvider
       nostd::string_view version    = "",
       nostd::string_view schema_url = "") noexcept override;
 
-#ifdef ENABLE_REMOVE_METERS_PREVIEW
+#ifdef ENABLE_REMOVE_METER_PREVIEW
   void RemoveMeter(nostd::string_view name,
                    nostd::string_view version,
                    nostd::string_view schema_url) noexcept override;

diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc
@@ -57,7 +57,7 @@ nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
   return nostd::shared_ptr<metrics_api::Meter>{meter};
 }
 
-#ifdef ENABLE_REMOVE_METERS_PREVIEW
+#ifdef ENABLE_REMOVE_METER_PREVIEW
 void MeterProvider::RemoveMeter(nostd::string_view name,
                                 nostd::string_view version,
                                 nostd::string_view schema_url) noexcept