Skip to content

Commit 44b9825

Browse files
committed
Delete unused Measurement and related code
1 parent f6f1db7 commit 44b9825

File tree

9 files changed

+1
-345
lines changed

9 files changed

+1
-345
lines changed

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/Aggregator.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.sdk.metrics.data.MetricDataType;
1414
import io.opentelemetry.sdk.metrics.data.PointData;
1515
import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
16-
import io.opentelemetry.sdk.metrics.internal.state.Measurement;
1716
import io.opentelemetry.sdk.resources.Resource;
1817
import java.util.Collection;
1918
import javax.annotation.concurrent.Immutable;
@@ -68,24 +67,6 @@ default void diffInPlace(T previousCumulativeReusable, T currentCumulative) {
6867
throw new UnsupportedOperationException("This aggregator does not support diffInPlace.");
6968
}
7069

71-
/**
72-
* Return a new point representing the measurement.
73-
*
74-
* <p>Aggregators MUST implement diff if it can be used with asynchronous instruments.
75-
*/
76-
default T toPoint(Measurement measurement) {
77-
throw new UnsupportedOperationException("This aggregator does not support toPoint.");
78-
}
79-
80-
/**
81-
* Resets {@code reusablePoint} to represent the {@code measurement}.
82-
*
83-
* <p>Aggregators MUST implement diff if it can be used with asynchronous instruments.
84-
*/
85-
default void toPoint(Measurement measurement, T reusablePoint) {
86-
throw new UnsupportedOperationException("This aggregator does not support toPoint.");
87-
}
88-
8970
/** Creates a new reusable point. */
9071
default T createReusablePoint() {
9172
throw new UnsupportedOperationException(

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleLastValueAggregator.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.opentelemetry.sdk.metrics.internal.data.MutableDoublePointData;
1919
import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
2020
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarReservoir;
21-
import io.opentelemetry.sdk.metrics.internal.state.Measurement;
2221
import io.opentelemetry.sdk.resources.Resource;
2322
import java.util.Collection;
2423
import java.util.List;
@@ -67,25 +66,6 @@ public void diffInPlace(DoublePointData previousReusable, DoublePointData curren
6766
((MutableDoublePointData) previousReusable).set(current);
6867
}
6968

70-
@Override
71-
public DoublePointData toPoint(Measurement measurement) {
72-
return ImmutableDoublePointData.create(
73-
measurement.startEpochNanos(),
74-
measurement.epochNanos(),
75-
measurement.attributes(),
76-
measurement.doubleValue());
77-
}
78-
79-
@Override
80-
public void toPoint(Measurement measurement, DoublePointData reusablePoint) {
81-
((MutableDoublePointData) reusablePoint)
82-
.set(
83-
measurement.startEpochNanos(),
84-
measurement.epochNanos(),
85-
measurement.attributes(),
86-
measurement.doubleValue());
87-
}
88-
8969
@Override
9070
public DoublePointData createReusablePoint() {
9171
return new MutableDoublePointData();

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleSumAggregator.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor;
2222
import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
2323
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarReservoir;
24-
import io.opentelemetry.sdk.metrics.internal.state.Measurement;
2524
import io.opentelemetry.sdk.resources.Resource;
2625
import java.util.Collection;
2726
import java.util.List;
@@ -82,25 +81,6 @@ public void diffInPlace(DoublePointData previousReusablePoint, DoublePointData c
8281
currentPoint.getExemplars());
8382
}
8483

85-
@Override
86-
public DoublePointData toPoint(Measurement measurement) {
87-
return ImmutableDoublePointData.create(
88-
measurement.startEpochNanos(),
89-
measurement.epochNanos(),
90-
measurement.attributes(),
91-
measurement.doubleValue());
92-
}
93-
94-
@Override
95-
public void toPoint(Measurement measurement, DoublePointData reusablePoint) {
96-
((MutableDoublePointData) reusablePoint)
97-
.set(
98-
measurement.startEpochNanos(),
99-
measurement.epochNanos(),
100-
measurement.attributes(),
101-
measurement.doubleValue());
102-
}
103-
10484
@Override
10585
public DoublePointData createReusablePoint() {
10686
return new MutableDoublePointData();

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/LongLastValueAggregator.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.opentelemetry.sdk.metrics.internal.data.MutableLongPointData;
1919
import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
2020
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarReservoir;
21-
import io.opentelemetry.sdk.metrics.internal.state.Measurement;
2221
import io.opentelemetry.sdk.resources.Resource;
2322
import java.util.Collection;
2423
import java.util.List;
@@ -63,25 +62,6 @@ public void diffInPlace(LongPointData previousReusablePoint, LongPointData curre
6362
((MutableLongPointData) previousReusablePoint).set(currentPoint);
6463
}
6564

66-
@Override
67-
public LongPointData toPoint(Measurement measurement) {
68-
return ImmutableLongPointData.create(
69-
measurement.startEpochNanos(),
70-
measurement.epochNanos(),
71-
measurement.attributes(),
72-
measurement.longValue());
73-
}
74-
75-
@Override
76-
public void toPoint(Measurement measurement, LongPointData reusablePoint) {
77-
((MutableLongPointData) reusablePoint)
78-
.set(
79-
measurement.startEpochNanos(),
80-
measurement.epochNanos(),
81-
measurement.attributes(),
82-
measurement.longValue());
83-
}
84-
8565
@Override
8666
public LongPointData createReusablePoint() {
8767
return new MutableLongPointData();

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/LongSumAggregator.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor;
2222
import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
2323
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarReservoir;
24-
import io.opentelemetry.sdk.metrics.internal.state.Measurement;
2524
import io.opentelemetry.sdk.resources.Resource;
2625
import java.util.Collection;
2726
import java.util.List;
@@ -75,25 +74,6 @@ public void diffInPlace(LongPointData previousReusablePoint, LongPointData curre
7574
currentPoint.getExemplars());
7675
}
7776

78-
@Override
79-
public LongPointData toPoint(Measurement measurement) {
80-
return ImmutableLongPointData.create(
81-
measurement.startEpochNanos(),
82-
measurement.epochNanos(),
83-
measurement.attributes(),
84-
measurement.longValue());
85-
}
86-
87-
@Override
88-
public void toPoint(Measurement measurement, LongPointData reusablePoint) {
89-
((MutableLongPointData) reusablePoint)
90-
.set(
91-
measurement.startEpochNanos(),
92-
measurement.epochNanos(),
93-
measurement.attributes(),
94-
measurement.longValue());
95-
}
96-
9777
@Override
9878
public LongPointData createReusablePoint() {
9979
return new MutableLongPointData();

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,7 @@ private Collection<T> collectWithDeltaAggregationTemporality() {
227227
(attributes, handle) -> {
228228
T point =
229229
handle.aggregateThenMaybeReset(
230-
AsynchronousMetricStorage.this.startEpochNanos,
231-
AsynchronousMetricStorage.this.epochNanos,
232-
attributes,
233-
/* reset= */ true);
230+
this.startEpochNanos, this.epochNanos, attributes, /* reset= */ true);
234231

235232
T pointForCurrentPoints;
236233
if (memoryMode == REUSABLE_DATA) {

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/ImmutableMeasurement.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/Measurement.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)