Merge branch 'main' into arm-yield

CHANGELOG.md

@@ -15,8 +15,52 @@ Increment the:
 
 ## [Unreleased]
 
+## [1.3.0] 2022-04-11
+
+* [ETW EXPORTER] ETW provider handle cleanup ([#1322](https://github.com/open-telemetry/opentelemetry-cpp/pull/1322))
+* [BUILD] Move public definitions into `opentelemetry_api`. ([#1314](https://github.com/open-telemetry/opentelemetry-cpp/pull/1314))
+* [METRICS] OStream example ([#1312](https://github.com/open-telemetry/opentelemetry-cpp/pull/1312))
+* [BUILD] Rename `http_client_curl` to `opentelemetry_http_client_curl` ([#1301](https://github.com/open-telemetry/opentelemetry-cpp/pull/1301))
+* [METRICS SDK] Add InstrumentationInfo and Resource to the metrics data to be
+  exported.
+  ([#1299](https://github.com/open-telemetry/opentelemetry-cpp/pull/1299))
+* [TESTS] Add building test without RTTI ([#1294](https://github.com/open-telemetry/opentelemetry-cpp/pull/1294))
+* [METRICS SDK] Implement periodic exporting metric reader ([#1286](https://github.com/open-telemetry/opentelemetry-cpp/pull/1286))
 * [SDK] Bugfix: span SetAttribute crash ([#1283](https://github.com/open-telemetry/opentelemetry-cpp/pull/1283))
+* [BUG] Remove implicitly deleted default constructor ([#1267](https://github.com/open-telemetry/opentelemetry-cpp/pull/1267))
+* [METRICS SDK] Synchronous Metric collection (Delta , Cumulative) ([#1265](https://github.com/open-telemetry/opentelemetry-cpp/pull/1265))
+* [METRICS SDK] Metrics exemplar round 1 ([#1264](https://github.com/open-telemetry/opentelemetry-cpp/pull/1264))
+* [EXPORTER] Fix: use CURLOPT_TIMEOUT_MS to config OtlpHttpExporter's timeout
+  instead of CURLOPT_TIMEOUT
+  ([#1261](https://github.com/open-telemetry/opentelemetry-cpp/pull/1261))
 * [EXPORTER] Jaeger Exporter - Populate Span Links ([#1251](https://github.com/open-telemetry/opentelemetry-cpp/pull/1251))
+* [SDK] Reorder the destructor of members in LoggerProvider and TracerProvider ([#1245](https://github.com/open-telemetry/opentelemetry-cpp/pull/1245))
+* [METRICS SDK] Enable metric collection from MetricReader ([#1241](https://github.com/open-telemetry/opentelemetry-cpp/pull/1241))
+* [METRICS SDK] Asynchronous Aggregation storage ([#1232](https://github.com/open-telemetry/opentelemetry-cpp/pull/1232))
+* [METRICS SDK] Synchronous Instruments - Aggregation Storage(s) creation for
+  configured views
+  ([#1219](https://github.com/open-telemetry/opentelemetry-cpp/pull/1219))
+* [BUILD] Added s390x arch into CMake build. ([#1216](https://github.com/open-telemetry/opentelemetry-cpp/pull/1216))
+* [API] Allow extension of the lifetime of ContextStorage. ([#1214](https://github.com/open-telemetry/opentelemetry-cpp/pull/1214))
+* [METRICS SDK] Add Aggregation storage ([#1213](https://github.com/open-telemetry/opentelemetry-cpp/pull/1213))
+* [TESTS] Fix ostream_log_test Mac ([#1208](https://github.com/open-telemetry/opentelemetry-cpp/pull/1208))
+* [BUILD] Update grpc to v1.43.2 to support VS2022/MSVC 19.30 and bazel 5.0 ([#1207](https://github.com/open-telemetry/opentelemetry-cpp/pull/1207))
+* [DOCS] Benchmark documentation ([#1205](https://github.com/open-telemetry/opentelemetry-cpp/pull/1205))
+* [DOCS] Fix errors in SDK documentation ([#1201](https://github.com/open-telemetry/opentelemetry-cpp/pull/1201))
+* [METRICS EXPORTER] Ostream metric exporter ([#1196](https://github.com/open-telemetry/opentelemetry-cpp/pull/1196))
+* [Metrics SDK] Filtering metrics attributes ([#1191](https://github.com/open-telemetry/opentelemetry-cpp/pull/1191))
+* [Metrics SDK] Sync and Async Instruments SDK ([#1184](https://github.com/open-telemetry/opentelemetry-cpp/pull/1184))
+* [Metrics SDK] Add Aggregation as part of metrics SDK. ([#1178](https://github.com/open-telemetry/opentelemetry-cpp/pull/1178))
+* [BUILD] Cmake: thrift requires boost headers, include them as
+  Boost_INCLUDE_DIRS
+  ([#1100](https://github.com/open-telemetry/opentelemetry-cpp/pull/1100))
+
+Notes:
+
+[#1301](https://github.com/open-telemetry/opentelemetry-cpp/pull/1301) added
+`opentelemetry_` as prefix to http_client_curl library for resolving potential
+naming conflict, this could break existing cmake build if http_client_curl is
+listed as explicit dependency in user's cmake file.
 
 ## [1.2.0] 2022-01-31
 

api/include/opentelemetry/version.h

@@ -6,7 +6,7 @@
 #include "opentelemetry/detail/preprocessor.h"
 
 #define OPENTELEMETRY_ABI_VERSION_NO 1
-#define OPENTELEMETRY_VERSION "1.2.0"
+#define OPENTELEMETRY_VERSION "1.3.0"
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
 
 // clang-format off

docs/public/conf.py

@@ -21,7 +21,7 @@
 author = 'OpenTelemetry authors'
 
 # The full version, including alpha/beta/rc tags
-release = '1.2.0'
+release = '1.3.0'
 
 # Run sphinx on subprojects and copy output
 # -----------------------------------------

examples/common/metrics_foo_library/BUILD

@@ -0,0 +1,17 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "common_metrics_foo_library",
+    srcs = [
+        "foo_library.cc",
+    ],
+    hdrs = [
+        "foo_library.h",
+    ],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/metrics",
+    ],
+)

examples/common/metrics_foo_library/foo_library.cc

@@ -0,0 +1,25 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#ifndef ENABLE_METRICS_PREVIEW
+#  include <chrono>
+#  include <thread>
+#  include "opentelemetry/metrics/provider.h"
+
+namespace nostd       = opentelemetry::nostd;
+namespace metrics_api = opentelemetry::metrics;
+
+void foo_library(const std::string &name)
+{
+  // Get the Meter from the MeterProvider
+  auto provider                               = metrics_api::Provider::GetMeterProvider();
+  nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
+  auto double_counter                         = meter->CreateDoubleCounter(name);
+  double_counter->Add(28.5);
+  std::this_thread::sleep_for(std::chrono::milliseconds(500));
+  double_counter->Add(3.14);
+  std::this_thread::sleep_for(std::chrono::milliseconds(500));
+  double_counter->Add(23.5);
+  std::this_thread::sleep_for(std::chrono::milliseconds(5000));
+}
+#endif

examples/common/metrics_foo_library/foo_library.h

@@ -0,0 +1,9 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+#ifndef ENABLE_METRICS_PREVIEW
+#  include <string>
+
+void foo_library(const std::string &name);
+#endif

examples/metrics_simple/BUILD

@@ -11,3 +11,18 @@ cc_binary(
         "//sdk/src/_metrics:metrics_deprecated",
     ],
 )
+
+cc_binary(
+    name = "metrics_ostream_example",
+    srcs = [
+        "metrics_ostream.cc",
+    ],
+    linkopts = ["-pthread"],
+    tags = ["ostream"],
+    deps = [
+        "//api",
+        "//examples/common/metrics_foo_library:common_metrics_foo_library",
+        "//exporters/ostream:ostream_metric_exporter",
+        "//sdk/src/metrics",
+    ],
+)

examples/metrics_simple/metrics_ostream.cc

@@ -0,0 +1,65 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#ifndef ENABLE_METRICS_PREVIEW
+#  include <memory>
+#  include "opentelemetry/exporters/ostream/metric_exporter.h"
+#  include "opentelemetry/metrics/provider.h"
+#  include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
+#  include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
+#  include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
+#  include "opentelemetry/sdk/metrics/meter.h"
+#  include "opentelemetry/sdk/metrics/meter_provider.h"
+
+#  ifdef BAZEL_BUILD
+#    include "examples/common/metrics_foo_library/foo_library.h"
+#  else
+#    include "metrics_foo_library/foo_library.h"
+#  endif
+
+namespace metric_sdk      = opentelemetry::sdk::metrics;
+namespace nostd           = opentelemetry::nostd;
+namespace common          = opentelemetry::common;
+namespace exportermetrics = opentelemetry::exporter::metrics;
+namespace metrics_api     = opentelemetry::metrics;
+
+namespace
+{
+
+void initMetrics(const std::string &name)
+{
+  std::unique_ptr<metric_sdk::MetricExporter> exporter{new exportermetrics::OStreamMetricExporter};
+  std::vector<std::unique_ptr<metric_sdk::MetricExporter>> exporters;
+
+  std::string version{"1.2.0"};
+  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
+
+  // Initialize and set the global MeterProvider
+  metric_sdk::PeriodicExportingMetricReaderOptions options;
+  options.export_interval_millis = std::chrono::milliseconds(1000);
+  options.export_timeout_millis  = std::chrono::milliseconds(500);
+  std::unique_ptr<metric_sdk::MetricReader> reader{
+      new metric_sdk::PeriodicExportingMetricReader(std::move(exporter), options)};
+  auto provider = std::shared_ptr<metrics_api::MeterProvider>(
+      new metric_sdk::MeterProvider(std::move(exporters)));
+  auto p = std::static_pointer_cast<metric_sdk::MeterProvider>(provider);
+  p->AddMetricReader(std::move(reader));
+  std::unique_ptr<metric_sdk::InstrumentSelector> instrument_selector{
+      new metric_sdk::InstrumentSelector(metric_sdk::InstrumentType::kCounter, name)};
+  std::unique_ptr<metric_sdk::MeterSelector> meter_selector{
+      new metric_sdk::MeterSelector(name, version, schema)};
+  std::unique_ptr<metric_sdk::View> view{
+      new metric_sdk::View{name, "description", metric_sdk::AggregationType::kSum}};
+  p->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
+  metrics_api::Provider::SetMeterProvider(provider);
+}
+}  // namespace
+int main()
+{
+  std::string name{"ostream_metric_example"};
+  initMetrics(name);
+  foo_library(name);
+}
+#else
+int main() {}
+#endif

exporters/ostream/BUILD

@@ -43,37 +43,36 @@ cc_library(
     ],
 )
 
-# TODO - Uncomment once MetricData interface is finalised
-#cc_library(
-#    name = "ostream_metric_exporter",
-#    srcs = [
-#        "src/metric_exporter.cc",
-#    ],
-#    hdrs = [
-#        "include/opentelemetry/exporters/ostream/metric_exporter.h",
-#    ],
-#    strip_include_prefix = "include",
-#    tags = [
-#        "metrics",
-#        "ostream",
-#    ],
-#    deps = [
-#        "//sdk/src/metrics",
-#    ],
-#)
+cc_library(
+    name = "ostream_metric_exporter",
+    srcs = [
+        "src/metric_exporter.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/ostream/metric_exporter.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "metrics",
+        "ostream",
+    ],
+    deps = [
+        "//sdk/src/metrics",
+    ],
+)
 
-#cc_test(
-#    name = "ostream_metric_test",
-#    srcs = ["test/ostream_metric_test.cc"],
-#    tags = [
-#        "ostream",
-#        "test",
-#    ],
-#    deps = [
-#        ":ostream_metric_exporter",
-#        "@com_google_googletest//:gtest_main",
-#    ],
-#)
+cc_test(
+    name = "ostream_metric_test",
+    srcs = ["test/ostream_metric_test.cc"],
+    tags = [
+        "ostream",
+        "test",
+    ],
+    deps = [
+        ":ostream_metric_exporter",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
 
 cc_test(
     name = "ostream_metrics_test_deprecated",

exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h

@@ -35,11 +35,9 @@ class OStreamMetricExporter final : public opentelemetry::sdk::metrics::MetricEx
 
   /**
    * Export
-   * @param records a span of unique pointers to metrics data
+   * @param data metrics data
    */
-  sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::metrics::MetricData>> &records) noexcept
-      override;
+  sdk::common::ExportResult Export(const sdk::metrics::ResourceMetrics &data) noexcept override;
 
   /**
    * Force flush the exporter.
@@ -60,7 +58,9 @@ class OStreamMetricExporter final : public opentelemetry::sdk::metrics::MetricEx
   bool is_shutdown_ = false;
   mutable opentelemetry::common::SpinLockMutex lock_;
   bool isShutdown() const noexcept;
-  void printPointData(opentelemetry::sdk::metrics::PointType &point_data);
+  void printInstrumentationInfoMetricData(
+      const sdk::metrics::InstrumentationInfoMetrics &info_metrics);
+  void printPointData(const opentelemetry::sdk::metrics::PointType &point_data);
 };
 }  // namespace metrics
 }  // namespace exporter