Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-api.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-api-1.56.0-SNAPSHOT.jar against opentelemetry-api-1.54.1.jar
Comparing source compatibility of opentelemetry-api-1.56.0-SNAPSHOT.jar against opentelemetry-api-1.55.0.jar
No changes.
2 changes: 1 addition & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-common.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-common-1.56.0-SNAPSHOT.jar against opentelemetry-common-1.54.1.jar
Comparing source compatibility of opentelemetry-common-1.56.0-SNAPSHOT.jar against opentelemetry-common-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-context-1.56.0-SNAPSHOT.jar against opentelemetry-context-1.54.1.jar
Comparing source compatibility of opentelemetry-context-1.56.0-SNAPSHOT.jar against opentelemetry-context-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-common-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-common-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-logging-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-logging-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-otlp-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-otlp-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-sender-jdk-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-sender-jdk-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-okhttp-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-sender-okhttp-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-sender-okhttp-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-sender-okhttp-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-zipkin-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-zipkin-1.54.1.jar
Comparing source compatibility of opentelemetry-exporter-zipkin-1.56.0-SNAPSHOT.jar against opentelemetry-exporter-zipkin-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-extension-kotlin-1.56.0-SNAPSHOT.jar against opentelemetry-extension-kotlin-1.54.1.jar
Comparing source compatibility of opentelemetry-extension-kotlin-1.56.0-SNAPSHOT.jar against opentelemetry-extension-kotlin-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-extension-trace-propagators-1.56.0-SNAPSHOT.jar against opentelemetry-extension-trace-propagators-1.54.1.jar
Comparing source compatibility of opentelemetry-extension-trace-propagators-1.56.0-SNAPSHOT.jar against opentelemetry-extension-trace-propagators-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-opentracing-shim-1.56.0-SNAPSHOT.jar against opentelemetry-opentracing-shim-1.54.1.jar
Comparing source compatibility of opentelemetry-opentracing-shim-1.56.0-SNAPSHOT.jar against opentelemetry-opentracing-shim-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-common-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-common-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-spi-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-spi-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-spi-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-spi-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-jaeger-remote-sampler-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-extension-jaeger-remote-sampler-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-extension-jaeger-remote-sampler-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-extension-jaeger-remote-sampler-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-logs-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-logs-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-logs-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-logs-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-metrics-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-metrics-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-metrics-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-metrics-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-testing-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-testing-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-testing-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-testing-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-trace-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.54.1.jar
Comparing source compatibility of opentelemetry-sdk-trace-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.55.0.jar
No changes.
12 changes: 2 additions & 10 deletions docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-1.54.1.jar
*** MODIFIED CLASS: PUBLIC NON_FINAL (<- FINAL) io.opentelemetry.sdk.OpenTelemetrySdk (not serializable)
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.api.logs.LoggerProvider getLogsBridge()
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.api.metrics.MeterProvider getMeterProvider()
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.context.propagation.ContextPropagators getPropagators()
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.sdk.logs.SdkLoggerProvider getSdkLoggerProvider()
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.sdk.metrics.SdkMeterProvider getSdkMeterProvider()
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.sdk.trace.SdkTracerProvider getSdkTracerProvider()
*** MODIFIED METHOD: PUBLIC FINAL (<- NON_FINAL) io.opentelemetry.api.trace.TracerProvider getTracerProvider()
Comparing source compatibility of opentelemetry-sdk-1.56.0-SNAPSHOT.jar against opentelemetry-sdk-1.55.0.jar
No changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import static io.opentelemetry.sdk.common.export.MemoryMode.IMMUTABLE_DATA;

import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarReservoir;
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarReservoirFactory;
import java.util.Collections;

/** The types of histogram aggregation to benchmark. */
Expand All @@ -17,27 +17,27 @@ public enum HistogramAggregationParam {
new DoubleExplicitBucketHistogramAggregator(
ExplicitBucketHistogramUtils.createBoundaryArray(
ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES),
ExemplarReservoir::doubleNoSamples,
ExemplarReservoirFactory.noSamples(),
IMMUTABLE_DATA)),
EXPLICIT_SINGLE_BUCKET(
new DoubleExplicitBucketHistogramAggregator(
ExplicitBucketHistogramUtils.createBoundaryArray(Collections.emptyList()),
ExemplarReservoir::doubleNoSamples,
ExemplarReservoirFactory.noSamples(),
IMMUTABLE_DATA)),
EXPONENTIAL_SMALL_CIRCULAR_BUFFER(
new DoubleBase2ExponentialHistogramAggregator(
ExemplarReservoir::doubleNoSamples, 20, 0, IMMUTABLE_DATA)),
ExemplarReservoirFactory.noSamples(), 20, 0, IMMUTABLE_DATA)),
EXPONENTIAL_CIRCULAR_BUFFER(
new DoubleBase2ExponentialHistogramAggregator(
ExemplarReservoir::doubleNoSamples, 160, 0, IMMUTABLE_DATA));
ExemplarReservoirFactory.noSamples(), 160, 0, IMMUTABLE_DATA));

