Feature/united java agent

.github/workflows/check.yml

@@ -24,12 +24,6 @@ jobs:
           distribution: zulu
       - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
         run: chmod +x ${{ github.workspace }}/gradlew
-      - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
-        run: chmod +x ${{ github.workspace }}/setup-shared-libs.sh
-      - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
-        run: ${{ github.workspace }}/setup-shared-libs.sh
-      - if: matrix.config.preset == 'mingwX64'
-        run: ${{ github.workspace }}/setup-shared-libs.bat
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: check

.github/workflows/release.yml

@@ -25,12 +25,6 @@ jobs:
           distribution: zulu
       - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
         run: chmod +x ${{ github.workspace }}/gradlew
-      - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
-        run: chmod +x ${{ github.workspace }}/setup-shared-libs.sh
-      - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
-        run: ${{ github.workspace }}/setup-shared-libs.sh
-      - if: matrix.config.preset == 'mingwX64'
-        run: ${{ github.workspace }}/setup-shared-libs.bat
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: check
@@ -90,12 +84,6 @@ jobs:
           distribution: zulu
       - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
         run: chmod +x ${{ github.workspace }}/gradlew
-      - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
-        run: chmod +x ${{ github.workspace }}/setup-shared-libs.sh
-      - if: matrix.config.preset == 'linuxX64' || matrix.config.preset == 'macosX64' || matrix.config.preset == 'macosArm64'
-        run: ${{ github.workspace }}/setup-shared-libs.sh
-      - if: matrix.config.preset == 'mingwX64'
-        run: ${{ github.workspace }}/setup-shared-libs.bat
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: assemble
@@ -120,17 +108,9 @@ jobs:
           java-version: 8.0
           distribution: zulu
       - run: chmod +x ${{ github.workspace }}/gradlew
-      - run: chmod +x ${{ github.workspace }}/setup-shared-libs.sh
-      - run: ${{ github.workspace }}/setup-shared-libs.sh
       - run: 'git switch -c release/${{ needs.assets.outputs.tag }}'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: gradle/gradle-build-action@v2
-        env:
-          SHARED_LIBS_USER: ${{ secrets.GH_PACKAGE_USERNAME }}
-          SHARED_LIBS_PASSWORD: ${{ secrets.GH_PACKAGE_TOKEN }}
-        with:
-          arguments: tagSharedLibs
       - run: 'git commit -am "release: branch ${{ needs.assets.outputs.tag }}"'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

DEVELOPMENT.md

@@ -114,7 +114,6 @@ Following files are included in release (per component):
 To set up environment for local development please perform following steps:
 1. Install tools (git, gradle, java)
 2. Clone component repository, checkout corresponding branch
-3. Run script to set up lib-jvm-shared repository from Git: setup-shared-libs.bat/setup-shared-libs.sh
 
 ### Moving lib-jvm-shared to custom directory
 

build.gradle.kts

@@ -104,19 +104,4 @@ tasks {
             gitrepo.pull()
         }
     }
-    val tagSharedLibs by registering {
-        group = "other"
-        doLast {
-            val tag = "${project.name}-v${project.version}"
-            val gitrepo = Grgit.open {
-                dir = sharedLibsDir
-                credentials = Credentials(System.getenv("SHARED_LIBS_USER"), System.getenv("SHARED_LIBS_PASSWORD"))
-            }
-            gitrepo.tag.add { name = tag }
-            gitrepo.push { refsOrSpecs = listOf("tags/$tag") }
-            val properties = Configurations().propertiesBuilder(file("gradle.properties"))
-            properties.configuration.setProperty("sharedLibsRef", tag)
-            properties.save()
-        }
-    }
 }

gradle.properties

@@ -22,7 +22,7 @@ aesyDatasizeVersion = 1.0.0
 bytebuddyVersion = 1.14.11
 asmVersion = 9.8
 
-sharedLibsRef = main
+sharedLibsRef = feature/united-java-agent
 sharedLibsLocalPath = lib-jvm-shared
 nativeAgentLibName = drill-agent
 nativeAgentHookEnabled = false

java-agent/build.gradle.kts

