[Metrics SDK] Implement Forceflush for Periodic Metric Reader (open-t…

…elemetry#2064)
cngzhnp · Mar 28, 2023 · 55a8db1 · 55a8db1
1 parent b793426
commit 55a8db1
Show file tree

Hide file tree

Showing 193 changed files with 663 additions and 309 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,16 @@ tags
 
 # Temporary dir used when generating semconv
 ./buildscripts/semantic-convention/opentelemetry-specification
+
+# Generated Windows files or directories
+*.vcxproj
+*.vcxproj.filters
+*.sln
+
+# CMake generated files or directories
+**/CMakeFiles
+**/cmake_install.cmake
+**/CTestTestfile.cmake
+CMakeCache.txt
+DartConfiguration.tcl
+/cmake
diff --git a/api/include/opentelemetry/common/kv_properties.h b/api/include/opentelemetry/common/kv_properties.h
@@ -6,7 +6,6 @@
 #include "opentelemetry/common/key_value_iterable_view.h"
 #include "opentelemetry/common/string_util.h"
 #include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/version.h"

diff --git a/api/include/opentelemetry/common/string_util.h b/api/include/opentelemetry/common/string_util.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace common

diff --git a/api/include/opentelemetry/common/timestamp.h b/api/include/opentelemetry/common/timestamp.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include <chrono>
 #include <cstdint>
 

diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h
@@ -4,15 +4,10 @@
 #pragma once
 #ifdef ENABLE_LOGS_PREVIEW
 
-#  include <chrono>
-#  include <map>
-#  include <vector>
-
 #  include "opentelemetry/common/macros.h"
 #  include "opentelemetry/logs/log_record.h"
 #  include "opentelemetry/logs/logger.h"
 #  include "opentelemetry/logs/logger_type_traits.h"
-#  include "opentelemetry/logs/severity.h"
 #  include "opentelemetry/nostd/shared_ptr.h"
 #  include "opentelemetry/nostd/string_view.h"
 #  include "opentelemetry/nostd/unique_ptr.h"

diff --git a/api/include/opentelemetry/logs/event_logger_provider.h b/api/include/opentelemetry/logs/event_logger_provider.h
@@ -4,16 +4,17 @@
 #pragma once
 #ifdef ENABLE_LOGS_PREVIEW
 
-#  include "opentelemetry/common/key_value_iterable.h"
-#  include "opentelemetry/common/key_value_iterable_view.h"
-#  include "opentelemetry/logs/event_logger.h"
-#  include "opentelemetry/logs/logger.h"
 #  include "opentelemetry/nostd/shared_ptr.h"
 #  include "opentelemetry/nostd/string_view.h"
+#  include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
 {
+
+class EventLogger;
+class Logger;
+
 /**
  * Creates new EventLogger instances.
  */

diff --git a/api/include/opentelemetry/logs/log_record.h b/api/include/opentelemetry/logs/log_record.h
@@ -5,15 +5,18 @@
 #ifdef ENABLE_LOGS_PREVIEW
 
 #  include "opentelemetry/common/attribute_value.h"
-#  include "opentelemetry/common/key_value_iterable.h"
 #  include "opentelemetry/common/timestamp.h"
 #  include "opentelemetry/logs/severity.h"
-#  include "opentelemetry/trace/span_id.h"
-#  include "opentelemetry/trace/trace_flags.h"
-#  include "opentelemetry/trace/trace_id.h"
 #  include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
+namespace trace
+{
+class SpanId;
+class TraceId;
+class TraceFlags;
+}  // namespace trace
+
 namespace logs
 {
 /**

diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h
@@ -5,7 +5,6 @@
 #ifdef ENABLE_LOGS_PREVIEW
 
 #  include "opentelemetry/common/key_value_iterable.h"
-#  include "opentelemetry/logs/log_record.h"
 #  include "opentelemetry/logs/logger_type_traits.h"
 #  include "opentelemetry/logs/severity.h"
 #  include "opentelemetry/nostd/string_view.h"
@@ -15,6 +14,9 @@
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
 {
+
+class LogRecord;
+
 /**
  * Handles log record creation.
  **/

diff --git a/api/include/opentelemetry/logs/logger_provider.h b/api/include/opentelemetry/logs/logger_provider.h
@@ -9,7 +9,9 @@
 #  include "opentelemetry/common/key_value_iterable_view.h"
 #  include "opentelemetry/logs/logger.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 logs

diff --git a/api/include/opentelemetry/logs/logger_type_traits.h b/api/include/opentelemetry/logs/logger_type_traits.h
@@ -12,11 +12,8 @@
 #  include "opentelemetry/common/timestamp.h"
 #  include "opentelemetry/logs/log_record.h"
 #  include "opentelemetry/logs/severity.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/nostd/unique_ptr.h"
 #  include "opentelemetry/trace/span_context.h"
 #  include "opentelemetry/trace/span_id.h"
 #  include "opentelemetry/trace/trace_flags.h"

diff --git a/api/include/opentelemetry/logs/noop.h b/api/include/opentelemetry/logs/noop.h
@@ -15,6 +15,7 @@
 #  include "opentelemetry/common/key_value_iterable.h"
 #  include "opentelemetry/common/timestamp.h"
 #  include "opentelemetry/context/runtime_context.h"
+#  include "opentelemetry/logs/event_logger.h"
 #  include "opentelemetry/logs/event_logger_provider.h"
 #  include "opentelemetry/logs/logger.h"
 #  include "opentelemetry/logs/logger_provider.h"
@@ -28,8 +29,6 @@
 #  include "opentelemetry/trace/trace_id.h"
 #  include "opentelemetry/version.h"
 
-#  include "opentelemetry/version.h"
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
 {

diff --git a/api/include/opentelemetry/metrics/async_instruments.h b/api/include/opentelemetry/metrics/async_instruments.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics

diff --git a/api/include/opentelemetry/metrics/meter.h b/api/include/opentelemetry/metrics/meter.h
@@ -3,17 +3,25 @@
 
 #pragma once
 
-#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
 {
+template <class T>
+class Counter;
+
+template <class T>
+class Histogram;
+
+template <class T>
+class UpDownCounter;
+
+class ObservableInstrument;
+
 /**
  * Handles instrument creation and provides a facility for batch recording.
  *

diff --git a/api/include/opentelemetry/metrics/meter_provider.h b/api/include/opentelemetry/metrics/meter_provider.h
@@ -3,13 +3,16 @@
 
 #pragma once
 
-#include "opentelemetry/metrics/meter.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
 {
+
+class Meter;
+
 /**
  * Creates new Meter instances.
  */

diff --git a/api/include/opentelemetry/metrics/observer_result.h b/api/include/opentelemetry/metrics/observer_result.h
@@ -9,6 +9,8 @@
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics

diff --git a/api/include/opentelemetry/metrics/provider.h b/api/include/opentelemetry/metrics/provider.h
@@ -7,7 +7,6 @@
 
 #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"
 

diff --git a/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h b/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include <memory>
 
 #include <dlfcn.h>

diff --git a/api/include/opentelemetry/plugin/detail/tracer_handle.h b/api/include/opentelemetry/plugin/detail/tracer_handle.h
@@ -3,10 +3,14 @@
 
 #pragma once
 
-#include "opentelemetry/trace/tracer.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
+namespace trace
+{
+class Tracer;
+}
+
 namespace plugin
 {
 /**

diff --git a/api/include/opentelemetry/plugin/detail/utility.h b/api/include/opentelemetry/plugin/detail/utility.h
@@ -5,6 +5,9 @@
 
 #include <memory>
 #include <string>
+#if __EXCEPTIONS
+#  include <exception>
+#endif
 
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/version.h"

diff --git a/api/include/opentelemetry/std/string_view.h b/api/include/opentelemetry/std/string_view.h
@@ -5,13 +5,7 @@
 
 #include "opentelemetry/version.h"
 
-#include "opentelemetry/std/utility.h"
-
-#include <cstddef>
-#include <memory>
 #include <string_view>
-#include <utility>
-#include <variant>
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 // Standard Type aliases in nostd namespace

diff --git a/api/include/opentelemetry/std/variant.h b/api/include/opentelemetry/std/variant.h
@@ -6,10 +6,13 @@
 #include "opentelemetry/version.h"
 
 #include <cstddef>
-#include <memory>
 #include <utility>
 #include <variant>
 
+#if __EXCEPTIONS
+#  include <exception>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 // Standard Type aliases in nostd namespace
 namespace nostd

diff --git a/api/include/opentelemetry/trace/scope.h b/api/include/opentelemetry/trace/scope.h
@@ -4,12 +4,14 @@
 #pragma once
 
 #include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/trace/span.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace trace
 {
+
+class Span;
+
 /**
  * Controls how long a span is active.
  *

diff --git a/api/include/opentelemetry/trace/span.h b/api/include/opentelemetry/trace/span.h
@@ -3,19 +3,13 @@
 
 #pragma once
 
-#include <cstdint>
-
 #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/nostd/unique_ptr.h"
-#include "opentelemetry/trace/canonical_code.h"
 #include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_metadata.h"
-
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

diff --git a/api/include/opentelemetry/trace/span_context.h b/api/include/opentelemetry/trace/span_context.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/span_id.h"
 #include "opentelemetry/trace/trace_flags.h"
 #include "opentelemetry/trace/trace_id.h"

diff --git a/api/include/opentelemetry/trace/span_metadata.h b/api/include/opentelemetry/trace/span_metadata.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace trace

diff --git a/api/include/opentelemetry/trace/span_startoptions.h b/api/include/opentelemetry/trace/span_startoptions.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "opentelemetry/context/context.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_metadata.h"
 

diff --git a/api/include/opentelemetry/trace/trace_flags.h b/api/include/opentelemetry/trace/trace_flags.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <cstdint>
-#include <cstring>
 
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/version.h"

diff --git a/api/include/opentelemetry/trace/trace_state.h b/api/include/opentelemetry/trace/trace_state.h
@@ -9,7 +9,6 @@
 
 #include "opentelemetry/common/kv_properties.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 

diff --git a/api/include/opentelemetry/trace/tracer.h b/api/include/opentelemetry/trace/tracer.h
@@ -6,7 +6,6 @@
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/scope.h"
 #include "opentelemetry/trace/span.h"

diff --git a/api/include/opentelemetry/trace/tracer_provider.h b/api/include/opentelemetry/trace/tracer_provider.h
@@ -5,11 +5,14 @@
 
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace trace
 {
+
+class Tracer;
+
 /**
  * Creates new Tracer instances.
  */