[Metrics SDK] Add support for Pull Metric Reader (open-telemetry#1701)

yxue · Dec 5, 2022 · e640b89 · e640b89
1 parent 7d90e47
commit e640b89
Show file tree

Hide file tree

Showing 17 changed files with 150 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ Increment the:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 ## [1.8.1] 2022-12-04
 
 * [ETW Exporter] Tail based sampling support [#1780](https://github.com/open-telemetry/opentelemetry-cpp/pull/1780)
@@ -278,6 +279,8 @@ update the semantic convention in instrumentation library is needed.
 >>>>>>> 92618117 (Prepare v1.6.1 release (#1630))
 =======
 >>>>>>> cf9ebb02 (Add CMake OTELCPP_MAINTAINER_MODE (#1650))
+=======
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 * [TRACE SDK] Add trace sdk builders (#1393)
  [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471)
 * [EXAMPLE] Fix memory ownership of InMemorySpanExporter (#1473)
@@ -299,6 +302,10 @@ update the semantic convention in instrumentation library is needed.
 =======
 =======
 =======
+=======
+* [Metrics SDK] Add support for Pull Metric Exporter [#1701](https://github.com/open-telemetry/opentelemetry-cpp/pull/1701)
+ which includes breaking change in the Metrics api.
+>>>>>>> 70777ef9 ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 * [BUILD] Add CMake OTELCPP_MAINTAINER_MODE [#1650](https://github.com/open-telemetry/opentelemetry-cpp/pull/1650)
 * [SEMANTIC CONVENTIONS] Upgrade to version 1.14.0 [#1697](https://github.com/open-telemetry/opentelemetry-cpp/pull/1697)
 

diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h
@@ -3,13 +3,23 @@
 
 #pragma once
 
+<<<<<<< HEAD
 #include <iostream>
 #include <string>
 #include "opentelemetry/common/spin_lock_mutex.h"
 #include "opentelemetry/sdk/metrics/data/metric_data.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/version.h"
+=======
+# include <iostream>
+# include <string>
+# include "opentelemetry/common/spin_lock_mutex.h"
+# include "opentelemetry/sdk/metrics/data/metric_data.h"
+# include "opentelemetry/sdk/metrics/instruments.h"
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+# include "opentelemetry/version.h"
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter

diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h
@@ -19,8 +19,12 @@
 =======
 # include "opentelemetry/exporters/otlp/otlp_environment.h"
 # include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
+<<<<<<< HEAD
 # include "opentelemetry/sdk/metrics/metric_exporter.h"
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter

diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
@@ -10,8 +10,12 @@
 #ifndef ENABLE_METRICS_PREVIEW
 
 # include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
+<<<<<<< HEAD
 # include "opentelemetry/sdk/metrics/metric_exporter.h"
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
@@ -28,20 +32,28 @@ class OtlpGrpcMetricExporterFactory
  /**
  * Create a OtlpGrpcMetricExporter.
  */
+<<<<<<< HEAD
 <<<<<<< HEAD
  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
 =======
  static std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> Create();
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+ static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
  /**
  * Create a OtlpGrpcMetricExporter.
  */
+<<<<<<< HEAD
 <<<<<<< HEAD
  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
 =======
  static std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> Create(
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+ static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  const OtlpGrpcMetricExporterOptions &options);
 };
 

diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h
@@ -18,7 +18,7 @@
 =======
 #ifndef ENABLE_METRICS_PREVIEW
 
-# include "opentelemetry/sdk/metrics/metric_exporter.h"
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 
 # include "opentelemetry/exporters/otlp/otlp_environment.h"
 <<<<<<< HEAD
@@ -93,8 +93,12 @@ struct OtlpHttpMetricExporterOptions
 /**
  * The OTLP exporter exports metrics data in OpenTelemetry Protocol (OTLP) format in HTTP.
  */
+<<<<<<< HEAD
 class OtlpHttpMetricExporter final : public opentelemetry::sdk::metrics::MetricExporter
 >>>>>>> 8d1f241d ([Metrics] Add OTLP http metric exporter (#1487))
+=======
+class OtlpHttpMetricExporter final : public opentelemetry::sdk::metrics::PushMetricExporter
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 {
 public:
  /**

diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h
@@ -12,7 +12,7 @@
 #ifndef ENABLE_METRICS_PREVIEW
 
 # include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-# include "opentelemetry/sdk/metrics/metric_exporter.h"
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 
 # include <memory>
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
@@ -32,20 +32,28 @@ class OtlpHttpMetricExporterFactory
  /**
  * Create a OtlpHttpMetricExporter.
  */
+<<<<<<< HEAD
 <<<<<<< HEAD
  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
 =======
  static std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> Create();
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+ static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
  /**
  * Create a OtlpHttpMetricExporter.
  */
+<<<<<<< HEAD
 <<<<<<< HEAD
  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
 =======
  static std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> Create(
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+ static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  const OtlpHttpMetricExporterOptions &options);
 };
 

diff --git a/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc b/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc
@@ -23,17 +23,23 @@ namespace exporter
 namespace otlp
 {
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 OtlpGrpcMetricExporterFactory::Create()
 =======
 std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> OtlpGrpcMetricExporterFactory::Create()
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
+OtlpGrpcMetricExporterFactory::Create()
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 {
  OtlpGrpcMetricExporterOptions options;
  return Create(options);
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &options)
@@ -45,6 +51,12 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> OtlpGrpcMetricExpor
 {
  std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> exporter(
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
+OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &options)
+{
+ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  new OtlpGrpcMetricExporter(options));
  return exporter;
 }

diff --git a/exporters/otlp/src/otlp_http_metric_exporter_factory.cc b/exporters/otlp/src/otlp_http_metric_exporter_factory.cc
@@ -19,17 +19,23 @@ namespace exporter
 namespace otlp
 {
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 OtlpHttpMetricExporterFactory::Create()
 =======
 std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> OtlpHttpMetricExporterFactory::Create()
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
+OtlpHttpMetricExporterFactory::Create()
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 {
  OtlpHttpMetricExporterOptions options;
  return Create(options);
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 OtlpHttpMetricExporterFactory::Create(const OtlpHttpMetricExporterOptions &options)
@@ -41,6 +47,12 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> OtlpHttpMetricExpor
 {
  std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> exporter(
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
+OtlpHttpMetricExporterFactory::Create(const OtlpHttpMetricExporterOptions &options)
+{
+ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  new OtlpHttpMetricExporter(options));
  return exporter;
 }

diff --git a/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc b/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc
@@ -40,11 +40,15 @@ TEST(OtlpGrpcMetricExporterFactory, BuildTest)
  OtlpGrpcMetricExporterOptions opts;
  opts.endpoint = "localhost:45454";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
 =======
  std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> exporter =
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  OtlpGrpcMetricExporterFactory::Create(opts);
 
  EXPECT_TRUE(exporter != nullptr);

diff --git a/exporters/otlp/test/otlp_http_metric_exporter_factory_test.cc b/exporters/otlp/test/otlp_http_metric_exporter_factory_test.cc
@@ -54,11 +54,15 @@ TEST(OtlpHttpMetricExporterFactory, BuildTest)
  OtlpHttpMetricExporterOptions opts;
  opts.url = "localhost:45454";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
 =======
  std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter> exporter =
 >>>>>>> 097ec4e7 (Add OTLP Metric Exporter Factory and `OtlpGrpcClient` (#1606))
+=======
+ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  OtlpHttpMetricExporterFactory::Create(opts);
 
  EXPECT_TRUE(exporter != nullptr);

diff --git a/exporters/otlp/test/otlp_http_metric_exporter_test.cc b/exporters/otlp/test/otlp_http_metric_exporter_test.cc
@@ -114,6 +114,7 @@ namespace http_client = opentelemetry::ext::http::client;
 class OtlpHttpMetricExporterTestPeer : public ::testing::Test
 {
 public:
+<<<<<<< HEAD
 <<<<<<< HEAD
  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> GetExporter(
  std::unique_ptr<OtlpHttpClient> http_client)
@@ -125,6 +126,12 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
  {
  return std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter>(
 >>>>>>> 8d1f241d ([Metrics] Add OTLP http metric exporter (#1487))
+=======
+ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> GetExporter(
+ std::unique_ptr<OtlpHttpClient> http_client)
+ {
+ return std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>(
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  new OtlpHttpMetricExporter(std::move(http_client)));
  }
 
@@ -1177,13 +1184,18 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
 
 TEST(OtlpHttpMetricExporterTest, Shutdown)
 {
+<<<<<<< HEAD
 <<<<<<< HEAD
  auto exporter = std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>(
  new OtlpHttpMetricExporter());
 =======
  auto exporter =
  std::unique_ptr<opentelemetry::sdk::metrics::MetricExporter>(new OtlpHttpMetricExporter());
 >>>>>>> 8d1f241d ([Metrics] Add OTLP http metric exporter (#1487))
+=======
+ auto exporter = std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>(
+ new OtlpHttpMetricExporter());
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
  ASSERT_TRUE(exporter->Shutdown());
  auto result = exporter->Export(opentelemetry::sdk::metrics::ResourceMetrics{});
  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);

diff --git a/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter.h b/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+<<<<<<< HEAD
 #include <memory>
 #include <string>
 #include <vector>
@@ -14,6 +15,15 @@
 #include "opentelemetry/sdk/common/env_variables.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/version.h"
+=======
+# include <prometheus/exposer.h>
+# include "opentelemetry/common/spin_lock_mutex.h"
+# include "opentelemetry/exporters/prometheus/collector.h"
+# include "opentelemetry/nostd/span.h"
+# include "opentelemetry/sdk/common/env_variables.h"
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+# include "opentelemetry/version.h"
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
 /**
  * This class is an implementation of the MetricsExporter interface and

diff --git a/sdk/src/metrics/export/periodic_exporting_metric_reader.cc b/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
@@ -1,9 +1,16 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+<<<<<<< HEAD
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+=======
+#ifndef ENABLE_METRICS_PREVIEW
+# include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
+# include "opentelemetry/sdk/common/global_log_handler.h"
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
 #include <chrono>
 #include <future>

diff --git a/sdk/test/metrics/async_metric_storage_test.cc b/sdk/test/metrics/async_metric_storage_test.cc
@@ -1,6 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+<<<<<<< HEAD
 #include "opentelemetry/sdk/metrics/state/async_metric_storage.h"
 #include <cstdint>
 #include "opentelemetry/common/key_value_iterable_view.h"
@@ -12,6 +13,19 @@
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/sdk/metrics/state/metric_collector.h"
 #include "opentelemetry/sdk/metrics/state/observable_registry.h"
+=======
+#ifndef ENABLE_METRICS_PREVIEW
+# include "opentelemetry/sdk/metrics/state/async_metric_storage.h"
+# include "opentelemetry/common/key_value_iterable_view.h"
+# include "opentelemetry/sdk/metrics/async_instruments.h"
+# include "opentelemetry/sdk/metrics/instruments.h"
+# include "opentelemetry/sdk/metrics/meter_context.h"
+# include "opentelemetry/sdk/metrics/metric_reader.h"
+# include "opentelemetry/sdk/metrics/observer_result.h"
+# include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+# include "opentelemetry/sdk/metrics/state/metric_collector.h"
+# include "opentelemetry/sdk/metrics/state/observable_registry.h"
+>>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701))
 
 #include <gtest/gtest.h>
 #include <memory>