Skip to content

Commit ef0b8b1

Browse files
committed
simplify
1 parent afbad74 commit ef0b8b1

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
package io.opentelemetry.instrumentation.viburdbcp;
77

88
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
9-
import static org.awaitility.Awaitility.await;
109
import static org.mockito.Mockito.when;
1110

1211
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1312
import io.opentelemetry.instrumentation.testing.junit.db.DbConnectionPoolMetricsAssertions;
1413
import java.sql.Connection;
1514
import java.sql.SQLException;
16-
import java.time.Duration;
1715
import javax.sql.DataSource;
1816
import org.assertj.core.api.AbstractIterableAssert;
1917
import org.junit.jupiter.api.Test;
@@ -25,7 +23,6 @@
2523
@ExtendWith(MockitoExtension.class)
2624
public abstract class AbstractViburInstrumentationTest {
2725
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.vibur-dbcp-11.0";
28-
private static final Duration EXPORTER_INTERVAL = Duration.ofMillis(100);
2926

3027
@Mock private DataSource dataSourceMock;
3128
@Mock private Connection connectionMock;
@@ -49,8 +46,6 @@ void shouldReportMetrics() throws SQLException {
4946

5047
// when
5148
Connection viburConnection = viburDataSource.getConnection();
52-
await().pollDelay(EXPORTER_INTERVAL).until(() -> true);
53-
viburConnection.close();
5449

5550
// then
5651
DbConnectionPoolMetricsAssertions.create(testing(), INSTRUMENTATION_NAME, "testPool")
@@ -64,15 +59,14 @@ void shouldReportMetrics() throws SQLException {
6459
.assertConnectionPoolEmitsMetrics();
6560

6661
// when
62+
viburConnection.close();
63+
6764
// this one too shouldn't cause any problems when called more than once
6865
viburDataSource.close();
6966
viburDataSource.close();
7067
shutdown(viburDataSource);
7168

72-
// sleep exporter interval
73-
await().pollDelay(EXPORTER_INTERVAL).until(() -> true);
7469
testing().clearData();
75-
await().pollDelay(EXPORTER_INTERVAL).until(() -> true);
7670

7771
// then
7872
String countMetricName =

0 commit comments

Comments
 (0)