open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to OTel 1.10 (#5035) 

* Update to OTel 1.10

* Fix metric smoke test

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
Anuraag Agrawal 2022-01-08 08:45:20 +09:00 committed by GitHub
parent daeda5dcfc
commit c75c01f871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 162 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bom-alpha/build.gradle.kts
View File

@ -13,11 +13,10 @@ javaPlatform {
}
val otelVersion: String by project
val otelAlphaVersion: String by project
dependencies {
api(platform("io.opentelemetry:opentelemetry-bom:${otelVersion}"))
api(platform("io.opentelemetry:opentelemetry-bom-alpha:${otelAlphaVersion}"))
api(platform("io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha"))
}
dependencies {

8
dependencyManagement/build.gradle.kts
View File

@ -11,10 +11,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions
val otelVersion = "1.10.0-rc.1"
val otelAlphaVersion = "1.10.0-alpha-rc.1"
val otelVersion = "1.10.0"
rootProject.extra["otelVersion"] = otelVersion
rootProject.extra["otelAlphaVersion"] = otelAlphaVersion
// Need both BOM and -all
val groovyVersion = "3.0.9"
@ -38,7 +36,7 @@ val DEPENDENCY_BOMS = listOf(
"com.google.guava:guava-bom:31.0.1-jre",
"org.codehaus.groovy:groovy-bom:${groovyVersion}",
"io.opentelemetry:opentelemetry-bom:${otelVersion}",
"io.opentelemetry:opentelemetry-bom-alpha:${otelAlphaVersion}",
"io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha",
"org.junit:junit-bom:5.8.2"
)
@ -104,7 +102,7 @@ val DEPENDENCIES = listOf(
"commons-validator:commons-validator:1.7",
"io.netty:netty:3.10.6.Final",
"io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha",
"org.assertj:assertj-core:3.21.0",
"org.assertj:assertj-core:3.22.0",
"org.awaitility:awaitility:4.1.0",
"com.google.code.findbugs:jsr305:3.0.2",
"org.codehaus.groovy:groovy-all:${groovyVersion}",

1
instrumentation-api-annotation-support/build.gradle.kts
View File

@ -13,7 +13,6 @@ dependencies {
api("io.opentelemetry:opentelemetry-api")
api("io.opentelemetry:opentelemetry-semconv")
implementation("io.opentelemetry:opentelemetry-api-metrics")
implementation("org.slf4j:slf4j-api")
compileOnly("com.google.auto.value:auto-value-annotations")

1
instrumentation-api/build.gradle.kts
View File

@ -27,7 +27,6 @@ dependencies {
api("io.opentelemetry:opentelemetry-api")
api("io.opentelemetry:opentelemetry-semconv")
implementation("io.opentelemetry:opentelemetry-api-metrics")
implementation("org.slf4j:slf4j-api")
compileOnly("com.google.auto.value:auto-value-annotations")

3
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetrics.java
View File

@ -24,9 +24,6 @@ import org.slf4j.LoggerFactory;
* {@link RequestListener} which keeps track of <a
* href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#http-client">HTTP
* client metrics</a>.
*
* <p>To use this class, you may need to add the {@code opentelemetry-api-metrics} artifact to your
* dependencies.
*/
@UnstableApi
public final class HttpClientMetrics implements RequestListener {

3
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetrics.java
View File

@ -26,9 +26,6 @@ import org.slf4j.LoggerFactory;
* {@link RequestListener} which keeps track of <a
* href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#http-server">HTTP
* server metrics</a>.
*
* <p>To use this class, you may need to add the {@code opentelemetry-api-metrics} artifact to your
* dependencies.
*/
@UnstableApi
public final class HttpServerMetrics implements RequestListener {

3
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcClientMetrics.java
View File

@ -24,9 +24,6 @@ import org.slf4j.LoggerFactory;
* {@link RequestListener} which keeps track of <a
* href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/rpc.md#rpc-client">RPC
* client metrics</a>.
*
* <p>To use this class, you may need to add the {@code opentelemetry-api-metrics} artifact to your
* dependencies.
*/
@UnstableApi
public final class RpcClientMetrics implements RequestListener {

3
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcServerMetrics.java
View File

@ -24,9 +24,6 @@ import org.slf4j.LoggerFactory;
* {@link RequestListener} which keeps track of <a
* href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/rpc.md#rpc-server">RPC
* server metrics</a>.
*
* <p>To use this class, you may need to add the {@code opentelemetry-api-metrics} artifact to your
* dependencies.
*/
@UnstableApi
public final class RpcServerMetrics implements RequestListener {

2
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsTest.java
View File

@ -5,8 +5,8 @@
package io.opentelemetry.instrumentation.api.instrumenter.http;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import static org.awaitility.Awaitility.await;
import io.opentelemetry.api.common.Attributes;

2
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsTest.java
View File

@ -5,8 +5,8 @@
package io.opentelemetry.instrumentation.api.instrumenter.http;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import static org.awaitility.Awaitility.await;
import io.opentelemetry.api.common.Attributes;

2
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcClientMetricsTest.java
View File

@ -19,7 +19,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.RequestListener;
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader;
import io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions;
import io.opentelemetry.sdk.testing.assertj.MetricAssertions;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.util.Collection;
import java.util.concurrent.TimeUnit;

2
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcServerMetricsTest.java
View File

@ -19,7 +19,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.RequestListener;
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader;
import io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions;
import io.opentelemetry.sdk.testing.assertj.MetricAssertions;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.util.Collection;
import java.util.concurrent.TimeUnit;

6
instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestStreamWrapper.java
View File

@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -24,7 +24,9 @@ public class TracingRequestStreamWrapper extends TracingRequestStreamHandler {
private final WrappedLambda wrappedLambda;
public TracingRequestStreamWrapper() {
this(OpenTelemetrySdkAutoConfiguration.initialize(), WrappedLambda.fromConfiguration());
this(
AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(),
WrappedLambda.fromConfiguration());
}
// Visible for testing

4
instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestWrapperBase.java
View File

@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
import com.amazonaws.services.lambda.runtime.Context;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.function.BiFunction;
@ -26,7 +26,7 @@ abstract class TracingRequestWrapperBase<I, O> extends TracingRequestHandler<I,
protected TracingRequestWrapperBase(BiFunction<I, Class, Object> parameterMapper) {
this(
OpenTelemetrySdkAutoConfiguration.initialize(),
AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(),
WrappedLambda.fromConfiguration(),
parameterMapper);
}

6
instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/TracingSqsEventWrapper.java
View File

@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -18,7 +18,9 @@ public class TracingSqsEventWrapper extends TracingSqsEventHandler {
private final Method targetMethod;
public TracingSqsEventWrapper() {
this(OpenTelemetrySdkAutoConfiguration.initialize(), WrappedLambda.fromConfiguration());
this(
AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(),
WrappedLambda.fromConfiguration());
}
// Visible for testing

2
instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/CounterTest.java
View File

@ -5,8 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Metrics;

2
instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/GaugeTest.java
View File

@ -5,8 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Metrics;

2
instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/TimerTest.java
View File

@ -5,8 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Timer;

13
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java
View File

@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metric
import application.io.opentelemetry.api.metrics.DoubleCounter;
import application.io.opentelemetry.api.metrics.DoubleCounterBuilder;
import application.io.opentelemetry.api.metrics.ObservableDoubleCounter;
import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
import java.util.function.Consumer;
@ -36,10 +37,12 @@ final class ApplicationDoubleCounterBuilder implements DoubleCounterBuilder {
}
@Override
public void buildWithCallback(Consumer<ObservableDoubleMeasurement> applicationCallback) {
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableDoubleMeasurement(agentMeasurement)));
public ObservableDoubleCounter buildWithCallback(
Consumer<ObservableDoubleMeasurement> applicationCallback) {
return new ApplicationObservableDoubleCounter(
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableDoubleMeasurement(agentMeasurement))));
}
}

13
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java
View File

@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metric
import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
import application.io.opentelemetry.api.metrics.LongGaugeBuilder;
import application.io.opentelemetry.api.metrics.ObservableDoubleGauge;
import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
import java.util.function.Consumer;
@ -36,10 +37,12 @@ final class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder {
}
@Override
public void buildWithCallback(Consumer<ObservableDoubleMeasurement> applicationCallback) {
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableDoubleMeasurement(agentMeasurement)));
public ObservableDoubleGauge buildWithCallback(
Consumer<ObservableDoubleMeasurement> applicationCallback) {
return new ApplicationObservableDoubleGauge(
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableDoubleMeasurement(agentMeasurement))));
}
}

13
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java
View File

@ -8,6 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metric
import application.io.opentelemetry.api.metrics.DoubleUpDownCounter;
import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;
import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
import application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter;
import java.util.function.Consumer;
final class ApplicationDoubleUpDownCounterBuilder implements DoubleUpDownCounterBuilder {
@ -37,10 +38,12 @@ final class ApplicationDoubleUpDownCounterBuilder implements DoubleUpDownCounter
}
@Override
public void buildWithCallback(Consumer<ObservableDoubleMeasurement> applicationCallback) {
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableDoubleMeasurement(agentMeasurement)));
public ObservableDoubleUpDownCounter buildWithCallback(
Consumer<ObservableDoubleMeasurement> applicationCallback) {
return new ApplicationObservableDoubleUpDownCounter(
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableDoubleMeasurement(agentMeasurement))));
}
}