@@ -75,6 +75,7 @@ kotlin {
             languageSettings.optIn("kotlin.ExperimentalStdlibApi")
             languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
             languageSettings.optIn("io.ktor.utils.io.core.ExperimentalIoApi")
+            languageSettings.optIn("kotlinx.serialization.InternalSerializationApi")
         }
         targets.withType<KotlinNativeTarget>()[HostManager.host.presetName].compilations.forEach {
             it.defaultSourceSet.kotlin.srcDir("src/native${it.compilationName.capitalize()}/kotlin")
@@ -117,6 +118,7 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${kotlinxSerializationVersion}")
                 implementation("org.jetbrains.kotlinx:kotlinx-cli:${kotlinxCliVersion}")
                 implementation("org.ow2.asm:asm:${asmVersion}")
+                implementation("com.benasher44:uuid:${uuidVersion}")
                 implementation(project(":common"))
                 implementation(project(":agent-transport"))
                 implementation(project(":agent-instrumentation"))

java-agent/drill.properties

@@ -1 +1,6 @@
 logLevel=INFO
+#Capabilities
+coverageCollectionEnabled=true
+classScanningEnabled=true
+contextPropagationEnabled=true
+testTracingEnabled=false

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

@@ -1,47 +1,74 @@
-/**
- * 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.configuration
-
-import com.epam.drill.agent.common.configuration.AgentParameterDefinition
-import com.epam.drill.agent.common.configuration.AgentParameterDefinitionCollection
-import com.epam.drill.agent.common.configuration.NullableAgentParameterDefinition
-
-object ParameterDefinitions: AgentParameterDefinitionCollection() {
-
-    val API_URL = AgentParameterDefinition.forString(
-        name = "apiUrl",
-        description = "URL to Drill4J Backend /api endpoint. Example: http://localhost:8090/api",
-        parser = { if (!it.endsWith("/")) "$it/" else it  },
-        validator = { validTransportUrl() }).register()
-    val API_KEY = NullableAgentParameterDefinition.forString(
-        name = "apiKey",
-        description = "Drill4J API key. It is recommended to set it with DRILL_API_KEY env variable, rather than using command line argument"
-    ).register()
-    val MESSAGE_SENDING_MODE = AgentParameterDefinition.forString(
-        name = "messageSendingMode",
-        description = "Message sending mode. Possible values: DIRECT, QUEUED",
-        defaultValue = "QUEUED").register()
-    val MESSAGE_QUEUE_LIMIT = AgentParameterDefinition.forString(name = "messageQueueLimit", defaultValue = "512Mb").register()
-    val MESSAGE_MAX_RETRIES = AgentParameterDefinition.forInt(name = "messageMaxRetries", defaultValue = Int.MAX_VALUE).register()
-    val SSL_TRUSTSTORE = NullableAgentParameterDefinition.forString(name = "sslTruststore").register()
-    val SSL_TRUSTSTORE_PASSWORD = NullableAgentParameterDefinition.forString(name = "sslTruststorePassword").register()
-    val LOG_LEVEL = AgentParameterDefinition.forString(name = "logLevel", defaultValue = "INFO").register()
-    val LOG_FILE = NullableAgentParameterDefinition.forString(name = "logFile").register()
-    val LOG_LIMIT = AgentParameterDefinition.forInt(name = "logLimit", defaultValue = 512).register()
-    val USE_PROTOBUF_SERIALIZER =
-        AgentParameterDefinition.forBoolean(name = "useProtobufSerializer", defaultValue = true).register()
-    val USE_GZIP_COMPRESSION = AgentParameterDefinition.forBoolean(name = "useGzipCompression", defaultValue = true).register()
-}
+/**
+ * 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.configuration
+
+import com.epam.drill.agent.common.configuration.AgentParameterDefinition
+import com.epam.drill.agent.common.configuration.AgentParameterDefinitionCollection
+import com.epam.drill.agent.common.configuration.NullableAgentParameterDefinition
+
+object ParameterDefinitions: AgentParameterDefinitionCollection() {
+
+    val API_URL = AgentParameterDefinition.forString(
+        name = "apiUrl",
+        description = "URL to Drill4J Backend /api endpoint. Example: http://localhost:8090/api",
+        parser = { if (!it.endsWith("/")) "$it/" else it  },
+        validator = { validTransportUrl() }).register()
+    val API_KEY = NullableAgentParameterDefinition.forString(
+        name = "apiKey",
+        description = "Drill4J API key. It is recommended to set it with DRILL_API_KEY env variable, rather than using command line argument"
+    ).register()
+    val MESSAGE_SENDING_MODE = AgentParameterDefinition.forString(
+        name = "messageSendingMode",
+        description = "Message sending mode. Possible values: DIRECT, QUEUED",
+        defaultValue = "QUEUED").register()
+    val MESSAGE_QUEUE_LIMIT = AgentParameterDefinition.forString(name = "messageQueueLimit", defaultValue = "512Mb").register()
+    val MESSAGE_MAX_RETRIES = AgentParameterDefinition.forInt(name = "messageMaxRetries", defaultValue = Int.MAX_VALUE).register()
+    val SSL_TRUSTSTORE = NullableAgentParameterDefinition.forString(name = "sslTruststore").register()
+    val SSL_TRUSTSTORE_PASSWORD = NullableAgentParameterDefinition.forString(name = "sslTruststorePassword").register()
+    val LOG_LEVEL = AgentParameterDefinition.forString(name = "logLevel", defaultValue = "INFO").register()
+    val LOG_FILE = NullableAgentParameterDefinition.forString(name = "logFile").register()
+    val LOG_LIMIT = AgentParameterDefinition.forInt(name = "logLimit", defaultValue = 512).register()
+    val USE_PROTOBUF_SERIALIZER =
+        AgentParameterDefinition.forBoolean(name = "useProtobufSerializer", defaultValue = true).register()
+    val USE_GZIP_COMPRESSION = AgentParameterDefinition.forBoolean(name = "useGzipCompression", defaultValue = true).register()
+
+    val WITH_JS_COVERAGE = AgentParameterDefinition.forBoolean(name = "withJsCoverage", defaultValue = false).register()
+    val PROXY_ADDRESS = AgentParameterDefinition.forString(name = "browserProxyAddress", defaultValue = "").register()
+    val DEVTOOLS_PROXY_ADDRESS = AgentParameterDefinition.forString(
+        name = "devToolsProxyAddress",
+        defaultValue = "http://localhost:9222",
+        parser = { it.trim().takeIf(String::isBlank) ?: it.takeIf(URL_SCHEME_REGEX::matches) ?: "http://$it"}
+    ).register()
+    val DEVTOOLS_REPLACE_LOCALHOST = AgentParameterDefinition.forString(name = "devtoolsAddressReplaceLocalhost", defaultValue = "").register()
+    val TEST_SESSION_ID = NullableAgentParameterDefinition.forString(name = "testSessionId").register()
+    val LAUNCH_TYPE = AgentParameterDefinition.forString(name = "launchType", defaultValue = "").register()
+
+    private val URL_SCHEME_REGEX = Regex("\\w+://.+")
+
+    val JS_AGENT_BUILD_VERSION = NullableAgentParameterDefinition.forString(name = "jsAgentBuildVersion").register()
+    val JS_AGENT_ID = NullableAgentParameterDefinition.forString(name = "jsAgentId").register()
+
+    val TEST_TASK_ID = AgentParameterDefinition.forString(name = "testTaskId", defaultValue = "").register()
+    val RECOMMENDED_TESTS_ENABLED = AgentParameterDefinition.forBoolean(name = "recommendedTestsEnabled", defaultValue = false).register()
+    val RECOMMENDED_TESTS_TARGET_APP_ID = AgentParameterDefinition.forString(name = "recommendedTestsTargetAppId", defaultValue = "").register()
+    val RECOMMENDED_TESTS_TARGET_COMMIT_SHA = AgentParameterDefinition.forString(name = "recommendedTestsTargetCommitSha", defaultValue = "").register()
+    val RECOMMENDED_TESTS_TARGET_BUILD_VERSION = AgentParameterDefinition.forString(name = "recommendedTestsTargetBuildVersion", defaultValue = "").register()
+    val RECOMMENDED_TESTS_BASELINE_COMMIT_SHA = AgentParameterDefinition.forString(name = "recommendedTestsBaselineCommitSha", defaultValue = "").register()
+    val RECOMMENDED_TESTS_BASELINE_BUILD_VERSION = AgentParameterDefinition.forString(name = "recommendedTestsBaselineBuildVersion", defaultValue = "").register()
+
+    val TEST_TRACING_PER_SESSION_ENABLED = AgentParameterDefinition.forBoolean(name = "testTracingPerTestSessionEnabled", defaultValue = true).register()
+    val TEST_TRACING_PER_TEST_LAUNCH_ENABLED = AgentParameterDefinition.forBoolean(name = "testTracingPerTestLaunchEnabled", defaultValue = true).register()
+}

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/cucumber/Cucumber4Transformer.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.test.instrument.cucumber
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object Cucumber4Transformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/cucumber/Cucumber5Transformer.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.test.instrument.cucumber
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object Cucumber5Transformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/cucumber/Cucumber6Transformer.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.test.instrument.cucumber
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object Cucumber6Transformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/jmeter/JMeterTransformer.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.test.instrument.jmeter
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object JMeterTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/junit/JUnit4PrioritizingTransformer.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.test.instrument.junit
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object JUnit4PrioritizingTransformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/junit/JUnit4Transformer.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.test.instrument.junit
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object JUnit4Transformer : Transformer

java-agent/src/commonMain/kotlin/com/epam/drill/agent/test/instrument/junit/JUnit5Transformer.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.test.instrument.junit
+
+import com.epam.drill.agent.instrument.Transformer
+
+expect object JUnit5Transformer : Transformer