Skip to content

Commit 60df532

Browse files
committed
Remove ABI macros from SDK.
1 parent eecf89f commit 60df532

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

exporters/otlp/src/otlp_metric_utils.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,7 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::DeltaTemporalitySelector(
297297
case sdk::metrics::InstrumentType::kObservableCounter:
298298
case sdk::metrics::InstrumentType::kHistogram:
299299
case sdk::metrics::InstrumentType::kObservableGauge:
300-
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
301300
case sdk::metrics::InstrumentType::kGauge:
302-
#endif
303301
return sdk::metrics::AggregationTemporality::kDelta;
304302
case sdk::metrics::InstrumentType::kUpDownCounter:
305303
case sdk::metrics::InstrumentType::kObservableUpDownCounter:
@@ -323,9 +321,7 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::LowMemoryTemporalitySelect
323321
case sdk::metrics::InstrumentType::kHistogram:
324322
return sdk::metrics::AggregationTemporality::kDelta;
325323
case sdk::metrics::InstrumentType::kObservableCounter:
326-
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
327324
case sdk::metrics::InstrumentType::kGauge:
328-
#endif
329325
case sdk::metrics::InstrumentType::kObservableGauge:
330326
case sdk::metrics::InstrumentType::kUpDownCounter:
331327
case sdk::metrics::InstrumentType::kObservableUpDownCounter:

sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ class DefaultAggregation
180180
return AggregationType::kSum;
181181
case InstrumentType::kHistogram:
182182
return AggregationType::kHistogram;
183-
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
184183
case InstrumentType::kGauge:
185-
#endif
186184
case InstrumentType::kObservableGauge:
187185
return AggregationType::kLastValue;
188186
default:

sdk/include/opentelemetry/sdk/metrics/instruments.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ enum class InstrumentType
1919
kCounter,
2020
kHistogram,
2121
kUpDownCounter,
22-
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
2322
kGauge,
24-
#endif
2523
kObservableCounter,
2624
kObservableGauge,
2725
kObservableUpDownCounter

0 commit comments

Comments
 (0)