Skip to content

Commit ba515bf

Browse files
jmx metrics: Add test timeouts and mbean server status assertions (#218)
1 parent 818a1e2 commit ba515bf

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
1010
import static java.lang.management.ManagementFactory.getPlatformMBeanServer;
11+
import static java.util.concurrent.TimeUnit.SECONDS;
1112

1213
import groovy.lang.Closure;
1314
import groovy.util.Eval;
@@ -38,10 +39,12 @@
3839
import org.junit.jupiter.api.DisplayName;
3940
import org.junit.jupiter.api.Nested;
4041
import org.junit.jupiter.api.Test;
42+
import org.junit.jupiter.api.Timeout;
4143
import org.junit.jupiter.params.ParameterizedTest;
4244
import org.junit.jupiter.params.provider.CsvSource;
4345
import org.junit.jupiter.params.provider.ValueSource;
4446

47+
@Timeout(value = 10, unit = SECONDS)
4548
class InstrumenterHelperTest {
4649

4750
private static final MBeanServer mbeanServer = getPlatformMBeanServer();
@@ -78,6 +81,11 @@ static void tearDown() throws Exception {
7881
jmxServer.stop();
7982
}
8083

84+
@BeforeEach
85+
void confirmServerIsActive() {
86+
assertThat(jmxServer.isActive()).isTrue();
87+
}
88+
8189
@BeforeEach
8290
void setupOtel() {
8391
metricReader = InMemoryMetricReader.create();

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.contrib.jmxmetrics;
77

88
import static java.lang.management.ManagementFactory.getPlatformMBeanServer;
9+
import static java.util.concurrent.TimeUnit.SECONDS;
910
import static org.assertj.core.api.Assertions.assertThat;
1011

1112
import java.util.Arrays;
@@ -24,8 +25,11 @@
2425
import org.junit.jupiter.api.AfterAll;
2526
import org.junit.jupiter.api.AfterEach;
2627
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.BeforeEach;
2729
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.Timeout;
2831

32+
@Timeout(value = 10, unit = SECONDS)
2933
class MBeanHelperTest {
3034

3135
private static final MBeanServer mbeanServer = getPlatformMBeanServer();
@@ -56,6 +60,11 @@ static void tearDown() throws Exception {
5660
jmxServer.stop();
5761
}
5862

63+
@BeforeEach
64+
void confirmServerIsActive() {
65+
assertThat(jmxServer.isActive()).isTrue();
66+
}
67+
5968
@AfterEach
6069
void unregisterBeans() throws Exception {
6170
for (ObjectInstance bean : registeredBeans) {

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/OtelHelperJmxTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.contrib.jmxmetrics;
77

88
import static java.lang.management.ManagementFactory.getPlatformMBeanServer;
9+
import static java.util.concurrent.TimeUnit.SECONDS;
910
import static org.assertj.core.api.Assertions.assertThat;
1011
import static org.assertj.core.api.Assertions.assertThatCode;
1112
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -28,7 +29,9 @@
2829
import org.junit.jupiter.api.AfterEach;
2930
import org.junit.jupiter.api.BeforeAll;
3031
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.api.Timeout;
3133

34+
@Timeout(value = 10, unit = SECONDS)
3235
class OtelHelperJmxTest {
3336

3437
private static final String thingName =
@@ -48,10 +51,15 @@ static void setUp() throws Exception {
4851

4952
@AfterAll
5053
static void tearDown() throws Exception {
51-
jmxServer.stop();
5254
mbeanServer.unregisterMBean(new ObjectName(thingName));
5355
}
5456

57+
@AfterEach
58+
void stopServer() throws Exception {
59+
// each test stands up its own server
60+
jmxServer.stop();
61+
}
62+
5563
@AfterEach
5664
void unregisterBeans() throws Exception {
5765
for (ObjectInstance bean : registeredBeans) {

0 commit comments

Comments
 (0)