Run integrationTest as part of test (#817)

.circleci/config.yml

@@ -33,7 +33,7 @@ jobs:
           name: Build Project
           command: >-
             GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Dota.forkedMaxHeapSize=1G -Dota.forkedMinHeapSize=64M"
-            ./gradlew clean build shadowJar -x test -x integrationTest
+            ./gradlew clean build shadowJar -x test
             << pipeline.parameters.gradle_flags >>
             --max-workers=8
 
@@ -183,7 +183,7 @@ workflows:
           requires:
             - build
           name: test_8
-          testTask: testJava8 integrationTestJava8
+          testTask: testJava8
           filters:
             tags:
               only: /.*/

gradle/instrumentation.gradle

@@ -83,4 +83,4 @@ task integrationTest(type: Test) {
   }
 }
 
-check.dependsOn integrationTest
+test.finalizedBy integrationTest

gradle/java.gradle

@@ -9,12 +9,12 @@ apply from: "$rootDir/gradle/codenarc.gradle"
 apply from: "$rootDir/gradle/spotbugs.gradle"
 
 def applyCodeCoverage = !(
-    project.path.startsWith(":smoke-tests") ||
-        //TODO why some tests fail on java 11 if jacoco is present?
-        project.path == ":opentelemetry-javaagent" ||
-        project.path == ":load-generator" ||
-        project.path.startsWith(":benchmark") ||
-        project.path.startsWith(":instrumentation"))
+  project.path.startsWith(":smoke-tests") ||
+    //TODO why some tests fail on java 11 if jacoco is present?
+    project.path == ":opentelemetry-javaagent" ||
+    project.path == ":load-generator" ||
+    project.path.startsWith(":benchmark") ||
+    project.path.startsWith(":instrumentation"))
 
 if (applyCodeCoverage) {
   apply from: "$rootDir/gradle/jacoco.gradle"
@@ -108,10 +108,10 @@ dependencies {
 jar {
   manifest {
     attributes(
-        "Implementation-Title": project.name,
-        "Implementation-Version": project.version,
-        "Implementation-Vendor": "OpenTelemetry",
-        "Implementation-URL": "https://github.com/open-telemetry/opentelemetry-java-instrumentation",
+      "Implementation-Title": project.name,
+      "Implementation-Version": project.version,
+      "Implementation-Vendor": "OpenTelemetry",
+      "Implementation-URL": "https://github.com/open-telemetry/opentelemetry-java-instrumentation",
     )
   }
 }
@@ -260,7 +260,6 @@ def addTestRule(String testTaskName) {
 }
 
 addTestRule("test")
-addTestRule("integrationTest")
 addTestRule("latestDepTest")
 
 tasks.withType(Test).configureEach {