From a9783c8148232b1ca1bde1cb9afc085efe1ec3ab Mon Sep 17 00:00:00 2001 From: "Alexander.Glukhov" Date: Thu, 10 Oct 2024 14:37:47 +0200 Subject: [PATCH] [opentelemetry][IJPL-163526] register/cleanup GlobalOpenTelemetry before each test instead of testcase GitOrigin-RevId: e23fb2246418cec47c9e87b024d45e80cbc4f94b --- .../TelemetryContextConfiguringTestCase.kt | 41 ++++--------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/platform/diagnostic/telemetry/rt/testSrc/com/intellij/platform/diagnostic/telemetry/rt/context/TelemetryContextConfiguringTestCase.kt b/platform/diagnostic/telemetry/rt/testSrc/com/intellij/platform/diagnostic/telemetry/rt/context/TelemetryContextConfiguringTestCase.kt index 4819d3edbe0d..edb6fe5e0b00 100644 --- a/platform/diagnostic/telemetry/rt/testSrc/com/intellij/platform/diagnostic/telemetry/rt/context/TelemetryContextConfiguringTestCase.kt +++ b/platform/diagnostic/telemetry/rt/testSrc/com/intellij/platform/diagnostic/telemetry/rt/context/TelemetryContextConfiguringTestCase.kt @@ -2,49 +2,22 @@ package com.intellij.platform.diagnostic.telemetry.rt.context import io.opentelemetry.api.GlobalOpenTelemetry -import io.opentelemetry.api.trace.Span -import io.opentelemetry.api.trace.SpanContext import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.propagation.ContextPropagators import io.opentelemetry.sdk.OpenTelemetrySdk -import org.junit.jupiter.api.AfterAll -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach abstract class TelemetryContextConfiguringTestCase { - companion object { - @BeforeAll - @JvmStatic - fun beforeAll() { - configureGlobalTelemetry() - } - - @AfterAll - @JvmStatic - fun afterAll() { - shutdownGlobalTelemetry() - } - - private fun configureGlobalTelemetry() { - OpenTelemetrySdk.builder() - .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance())) - .buildAndRegisterGlobal() - } - - private fun shutdownGlobalTelemetry() { - GlobalOpenTelemetry.resetForTest() - } - } - @BeforeEach - fun beforeEach() { - assertCurrentContextIsEmpty() + open fun setUp() { + GlobalOpenTelemetry.resetForTest() + configureGlobalTelemetry() } - private fun assertCurrentContextIsEmpty() { - val currentContext = Span.current().spanContext - assertEquals(SpanContext.getInvalid(), currentContext) + private fun configureGlobalTelemetry() { + OpenTelemetrySdk.builder() + .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance())) + .buildAndRegisterGlobal() } }