open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests need to reset GlobalEventEmitterProvider (#7810) 

After sdk update we have new flaky tests

https://ge.opentelemetry.io/s/qozoj3c4zxmge/tests/:javaagent-tooling:test/io.opentelemetry.javaagent.test.HelperInjectionTest/helpers%20injected%20on%20bootstrap%20classloader?top-execution=1

https://ge.opentelemetry.io/s/qozoj3c4zxmge/tests/:javaagent-tooling:test/io.opentelemetry.javaagent.tooling.OpenTelemetryInstallerTest/should%20initialize%20GlobalOpenTelemetry?top-execution=1
This commit is contained in:
Lauri Tulmin 2023-02-14 16:43:55 +02:00 committed by GitHub
parent 7e8d76a83b
commit cde6c98666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy
View File

@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.tooling
import io.opentelemetry.api.GlobalOpenTelemetry
import io.opentelemetry.api.OpenTelemetry
import io.opentelemetry.api.events.GlobalEventEmitterProvider
import io.opentelemetry.api.logs.GlobalLoggerProvider
import spock.lang.Specification
@ -15,11 +16,13 @@ class OpenTelemetryInstallerTest extends Specification {
void setup() {
GlobalOpenTelemetry.resetForTest()
GlobalLoggerProvider.resetForTest()
GlobalEventEmitterProvider.resetForTest()
}
void cleanup() {
GlobalOpenTelemetry.resetForTest()
GlobalLoggerProvider.resetForTest()
GlobalEventEmitterProvider.resetForTest()
}
def "should initialize GlobalOpenTelemetry"() {

2
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFileLoaderTest.java
View File

@ -10,6 +10,7 @@ import static java.util.Collections.singletonMap;
import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.events.GlobalEventEmitterProvider;
import io.opentelemetry.api.logs.GlobalLoggerProvider;
import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
@ -33,6 +34,7 @@ class ConfigurationFileLoaderTest {
static void cleanUp() {
GlobalOpenTelemetry.resetForTest();
GlobalLoggerProvider.resetForTest();
GlobalEventEmitterProvider.resetForTest();
}
// regression for https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6696