diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ResourceComponentProviderTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ResourceComponentProviderTest.java index 51e21854b3..0a71c09d69 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ResourceComponentProviderTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ResourceComponentProviderTest.java @@ -5,28 +5,21 @@ package io.opentelemetry.contrib.aws.resource; -import static org.assertj.core.api.Assertions.assertThat; +import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; -import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; -import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; +import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; -import org.assertj.core.api.InstanceOfAssertFactory; import org.junit.jupiter.api.Test; class ResourceComponentProviderTest { @Test void endToEnd() { - assertThat( - AutoConfiguredOpenTelemetrySdk.builder() - .build() - .getOpenTelemetrySdk() - .getSdkTracerProvider()) - .extracting("sharedState") - .extracting("resource") - .extracting( - "attributes", - new InstanceOfAssertFactory<>(Attributes.class, OpenTelemetryAssertions::assertThat)) + ExtendedOpenTelemetrySdk sdk = + (ExtendedOpenTelemetrySdk) + AutoConfiguredOpenTelemetrySdk.builder().build().getOpenTelemetrySdk(); + + assertThat(sdk.getSdkResourceProvider().getResource().getAttributes()) .containsEntry( CloudIncubatingAttributes.CLOUD_PROVIDER, CloudIncubatingAttributes.CloudProviderIncubatingValues.AWS); diff --git a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ResourceComponentProviderTest.java b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ResourceComponentProviderTest.java index 0f67f39190..b03ec641da 100644 --- a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ResourceComponentProviderTest.java +++ b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ResourceComponentProviderTest.java @@ -5,29 +5,22 @@ package io.opentelemetry.contrib.azure.resource; -import static org.assertj.core.api.Assertions.assertThat; +import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; -import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; -import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; +import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; -import org.assertj.core.api.InstanceOfAssertFactory; import org.junit.jupiter.api.Test; class ResourceComponentProviderTest { @Test void endToEnd() { - assertThat( - AutoConfiguredOpenTelemetrySdk.builder() - .build() - .getOpenTelemetrySdk() - .getSdkTracerProvider()) - .extracting("sharedState") - .extracting("resource") - .extracting( - "attributes", - new InstanceOfAssertFactory<>(Attributes.class, OpenTelemetryAssertions::assertThat)) + ExtendedOpenTelemetrySdk sdk = + (ExtendedOpenTelemetrySdk) + AutoConfiguredOpenTelemetrySdk.builder().build().getOpenTelemetrySdk(); + + assertThat(sdk.getSdkResourceProvider().getResource().getAttributes()) .containsEntry( CloudIncubatingAttributes.CLOUD_PROVIDER, CloudIncubatingAttributes.CloudProviderIncubatingValues.AZURE); diff --git a/cloudfoundry-resources/src/test/java/io/opentelemetry/contrib/cloudfoundry/resources/ResourceComponentProviderTest.java b/cloudfoundry-resources/src/test/java/io/opentelemetry/contrib/cloudfoundry/resources/ResourceComponentProviderTest.java index b4b6591568..62a7db04d7 100644 --- a/cloudfoundry-resources/src/test/java/io/opentelemetry/contrib/cloudfoundry/resources/ResourceComponentProviderTest.java +++ b/cloudfoundry-resources/src/test/java/io/opentelemetry/contrib/cloudfoundry/resources/ResourceComponentProviderTest.java @@ -5,27 +5,20 @@ package io.opentelemetry.contrib.cloudfoundry.resources; -import static org.assertj.core.api.Assertions.assertThat; +import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; -import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; -import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; -import org.assertj.core.api.InstanceOfAssertFactory; +import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import org.junit.jupiter.api.Test; class ResourceComponentProviderTest { @Test void endToEnd() { - assertThat( - AutoConfiguredOpenTelemetrySdk.builder() - .build() - .getOpenTelemetrySdk() - .getSdkTracerProvider()) - .extracting("sharedState") - .extracting("resource") - .extracting( - "attributes", - new InstanceOfAssertFactory<>(Attributes.class, OpenTelemetryAssertions::assertThat)) + ExtendedOpenTelemetrySdk sdk = + (ExtendedOpenTelemetrySdk) + AutoConfiguredOpenTelemetrySdk.builder().build().getOpenTelemetrySdk(); + + assertThat(sdk.getSdkResourceProvider().getResource().getAttributes()) .containsEntry("cloudfoundry.app.name", "cf-app-name"); } } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 99701b060e..1f58295e5d 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-platform` } -val otelInstrumentationVersion = "2.33.1-alpha" +val otelInstrumentationVersion = "2.34.0-alpha" val semconvVersion = "1.45.0" javaPlatform { diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java index ae7ad7ab93..2a093b9774 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java @@ -43,6 +43,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -279,7 +280,7 @@ private void createLog() { private void createMetric() { meter.counterBuilder("counter").build().add(1); - meterProvider.forceFlush(); + meterProvider.forceFlush().join(10, TimeUnit.SECONDS); verify(metricCallback).onExportSuccess(anyCollection()); verifyNoMoreInteractions(metricCallback); clearInvocations(metricCallback); diff --git a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/registry/SdkResourceAccessTest.java b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/registry/SdkResourceAccessTest.java index 9e7eeab458..19f26e0bb0 100644 --- a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/registry/SdkResourceAccessTest.java +++ b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/registry/SdkResourceAccessTest.java @@ -22,7 +22,7 @@ void readsTracerProviderResource() { OpenTelemetrySdk.builder() .setTracerProvider(SdkTracerProvider.builder().setResource(resource).build()) .build()) { - assertThat(SdkResourceAccess.getResource(sdk)).isSameAs(resource); + assertThat(SdkResourceAccess.getResource(sdk)).isEqualTo(resource); } } diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/resources/ResourceComponentProviderTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/resources/ResourceComponentProviderTest.java index 940d8dd83f..fee5be87fb 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/resources/ResourceComponentProviderTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/resources/ResourceComponentProviderTest.java @@ -5,14 +5,12 @@ package io.opentelemetry.maven.resources; -import static org.assertj.core.api.Assertions.assertThat; +import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; -import io.opentelemetry.api.common.Attributes; import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; -import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; -import org.assertj.core.api.InstanceOfAssertFactory; +import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import org.junit.jupiter.api.Test; class ResourceComponentProviderTest { @@ -28,16 +26,11 @@ void providerIsLoaded() { @Test void endToEnd() { - assertThat( - AutoConfiguredOpenTelemetrySdk.builder() - .build() - .getOpenTelemetrySdk() - .getSdkTracerProvider()) - .extracting("sharedState") - .extracting("resource") - .extracting( - "attributes", - new InstanceOfAssertFactory<>(Attributes.class, OpenTelemetryAssertions::assertThat)) + ExtendedOpenTelemetrySdk sdk = + (ExtendedOpenTelemetrySdk) + AutoConfiguredOpenTelemetrySdk.builder().build().getOpenTelemetrySdk(); + + assertThat(sdk.getSdkResourceProvider().getResource().getAttributes()) .containsEntry("telemetry.distro.name", "opentelemetry-maven-extension"); } } diff --git a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java index 8c9fca58bc..5c1146156e 100644 --- a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java +++ b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricExporter; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -50,7 +51,7 @@ void verifyMetricModification() { }); meter.counterBuilder("OneCounter").build().add(1); - meterProvider.forceFlush(); + meterProvider.forceFlush().join(10, TimeUnit.SECONDS); List finishedMetricItems = memoryMetricExporter.getFinishedMetricItems(); assertThat(finishedMetricItems.size()).isEqualTo(1); @@ -69,7 +70,7 @@ void verifyMetricFiltering() { meter.counterBuilder("OneCounter").build().add(1); meter.counterBuilder("DeletedCounter").build().add(1); meter.counterBuilder("AnotherCounter").build().add(1); - meterProvider.forceFlush(); + meterProvider.forceFlush().join(10, TimeUnit.SECONDS); List finishedMetricItems = memoryMetricExporter.getFinishedMetricItems(); assertThat(finishedMetricItems.size()).isEqualTo(2);