feat: change ASM library dependency

gradle.properties

@@ -20,8 +20,9 @@ microutilsLoggingVersion = 2.1.23
 apacheHttpClientVersion = 5.2.3
 aesyDatasizeVersion = 1.0.0
 bytebuddyVersion = 1.14.11
+asmVersion = 9.8
 
-sharedLibsRef = main
+sharedLibsRef = feature/java25-support
 sharedLibsLocalPath = lib-jvm-shared
 nativeAgentLibName = drill-agent
 nativeAgentHookEnabled = false

java-agent/build.gradle.kts

@@ -37,6 +37,7 @@ val nativeAgentHookEnabled: String by parent!!.extra
 val macosLd64: String by parent!!.extra
 val bytebuddyVersion: String by parent!!.extra
 val kotlinxCliVersion: String by parent!!.extra
+val asmVersion: String by parent!!.extra
 
 repositories {
     mavenCentral()
@@ -115,6 +116,7 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${kotlinxSerializationVersion}")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${kotlinxSerializationVersion}")
                 implementation("org.jetbrains.kotlinx:kotlinx-cli:${kotlinxCliVersion}")
+                implementation("org.ow2.asm:asm:${asmVersion}")
                 implementation(project(":common"))
                 implementation(project(":agent-transport"))
                 implementation(project(":agent-instrumentation"))
@@ -129,7 +131,6 @@ kotlin {
                 implementation("com.benasher44:uuid:$uuidVersion")
                 implementation("io.ktor:ktor-utils:$ktorVersion")
                 implementation(project(":jvmapi"))
-                implementation(project(":knasm"))
                 implementation(project(":konform"))
                 implementation(project(":agent-instrumentation"))
                 if (nativeAgentHookEnabled == "true")

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/ApplicationClassTransformer.kt

@@ -15,4 +15,4 @@
  */
 package com.epam.drill.agent.instrument
 
-expect object ApplicationClassTransformer: TransformerObject
+expect object ApplicationClassTransformer: Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/CompositeTransformer.kt

@@ -0,0 +1,18 @@
+/**
+ * Copyright 2020 - 2022 EPAM Systems
+ *
+ * Licensed 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 com.epam.drill.agent.instrument
+
+expect object CompositeTransformer: Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/TransformerRegistrar.kt

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2020 - 2022 EPAM Systems
+ *
+ * Licensed 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 com.epam.drill.agent.instrument
+
+expect object TransformerRegistrar {
+    val enabledTransformers: List<Transformer>
+}

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/clients/ApacheHttpClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.clients
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object ApacheHttpClientTransformer : TransformerObject
+expect object ApacheHttpClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/clients/JavaHttpClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.clients
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object JavaHttpClientTransformer : TransformerObject
+expect object JavaHttpClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/clients/OkHttp3ClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.clients
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object OkHttp3ClientTransformer : TransformerObject
+expect object OkHttp3ClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/clients/SpringWebClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.clients
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object SpringWebClientTransformer : TransformerObject
+expect object SpringWebClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/Jetty10WsMessagesTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.jetty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object Jetty10WsMessagesTransformer : TransformerObject
+expect object Jetty10WsMessagesTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/Jetty11WsMessagesTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.jetty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object Jetty11WsMessagesTransformer : TransformerObject
+expect object Jetty11WsMessagesTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/Jetty9WsMessagesTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.jetty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object Jetty9WsMessagesTransformer : TransformerObject
+expect object Jetty9WsMessagesTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/JettyHttpServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.jetty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object JettyHttpServerTransformer : TransformerObject
+expect object JettyHttpServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/JettyWsClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.jetty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object JettyWsClientTransformer : TransformerObject
+expect object JettyWsClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/JettyWsServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.jetty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object JettyWsServerTransformer : TransformerObject
+expect object JettyWsServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyHttpServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.netty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object NettyHttpServerTransformer : TransformerObject
+expect object NettyHttpServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyWsClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.netty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object NettyWsClientTransformer : TransformerObject
+expect object NettyWsClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyWsMessagesTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.netty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object NettyWsMessagesTransformer : TransformerObject
+expect object NettyWsMessagesTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyWsServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.netty
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object NettyWsServerTransformer : TransformerObject
+expect object NettyWsServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/servers/CadenceTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.servers
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object CadenceTransformer : TransformerObject
+expect object CadenceTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/servers/CompatibilityTestsTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.servers
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object CompatibilityTestsTransformer : TransformerObject
+expect object CompatibilityTestsTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/servers/KafkaTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.servers
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object KafkaTransformer : TransformerObject
+expect object KafkaTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/servers/ReactorTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.servers
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object ReactorTransformer: TransformerObject
+expect object ReactorTransformer: Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/servers/SSLEngineTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.servers
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object SSLEngineTransformer : TransformerObject
+expect object SSLEngineTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/servers/TTLTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.servers
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object TTLTransformer : TransformerObject
+expect object TTLTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatHttpServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.tomcat
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object TomcatHttpServerTransformer : TransformerObject
+expect object TomcatHttpServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatWsClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.tomcat
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object TomcatWsClientTransformer : TransformerObject
+expect object TomcatWsClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatWsMessagesTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.tomcat
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object TomcatWsMessagesTransformer : TransformerObject
+expect object TomcatWsMessagesTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatWsServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.tomcat
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object TomcatWsServerTransformer : TransformerObject
+expect object TomcatWsServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowHttpServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.undertow
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object UndertowHttpServerTransformer : TransformerObject
+expect object UndertowHttpServerTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowWsClientTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.undertow
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object UndertowWsClientTransformer : TransformerObject
+expect object UndertowWsClientTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowWsMessagesTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.undertow
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object UndertowWsMessagesTransformer : TransformerObject
+expect object UndertowWsMessagesTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowWsServerTransformer.kt

@@ -15,6 +15,6 @@
  */
 package com.epam.drill.agent.instrument.undertow
 
-import com.epam.drill.agent.instrument.TransformerObject
+import com.epam.drill.agent.instrument.Transformer
 
-expect object UndertowWsServerTransformer : TransformerObject
+expect object UndertowWsServerTransformer : Transformer