Merge pull request #175 from Drill4J/merge/v0.9.2

Merge/v0.9.2
Drill4J · Sep 24, 2024 · da4ef64 · da4ef64
2 parents 5fb1729 + a1f0f98
commit da4ef64
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 354 deletions.
diff --git a/java-agent/src/commonMain/kotlin/com/epam/drill/agent/module/JvmModuleStorage.kt b/java-agent/src/commonMain/kotlin/com/epam/drill/agent/module/JvmModuleStorage.kt
diff --git a/java-agent/src/commonMain/kotlin/com/epam/drill/agent/request/RequestHolder.kt b/java-agent/src/commonMain/kotlin/com/epam/drill/agent/request/RequestHolder.kt
diff --git a/java-agent/src/commonMain/kotlin/com/epam/drill/agent/request/RequestProcessor.kt b/java-agent/src/commonMain/kotlin/com/epam/drill/agent/request/RequestProcessor.kt
diff --git a/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/RequestAgentContext.kt b/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/RequestAgentContext.kt
@@ -16,12 +16,12 @@
 package com.epam.drill.agent
 
 import java.util.Locale
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 import com.epam.drill.common.agent.AgentContext
 
 object RequestAgentContext : AgentContext {
     override operator fun invoke(): String? =
-        RequestHolder.retrieve()?.drillSessionId?.ifEmpty { null }
+        DrillRequestHolder.retrieve()?.drillSessionId?.ifEmpty { null }
     override operator fun get(key: String): String? =
-        RequestHolder.retrieve()?.headers?.get(key.lowercase(Locale.getDefault()))
+        DrillRequestHolder.retrieve()?.headers?.get(key.lowercase(Locale.getDefault()))
 }
diff --git a/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/instrument/DefaultHeadersProcessor.kt b/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/instrument/DefaultHeadersProcessor.kt
@@ -16,6 +16,6 @@
 package com.epam.drill.agent.instrument
 
 import com.epam.drill.agent.request.HeadersRetriever
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 
-object DefaultHeadersProcessor : DrillRequestHeadersProcessor(HeadersRetriever, RequestHolder)
+object DefaultHeadersProcessor : DrillRequestHeadersProcessor(HeadersRetriever, DrillRequestHolder)
diff --git a/...rc/jvmMain/kotlin/com/epam/drill/agent/instrument/reactor/transformers/FluxTransformer.kt b/...rc/jvmMain/kotlin/com/epam/drill/agent/instrument/reactor/transformers/FluxTransformer.kt
@@ -18,9 +18,9 @@ package com.epam.drill.agent.instrument.reactor.transformers
 import com.epam.drill.agent.instrument.ClassPathProvider
 import com.epam.drill.agent.instrument.RuntimeClassPathProvider
 import com.epam.drill.agent.instrument.TransformerObject
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 
 object FluxTransformer: TransformerObject,
     FluxTransformerObject(),
-    com.epam.drill.common.agent.request.RequestHolder by RequestHolder,
+    com.epam.drill.common.agent.request.RequestHolder by DrillRequestHolder,
     ClassPathProvider by RuntimeClassPathProvider
diff --git a/...rc/jvmMain/kotlin/com/epam/drill/agent/instrument/reactor/transformers/MonoTransformer.kt b/...rc/jvmMain/kotlin/com/epam/drill/agent/instrument/reactor/transformers/MonoTransformer.kt
@@ -18,9 +18,9 @@ package com.epam.drill.agent.instrument.reactor.transformers
 import com.epam.drill.agent.instrument.ClassPathProvider
 import com.epam.drill.agent.instrument.RuntimeClassPathProvider
 import com.epam.drill.agent.instrument.TransformerObject
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 
 object MonoTransformer : TransformerObject,
     MonoTransformerObject(),
-    com.epam.drill.common.agent.request.RequestHolder by RequestHolder,
+    com.epam.drill.common.agent.request.RequestHolder by DrillRequestHolder,
     ClassPathProvider by RuntimeClassPathProvider
