Cleanup

bitlap · Jan 3, 2024 · a1b705e · a1b705e
1 parent 7010df4
commit a1b705e
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ SkyWalking Plugins for Scala
 
 | plugin                 | maybe support version                                                           | tested version                                                                  |
 |------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
-| cats-effect-v3x-plugin | 3.4.0-RC1 ~ 3.5.x                                                               | 3.4.1                                                                           |
-| zio-v2x-plugin         | 2.0.3 ~ 2.0.x                                                                   | 2.0.9,2.0.13                                                                    |
+| cats-effect-v3x-plugin | 3.4.x                                                                           | 3.4.1                                                                           |
+| zio-v2x-plugin         | 2.x                                                                             | 2.0.9,2.0.13,2.0.15                                                             |
 | ziogrpc-v06rcx-plugin  | 0.6.0-test6 ~ 0.6.0-RC5                                                         | 0.6.0-RC5                                                                       |
 | ziohttp-v2x-plugin     | 2.0.0-RC2 ~ 2.0.0-RC11                                                          | 2.0.0-RC10                                                                      |
 | caliban-v2x-plugin     | 2.0.0 ~ 2.0.2                                                                   | 2.0.1                                                                           |

diff --git a/...cala/org/bitlap/skywalking/apm/plugin/ce/v3/define/CatsEffectIOFiberInstrumentation.scala b/...cala/org/bitlap/skywalking/apm/plugin/ce/v3/define/CatsEffectIOFiberInstrumentation.scala
@@ -8,7 +8,6 @@ import org.apache.skywalking.apm.agent.core.plugin.`match`.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
 import org.bitlap.skywalking.apm.plugin.ce.v3.*
-import org.bitlap.skywalking.apm.plugin.common.interceptor.*
 
 final class CatsEffectIOFiberInstrumentation extends ClassInstanceMethodsEnhancePluginDefine:
 

diff --git a/...plugin/src/main/scala/org/bitlap/skywalking/apm/plugin/ziocache/ZioCachePluginConfig.java b/...plugin/src/main/scala/org/bitlap/skywalking/apm/plugin/ziocache/ZioCachePluginConfig.java
@@ -1,20 +1,3 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
 package org.bitlap.skywalking.apm.plugin.ziocache;
 
 import org.apache.skywalking.apm.agent.core.boot.PluginConfig;

diff --git a/...main/scala/org/bitlap/skywalking/apm/plugin/ziocache/define/ZioCacheInstrumentation.scala b/...main/scala/org/bitlap/skywalking/apm/plugin/ziocache/define/ZioCacheInstrumentation.scala
@@ -5,7 +5,6 @@ import net.bytebuddy.matcher.*
 import net.bytebuddy.matcher.ElementMatchers.*
 
 import org.apache.skywalking.apm.agent.core.plugin.`match`.*
-import org.apache.skywalking.apm.agent.core.plugin.`match`.logical.LogicalMatchOperation
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
 
@@ -23,7 +22,7 @@ final class ZioCacheInstrumentation extends ClassInstanceMethodsEnhancePluginDef
         new InstanceMethodsInterceptPoint {
           override def getMethodsMatcher: ElementMatcher[MethodDescription] = kv._2
           override def getMethodsInterceptor: String                        = kv._1
-          override def isOverrideArgs: Boolean                              = true
+          override def isOverrideArgs: Boolean                              = false
         }
       )
       .toArray

diff --git a/...org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/define/ZioGrpcClientInstrumentation.scala b/...org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/define/ZioGrpcClientInstrumentation.scala
@@ -7,7 +7,6 @@ import net.bytebuddy.matcher.ElementMatchers.*
 import org.apache.skywalking.apm.agent.core.plugin.`match`.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
-import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.interceptor.*
 
 final class ZioGrpcClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine:
 

diff --git a/...bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/define/ZioGrpcServerCallInstrumentation.scala b/...bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/define/ZioGrpcServerCallInstrumentation.scala
@@ -7,7 +7,6 @@ import net.bytebuddy.matcher.ElementMatchers.*
 import org.apache.skywalking.apm.agent.core.plugin.`match`.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
-import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.interceptor.*
 
 final class ZioGrpcServerCallInstrumentation extends ClassInstanceMethodsEnhancePluginDefine:
 

diff --git a/...org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/define/ZioGrpcServerInstrumentation.scala b/...org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/define/ZioGrpcServerInstrumentation.scala
@@ -8,7 +8,6 @@ import org.apache.skywalking.apm.agent.core.plugin.`match`.*
 import org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.*
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
-import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.interceptor.*
 
 final class ZioGrpcServerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine:
 

diff --git a/...rg/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/interceptor/ZioGrpcClientInterceptor.scala b/...rg/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/interceptor/ZioGrpcClientInterceptor.scala
@@ -11,7 +11,6 @@ import zio.*
 
 import org.apache.skywalking.apm.agent.core.context.ContextManager
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.*
-import org.bitlap.skywalking.apm.plugin.ziogrpc.common.*
 import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.TracingClientCall
 
 final class ZioGrpcClientInterceptor extends InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor:

diff --git a/...la/org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/ZioGrpcClientInstrumentationSpec.scala b/...la/org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/ZioGrpcClientInstrumentationSpec.scala
@@ -1,15 +1,11 @@
 package org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx
 
 import scalapb.zio_grpc.*
-import scalapb.zio_grpc.client.*
 
 import net.bytebuddy.description.method.MethodDescription
-import net.bytebuddy.matcher.ElementMatcher
 
 import io.grpc.*
 
-import zio.Trace
-
 import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.define.ZioGrpcClientInstrumentation
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/...rg/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/ZioGrpcServerCallInstrumentationSpec.scala b/...rg/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/ZioGrpcServerCallInstrumentationSpec.scala
@@ -4,12 +4,9 @@ import scalapb.zio_grpc.*
 import scalapb.zio_grpc.server.*
 
 import net.bytebuddy.description.method.MethodDescription
-import net.bytebuddy.matcher.ElementMatcher
 
 import io.grpc.*
 
-import zio.Trace
-
 import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.define.ZioGrpcServerCallInstrumentation
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/...la/org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/ZioGrpcServerInstrumentationSpec.scala b/...la/org/bitlap/skywalking/apm/plugin/ziogrpc/v06rcx/ZioGrpcServerInstrumentationSpec.scala
@@ -4,12 +4,9 @@ import scalapb.zio_grpc.*
 import scalapb.zio_grpc.server.*
 
 import net.bytebuddy.description.method.MethodDescription
-import net.bytebuddy.matcher.ElementMatcher
 
 import io.grpc.*
 
-import zio.*
-
 import org.bitlap.skywalking.apm.plugin.ziogrpc.v06rcx.define.ZioGrpcServerInstrumentation
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/...itlap/skywalking/apm/plugin/ziohttp/v2/define/ZioHttpCollectHttpInstrumentationSpec.scala b/...itlap/skywalking/apm/plugin/ziohttp/v2/define/ZioHttpCollectHttpInstrumentationSpec.scala
@@ -1,9 +1,6 @@
 package org.bitlap.skywalking.apm.plugin.ziohttp.v2.define
 
 import net.bytebuddy.description.method.MethodDescription
-import net.bytebuddy.matcher.ElementMatcher
-
-import zio.*
 
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.2.0-beta1"
+ThisBuild / version := "0.2.0-beta2"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ThisBuild / version := "0.2.0-beta1"
		ThisBuild / version := "0.2.0-beta2"