private final Aggregator<?, ?> aggregator;
private final Aggregator<?> aggregator;

HistogramAggregationParam(Aggregator<?, ?> aggregator) {
HistogramAggregationParam(Aggregator<?> aggregator) {
this.aggregator = aggregator;
}

public Aggregator<?, ?> getAggregator() {
public Aggregator<?> getAggregator() {
return this.aggregator;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

package io.opentelemetry.sdk.metrics.internal.aggregator;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.context.Context;
import java.util.concurrent.TimeUnit;
import java.util.function.DoubleSupplier;
import org.openjdk.jmh.annotations.Benchmark;
Expand Down Expand Up @@ -33,7 +35,7 @@ public class HistogramBenchmark {
public static class ThreadState {
@Param HistogramValueGenerator valueGen;
@Param HistogramAggregationParam aggregation;
private AggregatorHandle<?, ?> aggregatorHandle;
private AggregatorHandle<?> aggregatorHandle;
private DoubleSupplier valueSupplier;

@Setup(Level.Trial)
Expand All @@ -45,7 +47,8 @@ public final void setup() {
public void record() {
// Record a number of samples.
for (int i = 0; i < 2000; i++) {
this.aggregatorHandle.recordDouble(valueSupplier.getAsDouble());
this.aggregatorHandle.recordDouble(
valueSupplier.getAsDouble(), Attributes.empty(), Context.current());
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

package io.opentelemetry.sdk.metrics.internal.aggregator;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.context.Context;
import java.util.concurrent.TimeUnit;
import java.util.function.DoubleSupplier;
import org.openjdk.jmh.annotations.Benchmark;
Expand Down Expand Up @@ -39,7 +41,7 @@ public class HistogramScaleBenchmark {
public static class ThreadState {
@Param HistogramValueGenerator valueGen;
@Param HistogramAggregationParam aggregation;
private AggregatorHandle<?, ?> aggregatorHandle;
private AggregatorHandle<?> aggregatorHandle;
private DoubleSupplier valueSupplier;

@Setup(Level.Invocation)
Expand All @@ -51,7 +53,8 @@ public final void setup() {
public void record() {
// Record a number of samples.
for (int i = 0; i < 20000; i++) {
this.aggregatorHandle.recordDouble(valueSupplier.getAsDouble());
this.aggregatorHandle.recordDouble(
valueSupplier.getAsDouble(), Attributes.empty(), Context.current());
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ WriteableMetricStorage registerSynchronousMetricStorage(InstrumentDescriptor ins
/** Register new asynchronous storage associated with a given instrument. */
SdkObservableMeasurement registerObservableMeasurement(
InstrumentDescriptor instrumentDescriptor) {
List<AsynchronousMetricStorage<?, ?>> registeredStorages = new ArrayList<>();
List<AsynchronousMetricStorage<?>> registeredStorages = new ArrayList<>();
for (Map.Entry<RegisteredReader, MetricStorageRegistry> entry :
readerStorageRegistries.entrySet()) {
RegisteredReader reader = entry.getKey();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor;

abstract class AbstractSumAggregator<T extends PointData, U extends ExemplarData>
implements Aggregator<T, U> {
implements Aggregator<T> {
private final boolean isMonotonic;

AbstractSumAggregator(InstrumentDescriptor instrumentDescriptor) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
import io.opentelemetry.sdk.metrics.data.ExemplarData;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.data.MetricDataType;
import io.opentelemetry.sdk.metrics.data.PointData;
Expand All @@ -25,9 +23,9 @@
* at any time.
*/
@Immutable
public interface Aggregator<T extends PointData, U extends ExemplarData> {
public interface Aggregator<T extends PointData> {
/** Returns the drop aggregator, an aggregator that drops measurements. */
static Aggregator<?, DoubleExemplarData> drop() {
static Aggregator<?> drop() {
return DropAggregator.INSTANCE;
}

Expand All @@ -37,7 +35,7 @@ static Aggregator<?, DoubleExemplarData> drop() {
*
* @return a new {@link AggregatorHandle}.
*/
AggregatorHandle<T, U> createHandle();
AggregatorHandle<T> createHandle();

/**
* Returns a new DELTA point by computing the difference between two cumulative points.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.sdk.metrics.internal.aggregator;

import io.opentelemetry.sdk.common.export.MemoryMode;
import io.opentelemetry.sdk.metrics.data.ExemplarData;
import io.opentelemetry.sdk.metrics.data.PointData;
import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor;
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarFilter;
Expand All @@ -31,7 +30,7 @@ public interface AggregatorFactory {
* @return a new {@link Aggregator}. {@link Aggregator#drop()} indicates no measurements should be
* recorded.
*/
<T extends PointData, U extends ExemplarData> Aggregator<T, U> createAggregator(
<T extends PointData> Aggregator<T> createAggregator(
InstrumentDescriptor instrumentDescriptor,
ExemplarFilter exemplarFilter,
MemoryMode memoryMode);
Expand Down
Loading
Loading