12
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java
View File

@ -8,6 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metric
import application.io.opentelemetry.api.metrics.DoubleCounterBuilder;
import application.io.opentelemetry.api.metrics.LongCounter;
import application.io.opentelemetry.api.metrics.LongCounterBuilder;
import application.io.opentelemetry.api.metrics.ObservableLongCounter;
import application.io.opentelemetry.api.metrics.ObservableLongMeasurement;
import java.util.function.Consumer;
@ -42,9 +43,12 @@ final class ApplicationLongCounterBuilder implements LongCounterBuilder {
}
@Override
public void buildWithCallback(Consumer<ObservableLongMeasurement> applicationCallback) {
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement)));
public ObservableLongCounter buildWithCallback(
Consumer<ObservableLongMeasurement> applicationCallback) {
return new ApplicationObservableLongCounter(
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableLongMeasurement(agentMeasurement))));
}
}

12
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java
View File

@ -6,6 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.LongGaugeBuilder;
import application.io.opentelemetry.api.metrics.ObservableLongGauge;
import application.io.opentelemetry.api.metrics.ObservableLongMeasurement;
import java.util.function.Consumer;
@ -30,9 +31,12 @@ final class ApplicationLongGaugeBuilder implements LongGaugeBuilder {
}
@Override
public void buildWithCallback(Consumer<ObservableLongMeasurement> applicationCallback) {
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement)));
public ObservableLongGauge buildWithCallback(
Consumer<ObservableLongMeasurement> applicationCallback) {
return new ApplicationObservableLongGauge(
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableLongMeasurement(agentMeasurement))));
}
}

