Skip to content

Commit b269596

Browse files
committed
remove .ext
1 parent b85edba commit b269596

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

services/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ dependencies {
2323
isTransitive = false
2424
}
2525
compileOnly("org.apache.skywalking:apm-agent-core:$skywalkingAgentVersion")
26+
compileOnly("net.bytebuddy:byte-buddy:1.11.18")
27+
2628
implementation("com.google.code.gson:gson:$gsonVersion")
2729
implementation("org.springframework:spring-expression:5.3.13")
2830
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
@@ -59,6 +61,7 @@ tasks {
5961
relocate("com.google.gson", "spp.probe.services.dependencies.com.google.gson")
6062
relocate("org.apache.commons", "spp.probe.services.dependencies.org.apache.commons")
6163
relocate("org.springframework", "spp.probe.services.dependencies.org.springframework")
64+
relocate("net.bytebuddy", "org.apache.skywalking.apm.dependencies.net.bytebuddy")
6265
}
6366
getByName("jar").dependsOn("shadowJar")
6467

services/src/main/java/spp/probe/services/common/model/ClassMetadata.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package spp.probe.services.common.model
22

3-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.Opcodes
3+
import net.bytebuddy.jar.asm.Opcodes
44
import java.io.Serializable
55

66
class ClassMetadata : Serializable {

services/src/main/java/spp/probe/services/common/transform/LiveClassVisitor.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package spp.probe.services.common.transform
22

3-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.ClassVisitor
4-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.MethodVisitor
5-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.Opcodes
3+
import net.bytebuddy.jar.asm.ClassVisitor
4+
import net.bytebuddy.jar.asm.MethodVisitor
5+
import net.bytebuddy.jar.asm.Opcodes
66
import spp.probe.services.common.model.ClassMetadata
77
import spp.probe.services.instrument.LiveInstrumentTransformer
88
import spp.protocol.instrument.LiveSourceLocation

services/src/main/java/spp/probe/services/common/transform/LiveTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package spp.probe.services.common.transform
22

3-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.*
3+
import net.bytebuddy.jar.asm.*
44
import spp.probe.services.common.model.ClassMetadata
55
import spp.protocol.instrument.LiveSourceLocation
66
import java.lang.instrument.ClassFileTransformer

services/src/main/java/spp/probe/services/common/transform/MetadataCollector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package spp.probe.services.common.transform
22

3-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.*
3+
import net.bytebuddy.jar.asm.*
44
import spp.probe.services.common.model.ClassField
55
import spp.probe.services.common.model.ClassMetadata
66
import spp.probe.services.common.model.LocalVariable

services/src/main/java/spp/probe/services/instrument/LiveInstrumentService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package spp.probe.services.instrument
22

33
import org.apache.skywalking.apm.agent.core.context.util.ThrowableTransformer
4-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.pool.TypePool
4+
import net.bytebuddy.pool.TypePool
55
import org.springframework.expression.ParseException
66
import org.springframework.expression.spel.SpelCompilerMode
77
import org.springframework.expression.spel.SpelParserConfiguration

services/src/main/java/spp/probe/services/instrument/LiveInstrumentTransformer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package spp.probe.services.instrument
22

3-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.Label
4-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.MethodVisitor
5-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.Opcodes
6-
import org.apache.skywalking.apm.dependencies.net.bytebuddy.jar.asm.Type
3+
import net.bytebuddy.jar.asm.Label
4+
import net.bytebuddy.jar.asm.MethodVisitor
5+
import net.bytebuddy.jar.asm.Opcodes
6+
import net.bytebuddy.jar.asm.Type
77
import spp.probe.services.common.ProbeMemory
88
import spp.probe.services.common.model.ClassMetadata
99
import spp.probe.services.common.transform.LiveTransformer

0 commit comments

Comments
 (0)