diff --git a/...in/kotlin/com/epam/drill/agent/instrument/reactor/transformers/ParallelFluxTransformer.kt b/...in/kotlin/com/epam/drill/agent/instrument/reactor/transformers/ParallelFluxTransformer.kt
@@ -18,9 +18,9 @@ package com.epam.drill.agent.instrument.reactor.transformers
 import com.epam.drill.agent.instrument.ClassPathProvider
 import com.epam.drill.agent.instrument.RuntimeClassPathProvider
 import com.epam.drill.agent.instrument.TransformerObject
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 
 object ParallelFluxTransformer: TransformerObject,
     ParallelFluxTransformerObject(),
-    com.epam.drill.common.agent.request.RequestHolder by RequestHolder,
+    com.epam.drill.common.agent.request.RequestHolder by DrillRequestHolder,
     ClassPathProvider by RuntimeClassPathProvider
diff --git a/...Main/kotlin/com/epam/drill/agent/instrument/reactor/transformers/SchedulersTransformer.kt b/...Main/kotlin/com/epam/drill/agent/instrument/reactor/transformers/SchedulersTransformer.kt
@@ -18,9 +18,9 @@ package com.epam.drill.agent.instrument.reactor.transformers
 import com.epam.drill.agent.instrument.TransformerObject
 import com.epam.drill.agent.instrument.ClassPathProvider
 import com.epam.drill.agent.instrument.RuntimeClassPathProvider
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 
 object SchedulersTransformer: TransformerObject,
     SchedulersTransformerObject(),
-    com.epam.drill.common.agent.request.RequestHolder by RequestHolder,
+    com.epam.drill.common.agent.request.RequestHolder by DrillRequestHolder,
     ClassPathProvider by RuntimeClassPathProvider
diff --git a/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/module/JvmModuleStorage.kt b/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/module/JvmModuleStorage.kt
diff --git a/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/request/RequestHolder.kt b/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/request/RequestHolder.kt
diff --git a/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/request/RequestProcessor.kt b/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/request/RequestProcessor.kt
diff --git a/java-agent/src/nativeMain/kotlin/com/epam/drill/agent/Agent.kt b/java-agent/src/nativeMain/kotlin/com/epam/drill/agent/Agent.kt
@@ -33,7 +33,7 @@ import com.epam.drill.agent.jvmti.vmDeathEvent
 import com.epam.drill.agent.jvmti.vmInitEvent
 import com.epam.drill.agent.module.JvmModuleLoader
 import com.epam.drill.agent.request.HeadersRetriever
-import com.epam.drill.agent.request.RequestHolder
+import com.epam.drill.agent.request.DrillRequestHolder
 import com.epam.drill.agent.transport.JvmModuleMessageSender
 import com.epam.drill.jvmapi.gen.*
 
@@ -80,8 +80,8 @@ object Agent {
         AgentLoggingConfiguration.updateJvmLoggingConfiguration()
         Configuration.initializeJvm()
 
-        RequestHolder.init(Configuration.parameters[ParameterDefinitions.IS_ASYNC_APP])
-        HttpInterceptorConfigurer(HeadersRetriever, RequestHolder)
+        DrillRequestHolder.init(Configuration.parameters[ParameterDefinitions.IS_ASYNC_APP])
+        HttpInterceptorConfigurer(HeadersRetriever, DrillRequestHolder)
 
         loadJvmModule("com.epam.drill.test2code.Test2Code")
         JvmModuleMessageSender.sendAgentMetadata()

diff --git a/java-agent/src/nativeMain/kotlin/com/epam/drill/agent/module/JvmModuleStorage.kt b/java-agent/src/nativeMain/kotlin/com/epam/drill/agent/module/JvmModuleStorage.kt
diff --git a/java-agent/src/nativeMain/kotlin/com/epam/drill/agent/request/RequestHolder.kt b/java-agent/src/nativeMain/kotlin/com/epam/drill/agent/request/RequestHolder.kt