bump to 0.2.0-beta2 and fix npe

bitlap · Jan 17, 2024 · eba7629 · eba7629
1 parent 1d29138
commit eba7629
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 37 deletions.
diff --git a/...apm-caliban-v2x-plugin-0.3.0-SNAPSHOT.jar → ...ns/apm-caliban-v2x-plugin-0.2.0-beta2.jar b/...apm-caliban-v2x-plugin-0.3.0-SNAPSHOT.jar → ...ns/apm-caliban-v2x-plugin-0.2.0-beta2.jar
diff --git a/...cats-effect-v3x-plugin-0.3.0-SNAPSHOT.jar → ...pm-cats-effect-v3x-plugin-0.2.0-beta2.jar b/...cats-effect-v3x-plugin-0.3.0-SNAPSHOT.jar → ...pm-cats-effect-v3x-plugin-0.2.0-beta2.jar
diff --git a/...s/apm-executors-plugin-0.3.0-SNAPSHOT.jar → ...gins/apm-executors-plugin-0.2.0-beta2.jar b/...s/apm-executors-plugin-0.3.0-SNAPSHOT.jar → ...gins/apm-executors-plugin-0.2.0-beta2.jar
diff --git a/...ins/apm-zio-v2x-plugin-0.3.0-SNAPSHOT.jar → ...lugins/apm-zio-v2x-plugin-0.2.0-beta2.jar b/...ins/apm-zio-v2x-plugin-0.3.0-SNAPSHOT.jar → ...lugins/apm-zio-v2x-plugin-0.2.0-beta2.jar
diff --git a/...ns/apm-ziocache-plugin-0.3.0-SNAPSHOT.jar → ...ugins/apm-ziocache-plugin-0.2.0-beta2.jar b/...ns/apm-ziocache-plugin-0.3.0-SNAPSHOT.jar → ...ugins/apm-ziocache-plugin-0.2.0-beta2.jar
diff --git a/...-ziogrpc-v06rcx-plugin-0.3.0-SNAPSHOT.jar → ...apm-ziogrpc-v06rcx-plugin-0.2.0-beta2.jar b/...-ziogrpc-v06rcx-plugin-0.3.0-SNAPSHOT.jar → ...apm-ziogrpc-v06rcx-plugin-0.2.0-beta2.jar
diff --git a/...apm-ziohttp-v2x-plugin-0.3.0-SNAPSHOT.jar → ...ns/apm-ziohttp-v2x-plugin-0.2.0-beta2.jar b/...apm-ziohttp-v2x-plugin-0.3.0-SNAPSHOT.jar → ...ns/apm-ziohttp-v2x-plugin-0.2.0-beta2.jar
diff --git a/...on/src/main/scala/org/bitlap/skywalking/apm/plugin/common/ThreadPoolExecutorWrapper.scala b/...on/src/main/scala/org/bitlap/skywalking/apm/plugin/common/ThreadPoolExecutorWrapper.scala
diff --git a/...scala/org/bitlap/skywalking/apm/plugin/common/interceptor/CaptureContextInterceptor.scala b/...scala/org/bitlap/skywalking/apm/plugin/common/interceptor/CaptureContextInterceptor.scala
@@ -1,14 +1,11 @@
 package org.bitlap.skywalking.apm.plugin.common.interceptor
 
 import java.lang.reflect.Method
-import java.util.concurrent.Callable
-import java.util.concurrent.RunnableFuture
+import java.util.concurrent.{ Callable, RunnableFuture }
 
 import org.apache.skywalking.apm.agent.core.context.*
 import org.apache.skywalking.apm.agent.core.logging.api.LogManager
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor
-import org.apache.skywalking.apm.network.trace.component.ComponentsDefine
 import org.bitlap.skywalking.apm.plugin.common.*
 
 final class CaptureContextOnScheduleInterceptor extends CaptureContextInterceptor
@@ -36,8 +33,9 @@ open class CaptureContextInterceptor extends InstanceMethodsAroundInterceptor:
     val argument = allArguments(0)
     // Avoid duplicate enhancement, such as the case where it has already been enhanced by RunnableWrapper or CallableWrapper with toolkit.
     argument match
-      case instance: EnhancedInstance if instance.getSkyWalkingDynamicField.isInstanceOf[ContextSnapshot] =>
-        return
+      case instance: EnhancedInstance =>
+        val ctx = instance.getSkyWalkingDynamicField
+        if ctx != null && ctx.isInstanceOf[ContextSnapshot] then return
       case _ =>
     val wrappedObject = wrap(argument, objInst.getClass.getName, method.getName)
     if wrappedObject != null then allArguments.update(0, wrappedObject)

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.3.0-SNAPSHOT"
+ThisBuild / version := "0.2.0-beta2"