[Metrics SDK] Cleanup ENABLE_METRICS_PREVIEW (#1735)

open-telemetry · Nov 6, 2022 · b8b715f · b8b715f
1 parent 7efeeab
commit b8b715f
Show file tree

Hide file tree

Showing 146 changed files with 1,007 additions and 1,411 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,7 +189,6 @@ option(
   OFF)
 option(WITH_EXAMPLES "Whether to build examples" ON)
 
-option(WITH_METRICS_PREVIEW "Whether to build metrics preview" OFF)
 option(WITH_LOGS_PREVIEW "Whether to build logs preview" OFF)
 option(WITH_ASYNC_EXPORT_PREVIEW "Whether enable async export" OFF)
 # Exemplar specs status is experimental, so behind feature flag by default

diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
@@ -18,17 +18,12 @@ if(NOT WITH_LOGS_PREVIEW)
   set(LOGS_EXCLUDE_PATTERN "logs")
 endif()
 
-set(METRICS_EXCLUDE_PATTERN "")
-if(NOT WITH_METRICS_PREVIEW)
-  set(METRICS_EXCLUDE_PATTERN "metrics")
-endif()
-
 install(
   DIRECTORY include/opentelemetry
   DESTINATION include
   FILES_MATCHING
   PATTERN "*.h"
-  PATTERN "${METRICS_EXCLUDE_PATTERN}" EXCLUDE)
+  PATTERN "metrics" EXCLUDE)
 
 install(
   DIRECTORY include/opentelemetry
@@ -74,10 +69,6 @@ if(WITH_GSL)
   endif()
 endif()
 
-if(WITH_METRICS_PREVIEW)
-  target_compile_definitions(opentelemetry_api INTERFACE ENABLE_METRICS_PREVIEW)
-endif()
-
 if(WITH_LOGS_PREVIEW)
   target_compile_definitions(opentelemetry_api INTERFACE ENABLE_LOGS_PREVIEW)
 endif()

diff --git a/api/include/opentelemetry/metrics/async_instruments.h b/api/include/opentelemetry/metrics/async_instruments.h
@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/metrics/observer_result.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -31,4 +30,3 @@ class ObservableInstrument
 
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/include/opentelemetry/metrics/meter.h b/api/include/opentelemetry/metrics/meter.h
@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include "opentelemetry/metrics/async_instruments.h"
-#  include "opentelemetry/metrics/sync_instruments.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/nostd/span.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/unique_ptr.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/sync_instruments.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -140,4 +139,3 @@ class Meter
 };
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/include/opentelemetry/metrics/meter_provider.h b/api/include/opentelemetry/metrics/meter_provider.h
@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include "opentelemetry/metrics/meter.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/metrics/meter.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -30,4 +29,3 @@ class MeterProvider
 };
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/include/opentelemetry/metrics/noop.h b/api/include/opentelemetry/metrics/noop.h
@@ -2,14 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include "opentelemetry/metrics/async_instruments.h"
-#  include "opentelemetry/metrics/meter.h"
-#  include "opentelemetry/metrics/meter_provider.h"
-#  include "opentelemetry/metrics/observer_result.h"
-#  include "opentelemetry/metrics/sync_instruments.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/meter.h"
+#include "opentelemetry/metrics/meter_provider.h"
+#include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/metrics/sync_instruments.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -213,4 +212,3 @@ class NoopMeterProvider final : public MeterProvider
 };
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/include/opentelemetry/metrics/observer_result.h b/api/include/opentelemetry/metrics/observer_result.h
@@ -2,14 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include "opentelemetry/common/attribute_value.h"
-#  include "opentelemetry/common/key_value_iterable_view.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/nostd/span.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/type_traits.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -51,4 +50,3 @@ using ObserverResult = nostd::variant<nostd::shared_ptr<ObserverResultT<int64_t>
 
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/include/opentelemetry/metrics/provider.h b/api/include/opentelemetry/metrics/provider.h
@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include <mutex>
+#include <mutex>
 
-#  include "opentelemetry/common/macros.h"
-#  include "opentelemetry/common/spin_lock_mutex.h"
-#  include "opentelemetry/metrics/meter_provider.h"
-#  include "opentelemetry/metrics/noop.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/common/spin_lock_mutex.h"
+#include "opentelemetry/metrics/meter_provider.h"
+#include "opentelemetry/metrics/noop.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -58,4 +57,3 @@ class Provider
 
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/include/opentelemetry/metrics/sync_instruments.h b/api/include/opentelemetry/metrics/sync_instruments.h
@@ -2,14 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
 
-#  include "opentelemetry/common/attribute_value.h"
-#  include "opentelemetry/common/key_value_iterable_view.h"
-#  include "opentelemetry/context/context.h"
-#  include "opentelemetry/nostd/span.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/type_traits.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
@@ -196,4 +195,3 @@ class UpDownCounter : public SynchronousInstrument
 
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/api/test/metrics/meter_provider_test.cc b/api/test/metrics/meter_provider_test.cc
@@ -1,12 +1,10 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef ENABLE_METRICS_PREVIEW
-
-#  include <gtest/gtest.h>
-#  include "opentelemetry/metrics/noop.h"
-#  include "opentelemetry/metrics/provider.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
+#include <gtest/gtest.h>
+#include "opentelemetry/metrics/noop.h"
+#include "opentelemetry/metrics/provider.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 
 using opentelemetry::metrics::Meter;
 using opentelemetry::metrics::MeterProvider;
@@ -35,4 +33,3 @@ TEST(Provider, MultipleMeterProviders)
 
   ASSERT_NE(Provider::GetMeterProvider(), tf);
 }
