Skip to content

Commit b8b715f

Browse files
esigoesigo
authored
[Metrics SDK] Cleanup ENABLE_METRICS_PREVIEW (#1735)
1 parent 7efeeab commit b8b715f

File tree

146 files changed

+1007
-1411
lines changed

Some content is hidden

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

146 files changed

+1007
-1411
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ option(
189189
OFF)
190190
option(WITH_EXAMPLES "Whether to build examples" ON)
191191

192-
option(WITH_METRICS_PREVIEW "Whether to build metrics preview" OFF)
193192
option(WITH_LOGS_PREVIEW "Whether to build logs preview" OFF)
194193
option(WITH_ASYNC_EXPORT_PREVIEW "Whether enable async export" OFF)
195194
# Exemplar specs status is experimental, so behind feature flag by default

‎api/CMakeLists.txt‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,12 @@ if(NOT WITH_LOGS_PREVIEW)
1818
set(LOGS_EXCLUDE_PATTERN "logs")
1919
endif()
2020

21-
set(METRICS_EXCLUDE_PATTERN "")
22-
if(NOT WITH_METRICS_PREVIEW)
23-
set(METRICS_EXCLUDE_PATTERN "metrics")
24-
endif()
25-
2621
install(
2722
DIRECTORY include/opentelemetry
2823
DESTINATION include
2924
FILES_MATCHING
3025
PATTERN "*.h"
31-
PATTERN "${METRICS_EXCLUDE_PATTERN}" EXCLUDE)
26+
PATTERN "metrics" EXCLUDE)
3227

3328
install(
3429
DIRECTORY include/opentelemetry
@@ -74,10 +69,6 @@ if(WITH_GSL)
7469
endif()
7570
endif()
7671

77-
if(WITH_METRICS_PREVIEW)
78-
target_compile_definitions(opentelemetry_api INTERFACE ENABLE_METRICS_PREVIEW)
79-
endif()
80-
8172
if(WITH_LOGS_PREVIEW)
8273
target_compile_definitions(opentelemetry_api INTERFACE ENABLE_LOGS_PREVIEW)
8374
endif()

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include "opentelemetry/metrics/observer_result.h"
6+
#include "opentelemetry/metrics/observer_result.h"
87

98
OPENTELEMETRY_BEGIN_NAMESPACE
109
namespace metrics
@@ -31,4 +30,3 @@ class ObservableInstrument
3130

3231
} // namespace metrics
3332
OPENTELEMETRY_END_NAMESPACE
34-
#endif

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include "opentelemetry/metrics/async_instruments.h"
8-
# include "opentelemetry/metrics/sync_instruments.h"
9-
# include "opentelemetry/nostd/shared_ptr.h"
10-
# include "opentelemetry/nostd/span.h"
11-
# include "opentelemetry/nostd/string_view.h"
12-
# include "opentelemetry/nostd/unique_ptr.h"
13-
# include "opentelemetry/version.h"
6+
#include "opentelemetry/metrics/async_instruments.h"
7+
#include "opentelemetry/metrics/sync_instruments.h"
8+
#include "opentelemetry/nostd/shared_ptr.h"
9+
#include "opentelemetry/nostd/span.h"
10+
#include "opentelemetry/nostd/string_view.h"
11+
#include "opentelemetry/nostd/unique_ptr.h"
12+
#include "opentelemetry/version.h"
1413

1514
OPENTELEMETRY_BEGIN_NAMESPACE
1615
namespace metrics
@@ -140,4 +139,3 @@ class Meter
140139
};
141140
} // namespace metrics
142141
OPENTELEMETRY_END_NAMESPACE
143-
#endif

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include "opentelemetry/metrics/meter.h"
8-
# include "opentelemetry/nostd/shared_ptr.h"
9-
# include "opentelemetry/nostd/string_view.h"
6+
#include "opentelemetry/metrics/meter.h"
7+
#include "opentelemetry/nostd/shared_ptr.h"
8+
#include "opentelemetry/nostd/string_view.h"
109

1110
OPENTELEMETRY_BEGIN_NAMESPACE
1211
namespace metrics
@@ -30,4 +29,3 @@ class MeterProvider
3029
};
3130
} // namespace metrics
3231
OPENTELEMETRY_END_NAMESPACE
33-
#endif

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include "opentelemetry/metrics/async_instruments.h"
8-
# include "opentelemetry/metrics/meter.h"
9-
# include "opentelemetry/metrics/meter_provider.h"
10-
# include "opentelemetry/metrics/observer_result.h"
11-
# include "opentelemetry/metrics/sync_instruments.h"
12-
# include "opentelemetry/version.h"
6+
#include "opentelemetry/metrics/async_instruments.h"
7+
#include "opentelemetry/metrics/meter.h"
8+
#include "opentelemetry/metrics/meter_provider.h"
9+
#include "opentelemetry/metrics/observer_result.h"
10+
#include "opentelemetry/metrics/sync_instruments.h"
11+
#include "opentelemetry/version.h"
1312

