Skip to content

Commit 49a8703

Browse files
test: isolate logging exporter flush handlers
1 parent db11577 commit 49a8703

3 files changed

Lines changed: 30 additions & 28 deletions

File tree

exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,21 @@ void export() {
8989
@Test
9090
void flush() {
9191
AtomicBoolean flushed = new AtomicBoolean(false);
92-
Logger.getLogger(LoggingMetricExporter.class.getName())
93-
.addHandler(
94-
new StreamHandler(new PrintStream(new ByteArrayOutputStream()), new SimpleFormatter()) {
95-
@Override
96-
public synchronized void flush() {
97-
flushed.set(true);
98-
}
99-
});
100-
exporter.flush();
101-
assertThat(flushed.get()).isTrue();
92+
Logger logger = Logger.getLogger(LoggingMetricExporter.class.getName());
93+
StreamHandler handler =
94+
new StreamHandler(new PrintStream(new ByteArrayOutputStream()), new SimpleFormatter()) {
95+
@Override
96+
public synchronized void flush() {
97+
flushed.set(true);
98+
}
99+
};
100+
logger.addHandler(handler);
101+
try {
102+
exporter.flush();
103+
assertThat(flushed.get()).isTrue();
104+
} finally {
105+
logger.removeHandler(handler);
106+
}
102107
}
103108

104109
@Test

exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingSpanExporterTest.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,21 @@ void export() {
127127
@Test
128128
void flush() {
129129
AtomicBoolean flushed = new AtomicBoolean(false);
130-
Logger.getLogger(LoggingSpanExporter.class.getName())
131-
.addHandler(
132-
new StreamHandler(new PrintStream(new ByteArrayOutputStream()), new SimpleFormatter()) {
133-
@Override
134-
public synchronized void flush() {
135-
flushed.set(true);
136-
}
137-
});
138-
exporter.flush();
139-
assertThat(flushed.get()).isTrue();
130+
Logger logger = Logger.getLogger(LoggingSpanExporter.class.getName());
131+
StreamHandler handler =
132+
new StreamHandler(new PrintStream(new ByteArrayOutputStream()), new SimpleFormatter()) {
133+
@Override
134+
public synchronized void flush() {
135+
flushed.set(true);
136+
}
137+
};
138+
logger.addHandler(handler);
139+
try {
140+
exporter.flush();
141+
assertThat(flushed.get()).isTrue();
142+
} finally {
143+
logger.removeHandler(handler);
144+
}
140145
}
141146

142147
@Test

integration-tests/graal-incubating/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import org.gradle.api.JavaVersion
2-
import org.gradle.api.tasks.testing.Test
3-
42
plugins {
53
id("otel.java-conventions")
64
id("org.graalvm.buildtools.native")
@@ -46,9 +44,3 @@ graalvmNative {
4644
enabled.set(false)
4745
}
4846
}
49-
50-
tasks.named<Test>("test") {
51-
notCompatibleWithConfigurationCache(
52-
"GraalVM native test agent options are not serializable for this task.",
53-
)
54-
}

0 commit comments

Comments
 (0)