Fix TracingSegmentRunner (testing only) (#688)

apache · May 12, 2024 · 0bf535e · 0bf535e
1 parent 7dd7914
commit 0bf535e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...e/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java b/...e/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java
@@ -55,7 +55,7 @@ protected Object createTest() throws Exception {
 
     @Override
     protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) {
-        return new Statement() {
+        Statement st = new Statement() {
             @Override
             public void evaluate() throws Throwable {
                 if (field != null) {
@@ -89,5 +89,7 @@ public void afterFinished(IgnoredTracerContext tracerContext) {
                 }
             }
         };
+
+        return super.withAfters(method, target, st);
     }
 }
diff --git a/...-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java b/...-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java
@@ -55,7 +55,7 @@ protected Object createTest() throws Exception {
 
     @Override
     protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) {
-        return new Statement() {
+        Statement st = new Statement() {
             @Override
             public void evaluate() throws Throwable {
                 if (field != null) {
@@ -89,5 +89,7 @@ public void afterFinished(IgnoredTracerContext tracerContext) {
                 }
             }
         };
+
+        return super.withAfters(method, target, st);
     }
 }
diff --git a/...it/activation/micrometer/MicrometerContextSnapshotThreadLocalAccessorInterceptorTest.java b/...it/activation/micrometer/MicrometerContextSnapshotThreadLocalAccessorInterceptorTest.java
@@ -92,8 +92,6 @@ public void clear() {
     @AfterClass
     public static void clearAfterAll() {
         // test from threadlocalaccessor test x 2 TODO: I have no idea what is going on
-        ContextManager.stopSpan();
-        ContextManager.stopSpan();
         assertThat(ContextManager.isActive(), is(false));
     }
 
@@ -103,13 +101,15 @@ public void testServiceFromPlugin() {
             PluginBootService.class);
 
         Assert.assertNotNull(service);
+        ContextManager.stopSpan();
     }
 
     @Test
     public void testServiceOverrideFromPlugin() {
         ContextManagerExtendService service = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class);
 
         Assert.assertTrue(service instanceof ContextManagerExtendOverrideService);
+        ContextManager.stopSpan();
     }
 
     @Test