1413
OPENTELEMETRY_BEGIN_NAMESPACE
1514
namespace metrics
@@ -213,4 +212,3 @@ class NoopMeterProvider final : public MeterProvider
213212
};
214213
} // namespace metrics
215214
OPENTELEMETRY_END_NAMESPACE
216-
#endif

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include "opentelemetry/common/attribute_value.h"
8-
# include "opentelemetry/common/key_value_iterable_view.h"
9-
# include "opentelemetry/nostd/shared_ptr.h"
10-
# include "opentelemetry/nostd/span.h"
11-
# include "opentelemetry/nostd/string_view.h"
12-
# include "opentelemetry/nostd/type_traits.h"
6+
#include "opentelemetry/common/attribute_value.h"
7+
#include "opentelemetry/common/key_value_iterable_view.h"
8+
#include "opentelemetry/nostd/shared_ptr.h"
9+
#include "opentelemetry/nostd/span.h"
10+
#include "opentelemetry/nostd/string_view.h"
11+
#include "opentelemetry/nostd/type_traits.h"
1312

1413
OPENTELEMETRY_BEGIN_NAMESPACE
1514
namespace metrics
@@ -51,4 +50,3 @@ using ObserverResult = nostd::variant<nostd::shared_ptr<ObserverResultT<int64_t>
5150

5251
} // namespace metrics
5352
OPENTELEMETRY_END_NAMESPACE
54-
#endif

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include <mutex>
6+
#include <mutex>
87

9-
# include "opentelemetry/common/macros.h"
10-
# include "opentelemetry/common/spin_lock_mutex.h"
11-
# include "opentelemetry/metrics/meter_provider.h"
12-
# include "opentelemetry/metrics/noop.h"
13-
# include "opentelemetry/nostd/shared_ptr.h"
8+
#include "opentelemetry/common/macros.h"
9+
#include "opentelemetry/common/spin_lock_mutex.h"
10+
#include "opentelemetry/metrics/meter_provider.h"
11+
#include "opentelemetry/metrics/noop.h"
12+
#include "opentelemetry/nostd/shared_ptr.h"
1413

1514
OPENTELEMETRY_BEGIN_NAMESPACE
1615
namespace metrics
@@ -58,4 +57,3 @@ class Provider
5857

5958
} // namespace metrics
6059
OPENTELEMETRY_END_NAMESPACE
61-
#endif

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5-
#ifndef ENABLE_METRICS_PREVIEW
65

7-
# include "opentelemetry/common/attribute_value.h"
8-
# include "opentelemetry/common/key_value_iterable_view.h"
9-
# include "opentelemetry/context/context.h"
10-
# include "opentelemetry/nostd/span.h"
11-
# include "opentelemetry/nostd/string_view.h"
12-
# include "opentelemetry/nostd/type_traits.h"
6+
#include "opentelemetry/common/attribute_value.h"
7+
#include "opentelemetry/common/key_value_iterable_view.h"
8+
#include "opentelemetry/context/context.h"
9+
#include "opentelemetry/nostd/span.h"
10+
#include "opentelemetry/nostd/string_view.h"
11+
#include "opentelemetry/nostd/type_traits.h"
1312

1413
OPENTELEMETRY_BEGIN_NAMESPACE
1514
namespace metrics
@@ -196,4 +195,3 @@ class UpDownCounter : public SynchronousInstrument
196195

197196
} // namespace metrics
198197
OPENTELEMETRY_END_NAMESPACE
199-
#endif

‎api/test/metrics/meter_provider_test.cc‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#ifndef ENABLE_METRICS_PREVIEW
5-
6-
# include <gtest/gtest.h>
7-
# include "opentelemetry/metrics/noop.h"
8-
# include "opentelemetry/metrics/provider.h"
9-
# include "opentelemetry/nostd/shared_ptr.h"
4+
#include <gtest/gtest.h>
5+
#include "opentelemetry/metrics/noop.h"
6+
#include "opentelemetry/metrics/provider.h"
7+
#include "opentelemetry/nostd/shared_ptr.h"
108

119
using opentelemetry::metrics::Meter;
1210
using opentelemetry::metrics::MeterProvider;
@@ -35,4 +33,3 @@ TEST(Provider, MultipleMeterProviders)
3533

3634
ASSERT_NE(Provider::GetMeterProvider(), tf);
3735
}
38-
#endif

0 commit comments

Comments
 (0)