From 1e9fb21c641c508d900f70b75dc1b14beee8b46d Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Wed, 15 Dec 2021 11:51:32 +0900 Subject: [PATCH] Remove deprecated metrics APIs (#3990) --- api/metrics/README.md | 12 -- api/metrics/build.gradle.kts | 20 -- api/metrics/gradle.properties | 1 - .../api/metrics/GlobalMeterProvider.java | 38 ---- .../current_vs_latest/opentelemetry-api.txt | 188 +----------------- .../opentelemetry-exporter-logging-otlp.txt | 8 +- .../opentelemetry-exporter-logging.txt | 19 +- ...opentelemetry-exporter-otlp-http-trace.txt | 4 +- .../opentelemetry-exporter-otlp-trace.txt | 4 +- .../opentelemetry-sdk-trace.txt | 4 +- .../current_vs_latest/opentelemetry-sdk.txt | 8 +- exporters/otlp/trace/build.gradle.kts | 2 - .../OpenTelemetrySdkAutoConfiguration.java | 2 +- sdk/metrics/build.gradle.kts | 2 +- .../sdk/metrics/SdkMeterProviderBuilder.java | 21 +- .../metrics/SdkMeterProviderBuilderTest.java | 11 - settings.gradle.kts | 1 - 17 files changed, 10 insertions(+), 335 deletions(-) delete mode 100644 api/metrics/README.md delete mode 100644 api/metrics/build.gradle.kts delete mode 100644 api/metrics/gradle.properties delete mode 100644 api/metrics/src/main/java/io/opentelemetry/api/metrics/GlobalMeterProvider.java diff --git a/api/metrics/README.md b/api/metrics/README.md deleted file mode 100644 index 40728e8bb6..0000000000 --- a/api/metrics/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# OpenTelemetry Metrics API - -[![Javadocs][javadoc-image]][javadoc-url] - -* The code in this module is the implementation of the [experimental OpenTelemetry metrics signal][metrics-spec]. -* The default implementation of the interfaces in this module is in the OpenTelemetry metrics SDK module. -* The interfaces in this directory can be implemented to create alternative - implementations of the OpenTelemetry library. - -[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api-metrics.svg -[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api-metrics -[metrics-spec]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md diff --git a/api/metrics/build.gradle.kts b/api/metrics/build.gradle.kts deleted file mode 100644 index 9acaf0dfec..0000000000 --- a/api/metrics/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id("otel.java-conventions") - id("otel.publish-conventions") - - id("otel.jmh-conventions") - id("otel.animalsniffer-conventions") -} - -description = "OpenTelemetry API" -otelJava.moduleName.set("io.opentelemetry.api.metrics") - -dependencies { - api(project(":api:all")) - api(project(":context")) - - annotationProcessor("com.google.auto.value:auto-value") - - testImplementation("edu.berkeley.cs.jqf:jqf-fuzz") - testImplementation("com.google.guava:guava-testlib") -} diff --git a/api/metrics/gradle.properties b/api/metrics/gradle.properties deleted file mode 100644 index 4476ae57e3..0000000000 --- a/api/metrics/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -otel.release=alpha diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/GlobalMeterProvider.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/GlobalMeterProvider.java deleted file mode 100644 index 0ee529fda6..0000000000 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/GlobalMeterProvider.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.api.metrics; - -/** - * This class is a temporary solution until metrics SDK is marked stable. - * - * @deprecated Use {@link io.opentelemetry.api.GlobalOpenTelemetry}. - */ -@Deprecated -public class GlobalMeterProvider { - private static volatile MeterProvider globalMeterProvider = MeterProvider.noop(); - - private GlobalMeterProvider() {} - - /** - * Returns the globally registered {@link MeterProvider}. - * - * @deprecated Use {@link io.opentelemetry.api.GlobalOpenTelemetry#get()}. - */ - @Deprecated - public static MeterProvider get() { - return globalMeterProvider; - } - - /** - * Sets the {@link MeterProvider} that should be the global instance. Future calls to {@link - * #get()} will return the provided {@link MeterProvider} instance. This should be called once as - * early as possible in your application initialization logic, often in a {@code static} block in - * your main class. - */ - public static void set(MeterProvider provider) { - globalMeterProvider = (provider == null) ? MeterProvider.noop() : provider; - } -} diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-api.txt index 7cfc274da9..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-api.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-api.txt @@ -1,188 +1,2 @@ Comparing source compatibility of against -+++ NEW CLASS: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.DefaultMeter$NoopDoubleHistogram (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.DoubleHistogram - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) DefaultMeter$NoopDoubleHistogram() - +++ NEW METHOD: PUBLIC(+) void record(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) - +++ NEW METHOD: PUBLIC(+) void record(double, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) void record(double) -+++ NEW CLASS: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.DefaultMeter$NoopDoubleHistogramBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.DoubleHistogramBuilder - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) DefaultMeter$NoopDoubleHistogramBuilder() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.DoubleHistogram build() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.DoubleHistogramBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.DoubleHistogramBuilder setUnit(java.lang.String) -+++ NEW CLASS: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.DefaultMeter$NoopDoubleObservableInstrumentBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.DoubleGaugeBuilder - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) DefaultMeter$NoopDoubleObservableInstrumentBuilder() - +++ NEW METHOD: PUBLIC(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.DoubleGaugeBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.DoubleGaugeBuilder setUnit(java.lang.String) -+++ NEW CLASS: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.DefaultMeter$NoopLongHistogram (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.LongHistogram - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) DefaultMeter$NoopLongHistogram() - +++ NEW METHOD: PUBLIC(+) void record(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) - +++ NEW METHOD: PUBLIC(+) void record(long, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) void record(long) -+++ NEW CLASS: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.DefaultMeter$NoopLongHistogramBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.LongHistogramBuilder - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) DefaultMeter$NoopLongHistogramBuilder() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongHistogram build() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongHistogramBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongHistogramBuilder setUnit(java.lang.String) -+++ NEW CLASS: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.DefaultMeter$NoopLongObservableInstrumentBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.LongGaugeBuilder - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) DefaultMeter$NoopLongObservableInstrumentBuilder() - +++ NEW METHOD: PUBLIC(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongGaugeBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.LongGaugeBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleCounter (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(double) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(double, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleCounterBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleCounter build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleCounterBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleCounterBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleGaugeBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleGaugeBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleGaugeBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleHistogram (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(double) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(double, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleHistogramBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleHistogram build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleHistogramBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleHistogramBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleUpDownCounter (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(double) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(double, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleUpDownCounter build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongCounter (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(long) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(long, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongCounterBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongCounter build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleCounterBuilder ofDoubles() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongCounterBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongCounterBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongGaugeBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongGaugeBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongGaugeBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongHistogram (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(long) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(long, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongHistogramBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongHistogram build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongHistogramBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongHistogramBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongUpDownCounter (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(long) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(long, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void add(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongUpDownCounterBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongUpDownCounter build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void buildWithCallback(java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder ofDoubles() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongUpDownCounterBuilder setDescription(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongUpDownCounterBuilder setUnit(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.Meter (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongCounterBuilder counterBuilder(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.LongUpDownCounterBuilder upDownCounterBuilder(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.MeterBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.Meter build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.MeterBuilder setInstrumentationVersion(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.MeterBuilder setSchemaUrl(java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.MeterProvider (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.Meter get(java.lang.String) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.MeterBuilder meterBuilder(java.lang.String) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.api.metrics.MeterProvider noop() -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.ObservableDoubleMeasurement (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.ObservableMeasurement - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) void observe(double) - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) void observe(double, io.opentelemetry.api.common.Attributes) - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(double) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(double, io.opentelemetry.api.common.Attributes) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.ObservableLongMeasurement (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.api.metrics.ObservableMeasurement - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) void observe(long) - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) void observe(long, io.opentelemetry.api.common.Attributes) - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(long) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void record(long, io.opentelemetry.api.common.Attributes) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.metrics.ObservableMeasurement (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object -***! MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.OpenTelemetry (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++! NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.MeterProvider getMeterProvider() +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging-otlp.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging-otlp.txt index d15efa5bfa..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging-otlp.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging-otlp.txt @@ -1,8 +1,2 @@ Comparing source compatibility of against -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingLogExporter (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode flush() -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingMetricExporter (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.export.MetricExporter create(io.opentelemetry.sdk.metrics.data.AggregationTemporality) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.metrics.data.AggregationTemporality getPreferredTemporality() +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging.txt index 5448401167..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging.txt @@ -1,19 +1,2 @@ Comparing source compatibility of against -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.logging.LoggingMetricExporter (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - === UNCHANGED CONSTRUCTOR: PUBLIC LoggingMetricExporter() - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.logging.LoggingMetricExporter create() - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.logging.LoggingMetricExporter create(io.opentelemetry.sdk.metrics.data.AggregationTemporality) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.metrics.data.AggregationTemporality getPreferredTemporality() -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.logging.LoggingSpanExporter (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - === UNCHANGED CONSTRUCTOR: PUBLIC LoggingSpanExporter() - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.logging.LoggingSpanExporter create() -*** MODIFIED CLASS: PUBLIC io.opentelemetry.exporter.logging.SystemOutLogExporter (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - === UNCHANGED CONSTRUCTOR: PUBLIC SystemOutLogExporter() - +++ NEW ANNOTATION: java.lang.Deprecated - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.logging.SystemOutLogExporter create() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode flush() +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-http-trace.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-http-trace.txt index f58d4aeed5..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-http-trace.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-http-trace.txt @@ -1,4 +1,2 @@ Comparing source compatibility of against -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider) +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-trace.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-trace.txt index 620a65570a..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-trace.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp-trace.txt @@ -1,4 +1,2 @@ Comparing source compatibility of against -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider) +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt index 276b23ae36..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt @@ -1,4 +1,2 @@ Comparing source compatibility of against -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.export.BatchSpanProcessorBuilder (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.export.BatchSpanProcessorBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider) +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt index 793c176f3f..df26146497 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt @@ -1,8 +1,2 @@ Comparing source compatibility of against -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.OpenTelemetrySdk (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.metrics.MeterProvider getMeterProvider() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.metrics.SdkMeterProvider getSdkMeterProvider() -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.OpenTelemetrySdkBuilder (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.OpenTelemetrySdkBuilder setMeterProvider(io.opentelemetry.sdk.metrics.SdkMeterProvider) +No changes. \ No newline at end of file diff --git a/exporters/otlp/trace/build.gradle.kts b/exporters/otlp/trace/build.gradle.kts index 1dda341dda..d91dbc6eee 100644 --- a/exporters/otlp/trace/build.gradle.kts +++ b/exporters/otlp/trace/build.gradle.kts @@ -13,8 +13,6 @@ dependencies { api(project(":sdk:trace")) api(project(":exporters:otlp:common")) - implementation(project(":api:metrics")) - compileOnly("io.grpc:grpc-stub") testImplementation(project(":exporters:otlp:testing-internal")) diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/OpenTelemetrySdkAutoConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/OpenTelemetrySdkAutoConfiguration.java index 92e6c159c8..71961a3f86 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/OpenTelemetrySdkAutoConfiguration.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/OpenTelemetrySdkAutoConfiguration.java @@ -158,7 +158,7 @@ public final class OpenTelemetrySdkAutoConfiguration { MetricExporterConfiguration.configureExporter( exporterName, config, serviceClassLoader, meterProviderBuilder); - SdkMeterProvider meterProvider = meterProviderBuilder.buildAndRegisterGlobal(); + SdkMeterProvider meterProvider = meterProviderBuilder.build(); // Make sure metrics shut down when JVM shuts down. Runtime.getRuntime().addShutdownHook(new Thread(meterProvider::close)); diff --git a/sdk/metrics/build.gradle.kts b/sdk/metrics/build.gradle.kts index fce7afa3f0..96cf05880a 100644 --- a/sdk/metrics/build.gradle.kts +++ b/sdk/metrics/build.gradle.kts @@ -13,7 +13,7 @@ description = "OpenTelemetry SDK Metrics" otelJava.moduleName.set("io.opentelemetry.sdk.metrics") dependencies { - api(project(":api:metrics")) + api(project(":api:all")) api(project(":sdk:common")) compileOnly("org.codehaus.mojo:animal-sniffer-annotations") diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java index 4edd52c6bc..dc1e173a79 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java @@ -103,21 +103,6 @@ public final class SdkMeterProviderBuilder { return this; } - /** - * Returns a new {@link SdkMeterProvider} built with the configuration of this {@link - * SdkMeterProviderBuilder} and registers it as the global {@link - * io.opentelemetry.api.metrics.MeterProvider}. - * - * @deprecated Use {@code OpenTelemetrySdkBuilder.buildAndRegisterGlobal} and {@link - * io.opentelemetry.api.GlobalOpenTelemetry}. - */ - @Deprecated - public SdkMeterProvider buildAndRegisterGlobal() { - SdkMeterProvider meterProvider = build(); - io.opentelemetry.api.metrics.GlobalMeterProvider.set(meterProvider); - return meterProvider; - } - /** * Registers a {@link MetricReader} for this SDK. * @@ -145,11 +130,7 @@ public final class SdkMeterProviderBuilder { /** * Returns a new {@link SdkMeterProvider} built with the configuration of this {@link - * SdkMeterProviderBuilder}. This provider is not registered as the global {@link - * io.opentelemetry.api.metrics.MeterProvider}. It is recommended that you register one provider - * using {@link SdkMeterProviderBuilder#buildAndRegisterGlobal()} for use by instrumentation when - * that requires access to a global instance of {@link - * io.opentelemetry.api.metrics.MeterProvider}. + * SdkMeterProviderBuilder}. */ public SdkMeterProvider build() { return new SdkMeterProvider( diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilderTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilderTest.java index 0040990328..805b4ce5bc 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilderTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilderTest.java @@ -13,17 +13,6 @@ import org.junit.jupiter.api.Test; class SdkMeterProviderBuilderTest { - @Test - @SuppressWarnings("deprecation") // Testing deprecated methods - void buildAndRegisterGlobal() { - SdkMeterProvider meterProvider = SdkMeterProvider.builder().buildAndRegisterGlobal(); - try { - assertThat(io.opentelemetry.api.metrics.GlobalMeterProvider.get()).isSameAs(meterProvider); - } finally { - io.opentelemetry.api.metrics.GlobalMeterProvider.set(null); - } - } - @Test void defaultResource() { // We need a reader to have a resource. diff --git a/settings.gradle.kts b/settings.gradle.kts index 9797271906..aeeedefe8d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,7 +25,6 @@ dependencyResolutionManagement { rootProject.name = "opentelemetry-java" include(":all") include(":api:all") -include(":api:metrics") include(":semconv") include(":bom") include(":bom-alpha")