Skip to content

Commit 55a8db1

Browse files
lalitbcngzhnp
lalitb
authored and
cngzhnp
committed
[Metrics SDK] Implement Forceflush for Periodic Metric Reader (open-telemetry#2064)
1 parent b793426 commit 55a8db1

File tree

193 files changed

+663
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+663
-309
lines changed

‎.gitignore

+13
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,16 @@ tags
5858

5959
# Temporary dir used when generating semconv
6060
./buildscripts/semantic-convention/opentelemetry-specification
61+
62+
# Generated Windows files or directories
63+
*.vcxproj
64+
*.vcxproj.filters
65+
*.sln
66+
67+
# CMake generated files or directories
68+
**/CMakeFiles
69+
**/cmake_install.cmake
70+
**/CTestTestfile.cmake
71+
CMakeCache.txt
72+
DartConfiguration.tcl
73+
/cmake

‎api/include/opentelemetry/common/kv_properties.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "opentelemetry/common/key_value_iterable_view.h"
77
#include "opentelemetry/common/string_util.h"
88
#include "opentelemetry/nostd/function_ref.h"
9-
#include "opentelemetry/nostd/shared_ptr.h"
109
#include "opentelemetry/nostd/string_view.h"
1110
#include "opentelemetry/nostd/unique_ptr.h"
1211
#include "opentelemetry/version.h"

‎api/include/opentelemetry/common/string_util.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include "opentelemetry/nostd/string_view.h"
7+
#include "opentelemetry/version.h"
78

89
OPENTELEMETRY_BEGIN_NAMESPACE
910
namespace common

‎api/include/opentelemetry/common/timestamp.h

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#pragma once
55

6-
#include <algorithm>
76
#include <chrono>
87
#include <cstdint>
98

‎api/include/opentelemetry/logs/event_logger.h

-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@
44
#pragma once
55
#ifdef ENABLE_LOGS_PREVIEW
66

7-
# include <chrono>
8-
# include <map>
9-
# include <vector>
10-
117
# include "opentelemetry/common/macros.h"
128
# include "opentelemetry/logs/log_record.h"
139
# include "opentelemetry/logs/logger.h"
1410
# include "opentelemetry/logs/logger_type_traits.h"
15-
# include "opentelemetry/logs/severity.h"
1611
# include "opentelemetry/nostd/shared_ptr.h"
1712
# include "opentelemetry/nostd/string_view.h"
1813
# include "opentelemetry/nostd/unique_ptr.h"

‎api/include/opentelemetry/logs/event_logger_provider.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
#pragma once
55
#ifdef ENABLE_LOGS_PREVIEW
66

7-
# include "opentelemetry/common/key_value_iterable.h"
8-
# include "opentelemetry/common/key_value_iterable_view.h"
9-
# include "opentelemetry/logs/event_logger.h"
10-
# include "opentelemetry/logs/logger.h"
117
# include "opentelemetry/nostd/shared_ptr.h"
128
# include "opentelemetry/nostd/string_view.h"
9+
# include "opentelemetry/version.h"
1310

1411
OPENTELEMETRY_BEGIN_NAMESPACE
1512
namespace logs
1613
{
14+
15+
class EventLogger;
16+
class Logger;
17+
1718
/**
1819
* Creates new EventLogger instances.
1920
*/

‎api/include/opentelemetry/logs/log_record.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@
55
#ifdef ENABLE_LOGS_PREVIEW
66

77
# include "opentelemetry/common/attribute_value.h"
8-
# include "opentelemetry/common/key_value_iterable.h"
98
# include "opentelemetry/common/timestamp.h"
109
# include "opentelemetry/logs/severity.h"
11-
# include "opentelemetry/trace/span_id.h"
12-
# include "opentelemetry/trace/trace_flags.h"
13-
# include "opentelemetry/trace/trace_id.h"
1410
# include "opentelemetry/version.h"
1511

1612
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace trace
14+
{
15+
class SpanId;
16+
class TraceId;
17+
class TraceFlags;
18+
} // namespace trace
19+
1720
namespace logs
1821
{
1922
/**

‎api/include/opentelemetry/logs/logger.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#ifdef ENABLE_LOGS_PREVIEW
66

77
# include "opentelemetry/common/key_value_iterable.h"
8-
# include "opentelemetry/logs/log_record.h"
98
# include "opentelemetry/logs/logger_type_traits.h"
109
# include "opentelemetry/logs/severity.h"
1110
# include "opentelemetry/nostd/string_view.h"
@@ -15,6 +14,9 @@
1514
OPENTELEMETRY_BEGIN_NAMESPACE
1615
namespace logs
1716
{
17+
18+
class LogRecord;
19+
1820
/**
1921
* Handles log record creation.
2022
**/

‎api/include/opentelemetry/logs/logger_provider.h

+2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# include "opentelemetry/common/key_value_iterable_view.h"
1010
# include "opentelemetry/logs/logger.h"
1111
# include "opentelemetry/nostd/shared_ptr.h"
12+
# include "opentelemetry/nostd/span.h"
1213
# include "opentelemetry/nostd/string_view.h"
14+
# include "opentelemetry/nostd/type_traits.h"
1315

1416
OPENTELEMETRY_BEGIN_NAMESPACE
1517
namespace logs

‎api/include/opentelemetry/logs/logger_type_traits.h

-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@
1212
# include "opentelemetry/common/timestamp.h"
1313
# include "opentelemetry/logs/log_record.h"
1414
# include "opentelemetry/logs/severity.h"
15-
# include "opentelemetry/nostd/shared_ptr.h"
16-
# include "opentelemetry/nostd/span.h"
1715
# include "opentelemetry/nostd/string_view.h"
1816
# include "opentelemetry/nostd/type_traits.h"
19-
# include "opentelemetry/nostd/unique_ptr.h"
2017
# include "opentelemetry/trace/span_context.h"
2118
# include "opentelemetry/trace/span_id.h"
2219
# include "opentelemetry/trace/trace_flags.h"

‎api/include/opentelemetry/logs/noop.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# include "opentelemetry/common/key_value_iterable.h"
1616
# include "opentelemetry/common/timestamp.h"
1717
# include "opentelemetry/context/runtime_context.h"
18+
# include "opentelemetry/logs/event_logger.h"
1819
# include "opentelemetry/logs/event_logger_provider.h"
1920
# include "opentelemetry/logs/logger.h"
2021
# include "opentelemetry/logs/logger_provider.h"
@@ -28,8 +29,6 @@
2829
# include "opentelemetry/trace/trace_id.h"
2930
# include "opentelemetry/version.h"
3031

31-
# include "opentelemetry/version.h"
32-
3332
OPENTELEMETRY_BEGIN_NAMESPACE
3433
namespace logs
3534
{

‎api/include/opentelemetry/metrics/async_instruments.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include "opentelemetry/metrics/observer_result.h"
7+
#include "opentelemetry/version.h"
78

89
OPENTELEMETRY_BEGIN_NAMESPACE
910
namespace metrics

‎api/include/opentelemetry/metrics/meter.h

+11-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,25 @@
33

44
#pragma once
55

6-
#include "opentelemetry/metrics/async_instruments.h"
7-
#include "opentelemetry/metrics/sync_instruments.h"
86
#include "opentelemetry/nostd/shared_ptr.h"
9-
#include "opentelemetry/nostd/span.h"
107
#include "opentelemetry/nostd/string_view.h"
118
#include "opentelemetry/nostd/unique_ptr.h"
129
#include "opentelemetry/version.h"
1310

1411
OPENTELEMETRY_BEGIN_NAMESPACE
1512
namespace metrics
1613
{
14+
template <class T>
15+
class Counter;
16+
17+
template <class T>
18+
class Histogram;
19+
20+
template <class T>
21+
class UpDownCounter;
22+
23+
class ObservableInstrument;
24+
1725
/**
1826
* Handles instrument creation and provides a facility for batch recording.
1927
*

‎api/include/opentelemetry/metrics/meter_provider.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33

44
#pragma once
55

6-
#include "opentelemetry/metrics/meter.h"
76
#include "opentelemetry/nostd/shared_ptr.h"
87
#include "opentelemetry/nostd/string_view.h"
8+
#include "opentelemetry/version.h"
99

1010
OPENTELEMETRY_BEGIN_NAMESPACE
1111
namespace metrics
1212
{
13+
14+
class Meter;
15+
1316
/**
1417
* Creates new Meter instances.
1518
*/

‎api/include/opentelemetry/metrics/observer_result.h

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#include "opentelemetry/nostd/span.h"
1010
#include "opentelemetry/nostd/string_view.h"
1111
#include "opentelemetry/nostd/type_traits.h"
12+
#include "opentelemetry/nostd/variant.h"
13+
#include "opentelemetry/version.h"
1214

1315
OPENTELEMETRY_BEGIN_NAMESPACE
1416
namespace metrics

‎api/include/opentelemetry/metrics/provider.h

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include "opentelemetry/common/macros.h"
99
#include "opentelemetry/common/spin_lock_mutex.h"
10-
#include "opentelemetry/metrics/meter_provider.h"
1110
#include "opentelemetry/metrics/noop.h"
1211
#include "opentelemetry/nostd/shared_ptr.h"
1312

‎api/include/opentelemetry/plugin/detail/dynamic_load_unix.h

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#pragma once
55

6-
#include <algorithm>
76
#include <memory>
87

98
#include <dlfcn.h>

‎api/include/opentelemetry/plugin/detail/tracer_handle.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#pragma once
55

6-
#include "opentelemetry/trace/tracer.h"
76
#include "opentelemetry/version.h"
87

98
OPENTELEMETRY_BEGIN_NAMESPACE
9+
namespace trace
10+
{
11+
class Tracer;
12+
}
13+
1014
namespace plugin
1115
{
1216
/**

‎api/include/opentelemetry/plugin/detail/utility.h

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
#include <memory>
77
#include <string>
8+
#if __EXCEPTIONS
9+
# include <exception>
10+
#endif
811

912
#include "opentelemetry/nostd/string_view.h"
1013
#include "opentelemetry/version.h"

‎api/include/opentelemetry/std/string_view.h

-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55

66
#include "opentelemetry/version.h"
77

8-
#include "opentelemetry/std/utility.h"
9-
10-
#include <cstddef>
11-
#include <memory>
128
#include <string_view>
13-
#include <utility>
14-
#include <variant>
159

1610
OPENTELEMETRY_BEGIN_NAMESPACE
1711
// Standard Type aliases in nostd namespace

‎api/include/opentelemetry/std/variant.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
#include "opentelemetry/version.h"
77

88
#include <cstddef>
9-
#include <memory>
109
#include <utility>
1110
#include <variant>
1211

12+
#if __EXCEPTIONS
13+
# include <exception>
14+
#endif
15+
1316
OPENTELEMETRY_BEGIN_NAMESPACE
1417
// Standard Type aliases in nostd namespace
1518
namespace nostd

‎api/include/opentelemetry/trace/scope.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
#pragma once
55

66
#include "opentelemetry/context/runtime_context.h"
7-
#include "opentelemetry/trace/span.h"
87
#include "opentelemetry/version.h"
98

109
OPENTELEMETRY_BEGIN_NAMESPACE
1110
namespace trace
1211
{
12+
13+
class Span;
14+
1315
/**
1416
* Controls how long a span is active.
1517
*

‎api/include/opentelemetry/trace/span.h

-6
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@
33

44
#pragma once
55

6-
#include <cstdint>
7-
86
#include "opentelemetry/common/attribute_value.h"
97
#include "opentelemetry/common/key_value_iterable_view.h"
10-
#include "opentelemetry/nostd/shared_ptr.h"
118
#include "opentelemetry/nostd/span.h"
129
#include "opentelemetry/nostd/string_view.h"
1310
#include "opentelemetry/nostd/type_traits.h"
14-
#include "opentelemetry/nostd/unique_ptr.h"
15-
#include "opentelemetry/trace/canonical_code.h"
1611
#include "opentelemetry/trace/span_context.h"
1712
#include "opentelemetry/trace/span_metadata.h"
18-
1913
#include "opentelemetry/version.h"
2014

2115
OPENTELEMETRY_BEGIN_NAMESPACE

‎api/include/opentelemetry/trace/span_context.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55

6-
#include "opentelemetry/nostd/unique_ptr.h"
6+
#include "opentelemetry/nostd/shared_ptr.h"
77
#include "opentelemetry/trace/span_id.h"
88
#include "opentelemetry/trace/trace_flags.h"
99
#include "opentelemetry/trace/trace_id.h"

‎api/include/opentelemetry/trace/span_metadata.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include "opentelemetry/common/timestamp.h"
7+
#include "opentelemetry/version.h"
78

89
OPENTELEMETRY_BEGIN_NAMESPACE
910
namespace trace

‎api/include/opentelemetry/trace/span_startoptions.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include "opentelemetry/context/context.h"
7+
#include "opentelemetry/nostd/variant.h"
78
#include "opentelemetry/trace/span_context.h"
89
#include "opentelemetry/trace/span_metadata.h"
910

‎api/include/opentelemetry/trace/trace_flags.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#pragma once
55

66
#include <cstdint>
7-
#include <cstring>
87

98
#include "opentelemetry/nostd/span.h"
109
#include "opentelemetry/version.h"

‎api/include/opentelemetry/trace/trace_state.h

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "opentelemetry/common/kv_properties.h"
1111
#include "opentelemetry/nostd/shared_ptr.h"
12-
#include "opentelemetry/nostd/span.h"
1312
#include "opentelemetry/nostd/string_view.h"
1413
#include "opentelemetry/nostd/unique_ptr.h"
1514

‎api/include/opentelemetry/trace/tracer.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "opentelemetry/context/context.h"
77
#include "opentelemetry/nostd/shared_ptr.h"
88
#include "opentelemetry/nostd/string_view.h"
9-
#include "opentelemetry/nostd/unique_ptr.h"
109
#include "opentelemetry/trace/default_span.h"
1110
#include "opentelemetry/trace/scope.h"
1211
#include "opentelemetry/trace/span.h"

‎api/include/opentelemetry/trace/tracer_provider.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
#include "opentelemetry/nostd/shared_ptr.h"
77
#include "opentelemetry/nostd/string_view.h"
8-
#include "opentelemetry/trace/tracer.h"
8+
#include "opentelemetry/version.h"
99

1010
OPENTELEMETRY_BEGIN_NAMESPACE
1111
namespace trace
1212
{
13+
14+
class Tracer;
15+
1316
/**
1417
* Creates new Tracer instances.
1518
*/

0 commit comments

Comments
 (0)