Skip to content

Commit 6b1e926

Browse files
committed
Fix
1 parent 7d9a418 commit 6b1e926

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

agent/instrumentation/micrometer-1.0/src/test/java/MicrometerTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static java.util.concurrent.TimeUnit.MILLISECONDS;
55
import static org.assertj.core.api.Assertions.assertThat;
66
import static org.awaitility.Awaitility.waitAtMost;
7+
import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
78

89
import com.microsoft.applicationinsights.agent.bootstrap.MicrometerUtil;
910
import io.micrometer.core.instrument.Clock;
@@ -23,14 +24,19 @@
2324
import java.util.concurrent.ExecutorService;
2425
import java.util.concurrent.Executors;
2526
import java.util.stream.Collectors;
27+
import org.junit.jupiter.api.BeforeEach;
2628
import org.junit.jupiter.api.Disabled;
2729
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.parallel.Execution;
2831

32+
@Execution(SAME_THREAD)
2933
class MicrometerTest {
3034

31-
private static final AgentTestingMicrometerDelegate delegate = new AgentTestingMicrometerDelegate();
35+
private AgentTestingMicrometerDelegate delegate;
3236

33-
static {
37+
@BeforeEach
38+
void beforeEach() {
39+
delegate = new AgentTestingMicrometerDelegate();
3440
MicrometerUtil.setDelegate(delegate);
3541
}
3642

@@ -252,7 +258,7 @@ void shouldCaptureFunctionTimer() {
252258
assertThat(measurement.namespace).isNull();
253259
}
254260

255-
private static AgentTestingMicrometerDelegate.Measurement getLastMeasurement(String name) {
261+
private AgentTestingMicrometerDelegate.Measurement getLastMeasurement(String name) {
256262
List<AgentTestingMicrometerDelegate.Measurement> measurements =
257263
delegate.getMeasurements().stream()
258264
.filter(measurement -> measurement.name.equals(name) && measurement.value != 0)

0 commit comments

Comments
 (0)