12
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java
View File

@ -9,6 +9,7 @@ import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;
import application.io.opentelemetry.api.metrics.LongUpDownCounter;
import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
import application.io.opentelemetry.api.metrics.ObservableLongMeasurement;
import application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter;
import java.util.function.Consumer;
final class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBuilder {
@ -43,9 +44,12 @@ final class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBuil
}
@Override
public void buildWithCallback(Consumer<ObservableLongMeasurement> applicationCallback) {
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement)));
public ObservableLongUpDownCounter buildWithCallback(
Consumer<ObservableLongMeasurement> applicationCallback) {
return new ApplicationObservableLongUpDownCounter(
agentBuilder.buildWithCallback(
agentMeasurement ->
applicationCallback.accept(
new ApplicationObservableLongMeasurement(agentMeasurement))));
}
}

14
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.ObservableDoubleCounter;
public final class ApplicationObservableDoubleCounter implements ObservableDoubleCounter {
public ApplicationObservableDoubleCounter(
io.opentelemetry.api.metrics.ObservableDoubleCounter agentCounter) {}
}

14
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.ObservableDoubleGauge;
public final class ApplicationObservableDoubleGauge implements ObservableDoubleGauge {
public ApplicationObservableDoubleGauge(
io.opentelemetry.api.metrics.ObservableDoubleGauge agentGauge) {}
}

15
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java Normal file
View File

@ -0,0 +1,15 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter;
public final class ApplicationObservableDoubleUpDownCounter
implements ObservableDoubleUpDownCounter {
public ApplicationObservableDoubleUpDownCounter(
io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter agentUpDownCounter) {}
}

14
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.ObservableLongCounter;
public final class ApplicationObservableLongCounter implements ObservableLongCounter {
public ApplicationObservableLongCounter(
io.opentelemetry.api.metrics.ObservableLongCounter agentCounter) {}
}

14
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.ObservableLongGauge;
public final class ApplicationObservableLongGauge implements ObservableLongGauge {
public ApplicationObservableLongGauge(
io.opentelemetry.api.metrics.ObservableLongGauge agentGauge) {}
}

14
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter;
public final class ApplicationObservableLongUpDownCounter implements ObservableLongUpDownCounter {
public ApplicationObservableLongUpDownCounter(
io.opentelemetry.api.metrics.ObservableLongUpDownCounter agentUpDownCounter) {}
}

