Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -50,7 +51,7 @@ void verifyMetricModification() {
});

meter.counterBuilder("OneCounter").build().add(1);
meterProvider.forceFlush();
meterProvider.forceFlush().join(10, TimeUnit.SECONDS);

List<MetricData> finishedMetricItems = memoryMetricExporter.getFinishedMetricItems();
assertThat(finishedMetricItems.size()).isEqualTo(1);
Expand All @@ -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<MetricData> finishedMetricItems = memoryMetricExporter.getFinishedMetricItems();
assertThat(finishedMetricItems.size()).isEqualTo(2);
Expand Down
Loading