Merge remote-tracking branch 'origin/main' into feature/support-arm-6…

…4-EPMDJ-10882

java-agent/build.gradle.kts

@@ -173,7 +173,6 @@ kotlin {
             "org.apache.bcel",
             "org.apache.commons",
             "org.apache.hc",
-            "org.eclipse.jetty",
             "org.intellij.lang.annotations",
             "org.jetbrains.annotations",
             "org.petitparser",

java-agent/src/commonMain/kotlin/com/epam/drill/agent/configuration/ParameterDefinitions.kt

@@ -32,4 +32,8 @@ object ParameterDefinitions {
     val IS_CADENCE = AgentParameterDefinition.forBoolean(name = "isCadence")
     val IS_TLS_APP = AgentParameterDefinition.forBoolean(name = "isTlsApp")
     val IS_ASYNC_APP = AgentParameterDefinition.forBoolean(name = "isAsyncApp")
+    val IS_COMPATIBILITY_TESTS = AgentParameterDefinition.forBoolean(name = "isCompatibilityTests", defaultValue = false)
+    val USE_PROTOBUF_SERIALIZER = AgentParameterDefinition.forBoolean(name = "useProtobufSerializer", defaultValue = true)
+    val USE_GZIP_COMPRESSION = AgentParameterDefinition.forBoolean(name = "useGzipCompression", defaultValue = true)
+    val IS_WS_MESSAGES = AgentParameterDefinition.forBoolean(name = "isWsMsg", defaultValue = true)
 }

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

@@ -17,4 +17,4 @@ package com.epam.drill.agent.instrument.clients
 
 import com.epam.drill.agent.instrument.TransformerObject
 
-expect object WebClientTransformer : TransformerObject
+expect object SpringWebClientTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/Jetty10WsMessagesTransformer.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.jetty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object Jetty10WsMessagesTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/Jetty11WsMessagesTransformer.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.jetty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object Jetty11WsMessagesTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/Jetty9WsMessagesTransformer.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.jetty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object Jetty9WsMessagesTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/jetty/JettyHttpServerTransformer.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.jetty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object JettyHttpServerTransformer : TransformerObject

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

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.epam.drill.agent.instrument.servers
+package com.epam.drill.agent.instrument.jetty
 
 import com.epam.drill.agent.instrument.TransformerObject
 
-expect object JettyTransformer : TransformerObject
+expect object JettyWsClientTransformer : TransformerObject

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

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.epam.drill.agent.instrument.servers
+package com.epam.drill.agent.instrument.jetty
 
 import com.epam.drill.agent.instrument.TransformerObject
 
-expect object NettyTransformer : TransformerObject
+expect object JettyWsServerTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyHttpServerTransformer.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.netty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object NettyHttpServerTransformer : TransformerObject

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

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.epam.drill.agent.instrument.servers
+package com.epam.drill.agent.instrument.netty
 
 import com.epam.drill.agent.instrument.TransformerObject
 
-expect object TomcatTransformer : TransformerObject
+expect object NettyWsClientTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyWsMessagesTransformer.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.netty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object NettyWsMessagesTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/netty/NettyWsServerTransformer.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.netty
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object NettyWsServerTransformer : TransformerObject

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

@@ -17,4 +17,4 @@ package com.epam.drill.agent.instrument.servers
 
 import com.epam.drill.agent.instrument.TransformerObject
 
-expect object UndertowTransformer : TransformerObject
+expect object CompatibilityTestsTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatHttpServerTransformer.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.tomcat
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object TomcatHttpServerTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatWsClientTransformer.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.tomcat
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object TomcatWsClientTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatWsMessagesTransformer.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.tomcat
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object TomcatWsMessagesTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/tomcat/TomcatWsServerTransformer.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.tomcat
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object TomcatWsServerTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowHttpServerTransformer.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.undertow
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object UndertowHttpServerTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowWsClientTransformer.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.undertow
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object UndertowWsClientTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowWsMessagesTransformer.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.undertow
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object UndertowWsMessagesTransformer : TransformerObject

java-agent/src/commonMain/kotlin/com/epam/drill/agent/instrument/undertow/UndertowWsServerTransformer.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.undertow
+
+import com.epam.drill.agent.instrument.TransformerObject
+
+expect object UndertowWsServerTransformer : TransformerObject