Merge branch 'main' into sync-temporal

Author: lalitb

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

@@ -7,11 +7,9 @@
 #  include <iostream>
 #  include <string>
 #  include "opentelemetry/common/spin_lock_mutex.h"
-#  include "opentelemetry/nostd/span.h"
 #  include "opentelemetry/sdk/metrics/data/metric_data.h"
 #  include "opentelemetry/sdk/metrics/instruments.h"
 #  include "opentelemetry/sdk/metrics/metric_exporter.h"
-#  include "opentelemetry/sdk/metrics/recordable.h"
 #  include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -28,7 +26,7 @@ class OStreamMetricExporter final : public opentelemetry::sdk::metrics::MetricEx
 public:
   /**
    * Create an OStreamMetricExporter. This constructor takes in a reference to an ostream that the
-   * export() function will send span data into.
+   * export() function will send metrics data into.
    * The default ostream is set to stdout
    */
   explicit OStreamMetricExporter(std::ostream &sout = std::cout) noexcept;

sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h

@@ -29,7 +29,7 @@ class MetricExporter
   virtual ~MetricExporter() = default;
 
   /**
-   * Exports a batch of metrics recordables. This method must not be called
+   * Exports a batch of metrics data. This method must not be called
    * concurrently for the same exporter instance.
    * @param data metrics data
    */