-#endif
diff --git a/api/test/metrics/noop_sync_instrument_test.cc b/api/test/metrics/noop_sync_instrument_test.cc
@@ -1,11 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef ENABLE_METRICS_PREVIEW
-
-#  include <gtest/gtest.h>
-#  include <map>
-#  include "opentelemetry/metrics/noop.h"
+#include <gtest/gtest.h>
+#include <map>
+#include "opentelemetry/metrics/noop.h"
 
 TEST(Counter, Add)
 {
@@ -46,5 +44,3 @@ TEST(UpDownCountr, Record)
   counter->Add(10, {{"k1", "1"}, {"k2", 2}});
   counter->Add(10, {{"k1", "1"}, {"k2", 2}}, opentelemetry::context::Context{});
 }
-
-#endif
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -82,7 +82,6 @@ if [[ "$1" == "cmake.test" ]]; then
         -DWITH_ZIPKIN=ON \
         -DWITH_JAEGER=ON \
         -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_PREVIEW=OFF \
         -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
         -DWITH_LOGS_PREVIEW=ON \
         -DCMAKE_CXX_FLAGS="-Werror" \
@@ -99,7 +98,6 @@ elif [[ "$1" == "cmake.maintainer.test" ]]; then
         -DWITH_JAEGER=ON \
         -DWITH_ELASTICSEARCH=ON \
         -DWITH_LOGS_PREVIEW=ON \
-        -DWITH_METRICS_PREVIEW=OFF \
         -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
         -DWITH_ASYNC_EXPORT_PREVIEW=ON \
         -DOTELCPP_MAINTAINER_MODE=ON \
@@ -115,7 +113,6 @@ elif [[ "$1" == "cmake.with_async_export.test" ]]; then
         -DWITH_ZIPKIN=ON \
         -DWITH_JAEGER=ON \
         -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_PREVIEW=OFF \
         -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
         -DWITH_LOGS_PREVIEW=ON \
         -DCMAKE_CXX_FLAGS="-Werror" \
@@ -128,7 +125,6 @@ elif [[ "$1" == "cmake.abseil.test" ]]; then
   cd "${BUILD_DIR}"
   rm -rf *
   cmake -DCMAKE_BUILD_TYPE=Debug  \
-        -DWITH_METRICS_PREVIEW=OFF \
         -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
         -DWITH_LOGS_PREVIEW=ON \
         -DCMAKE_CXX_FLAGS="-Werror" \
@@ -153,7 +149,6 @@ elif [[ "$1" == "cmake.c++20.stl.test" ]]; then
   cd "${BUILD_DIR}"
   rm -rf *
   cmake -DCMAKE_BUILD_TYPE=Debug  \
-        -DWITH_METRICS_PREVIEW=OFF \
         -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
         -DWITH_LOGS_PREVIEW=ON \
         -DCMAKE_CXX_FLAGS="-Werror" \

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 if(WITH_ZIPKIN)
   add_subdirectory(zipkin)
 endif()
-if(WITH_PROMETHEUS AND NOT WITH_METRICS_PREVIEW)
+if(WITH_PROMETHEUS)
   add_subdirectory(prometheus)
 endif()
 add_subdirectory(plugin)

diff --git a/examples/common/metrics_foo_library/foo_library.cc b/examples/common/metrics_foo_library/foo_library.cc
@@ -1,16 +1,15 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef ENABLE_METRICS_PREVIEW
-#  include "foo_library.h"
-#  include <chrono>
-#  include <map>
-#  include <memory>
-#  include <thread>
-#  include <vector>
-#  include "opentelemetry/context/context.h"
-#  include "opentelemetry/metrics/provider.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
+#include "foo_library.h"
+#include <chrono>
+#include <map>
+#include <memory>
+#include <thread>
+#include <vector>
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/metrics/provider.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 
 namespace nostd       = opentelemetry::nostd;
 namespace metrics_api = opentelemetry::metrics;
@@ -95,5 +94,3 @@ void foo_library::histogram_example(const std::string &name)
     std::this_thread::sleep_for(std::chrono::milliseconds(250));
   }
 }
-
-#endif
diff --git a/examples/common/metrics_foo_library/foo_library.h b/examples/common/metrics_foo_library/foo_library.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifndef ENABLE_METRICS_PREVIEW
-#  include <string>
+
+#include <string>
 
 class foo_library
 {
@@ -12,4 +12,3 @@ class foo_library
   static void histogram_example(const std::string &name);
   static void observable_counter_example(const std::string &name);
 };
-#endif
diff --git a/examples/metrics_simple/CMakeLists.txt b/examples/metrics_simple/CMakeLists.txt
@@ -1,13 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include)
-if(WITH_METRICS_PREVIEW)
-  add_executable(simple_metrics main.cc)
-  target_link_libraries(
-    simple_metrics ${CMAKE_THREAD_LIBS_INIT} opentelemetry_metrics_deprecated
-    opentelemetry_exporter_ostream_metrics_deprecated)
-else()
-  add_executable(metrics_ostream_example metrics_ostream.cc)
-  target_link_libraries(
-    metrics_ostream_example ${CMAKE_THREAD_LIBS_INIT} opentelemetry_metrics
-    opentelemetry_exporter_ostream_metrics opentelemetry_resources
-    common_metrics_foo_library)
-endif()
+add_executable(metrics_ostream_example metrics_ostream.cc)
+target_link_libraries(
+  metrics_ostream_example ${CMAKE_THREAD_LIBS_INIT} opentelemetry_metrics
+  opentelemetry_exporter_ostream_metrics opentelemetry_resources
+  common_metrics_foo_library)