6
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/MeterTest.java
View File

@ -5,8 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
@ -237,7 +237,7 @@ class MeterTest {
.setDescription("d")
.setUnit("u")
.buildWithCallback(
result -> result.observe(123, Attributes.of(AttributeKey.stringKey("q"), "r")));
result -> result.record(123, Attributes.of(AttributeKey.stringKey("q"), "r")));
testing.waitAndAssertMetrics(
instrumentationName,
@ -267,7 +267,7 @@ class MeterTest {
.setDescription("d")
.setUnit("u")
.buildWithCallback(
result -> result.observe(1.23, Attributes.of(AttributeKey.stringKey("q"), "r")));
result -> result.record(1.23, Attributes.of(AttributeKey.stringKey("q"), "r")));
testing.waitAndAssertMetrics(
instrumentationName,

2
instrumentation/oshi/library/build.gradle.kts
View File

@ -3,8 +3,6 @@ plugins {
}
dependencies {
implementation("io.opentelemetry:opentelemetry-api-metrics")
library("com.github.oshi:oshi-core:5.3.1")
testImplementation("io.opentelemetry:opentelemetry-sdk-metrics")

4
instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/AbstractMetricsTest.java
View File

@ -13,8 +13,8 @@ import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader;
import io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions;
import io.opentelemetry.sdk.testing.assertj.metrics.MetricDataAssert;
import io.opentelemetry.sdk.testing.assertj.MetricAssertions;
import io.opentelemetry.sdk.testing.assertj.MetricDataAssert;
import java.util.Collection;
import java.util.function.Consumer;
import org.junit.jupiter.api.AfterAll;

2
instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/ProcessMetricsTest.java
View File

@ -5,7 +5,7 @@
package io.opentelemetry.instrumentation.oshi;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import org.junit.jupiter.api.Test;

2
instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/SystemMetricsTest.java
View File

@ -5,7 +5,7 @@
package io.opentelemetry.instrumentation.oshi;
import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
import org.junit.jupiter.api.Test;

2
instrumentation/runtime-metrics/library/build.gradle.kts
View File

@ -3,8 +3,6 @@ plugins {
}
dependencies {
implementation("io.opentelemetry:opentelemetry-api-metrics")
testImplementation("io.opentelemetry:opentelemetry-sdk-metrics")
testImplementation(project(":testing-common"))
testImplementation("org.mockito:mockito-core")

1
javaagent-tooling/build.gradle.kts
View File

@ -20,7 +20,6 @@ dependencies {
implementation(project(":muzzle"))
implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry:opentelemetry-api-metrics")
implementation("io.opentelemetry:opentelemetry-sdk")
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
implementation("io.opentelemetry:opentelemetry-sdk-metrics")

1
javaagent/build.gradle.kts
View File

@ -46,7 +46,6 @@ listOf(baseJavaagentLibs, javaagentLibs, exporterLibs, exporterSlimLibs).forEach
it.run {
exclude("org.slf4j")
exclude("io.opentelemetry", "opentelemetry-api")
exclude("io.opentelemetry", "opentelemetry-api-metrics")
exclude("io.opentelemetry", "opentelemetry-semconv")
}
}

4
licenses/licenses.md generated
View File

@ -68,10 +68,6 @@ _2021-11-23 20:07:26 PST_
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-metrics` **Version:** `1.9.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.9.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)

1
opentelemetry-api-shaded-for-instrumenting/build.gradle.kts
View File

@ -9,7 +9,6 @@ group = "io.opentelemetry.javaagent"
dependencies {
implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry:opentelemetry-api-metrics")
}
// OpenTelemetry API shaded so that it can be used in instrumentation of OpenTelemetry API itself,

2
smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java
View File

@ -26,7 +26,7 @@ public abstract class AbstractTestContainerManager implements TestContainerManag
environment.put(jvmArgsEnvVarName, "-Xmx1g -javaagent:/" + TARGET_AGENT_FILENAME);
environment.put("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "1");
environment.put("OTEL_BSP_SCHEDULE_DELAY", "10ms");
environment.put("OTEL_IMR_EXPORT_INTERVAL", "1000");
environment.put("OTEL_METRIC_EXPORT_INTERVAL", "1000");
environment.put("OTEL_EXPORTER_OTLP_ENDPOINT", "http://" + BACKEND_ALIAS + ":8080");
environment.put("OTEL_RESOURCE_ATTRIBUTES", "service.name=smoke-test");
environment.put("OTEL_JAVAAGENT_DEBUG", "true");