Fix and reduce duplication

microsoft · Feb 21, 2021 · 13f1d42 · 13f1d42
1 parent 628c3bd
commit 13f1d42
Show file tree

Hide file tree

Showing 38 changed files with 3 additions and 74 deletions.
diff --git a/test/smoke/testApps/ActuatorMetrics/build.gradle b/test/smoke/testApps/ActuatorMetrics/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: '2.1.7.RELEASE'
 }
diff --git a/test/smoke/testApps/AutoPerfCounters/build.gradle b/test/smoke/testApps/AutoPerfCounters/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile 'com.google.guava:guava:20.0'
 

diff --git a/test/smoke/testApps/CachingCalculator/build.gradle b/test/smoke/testApps/CachingCalculator/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile 'com.google.guava:guava:20.0'
     compile 'redis.clients:jedis:2+'

diff --git a/test/smoke/testApps/Cassandra/build.gradle b/test/smoke/testApps/Cassandra/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiCoreJar
     compile aiWebJar
 

diff --git a/test/smoke/testApps/CoreAndFilter/build.gradle b/test/smoke/testApps/CoreAndFilter/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile 'com.microsoft.azure:applicationinsights-web:0.9.3' // testing against oldest version with trackDependency()
     testCompile aiCoreJar // the test code (not the app under test) needs a modern core jar (well, at least 1.0.8)
     compile 'com.google.guava:guava:20.0'

diff --git a/test/smoke/testApps/CustomDimensions/build.gradle b/test/smoke/testApps/CustomDimensions/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'

diff --git a/test/smoke/testApps/CustomInstrumentation/build.gradle b/test/smoke/testApps/CustomInstrumentation/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
 
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'

diff --git a/test/smoke/testApps/DataScrubbing/build.gradle b/test/smoke/testApps/DataScrubbing/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'

diff --git a/test/smoke/testApps/HeartBeat/build.gradle b/test/smoke/testApps/HeartBeat/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile 'com.google.guava:guava:20.0'
 

diff --git a/test/smoke/testApps/HttpClients/build.gradle b/test/smoke/testApps/HttpClients/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
 
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.7'

diff --git a/test/smoke/testApps/JMS/build.gradle b/test/smoke/testApps/JMS/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-activemq', version: '2.1.7.RELEASE'
 

diff --git a/test/smoke/testApps/Jdbc/build.gradle b/test/smoke/testApps/Jdbc/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
 
     compile group: 'org.hsqldb', name: 'hsqldb', version: '2.3.6' // 2.4.0+ requires Java 8+

diff --git a/test/smoke/testApps/JettyNativeHandler/build.gradle b/test/smoke/testApps/JettyNativeHandler/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: '2.1.7.RELEASE'
 
     // needs to be same version used in fakeIngestion server

diff --git a/test/smoke/testApps/Kafka/build.gradle b/test/smoke/testApps/Kafka/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
     compile group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.3.1.RELEASE'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.0'

diff --git a/test/smoke/testApps/LegacySdkWebInterop/build.gradle b/test/smoke/testApps/LegacySdkWebInterop/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
 
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {

diff --git a/test/smoke/testApps/Lettuce/build.gradle b/test/smoke/testApps/Lettuce/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile 'com.google.guava:guava:20.0'
     compile 'io.lettuce:lettuce-core:5.2.2.RELEASE'

diff --git a/test/smoke/testApps/Micrometer/build.gradle b/test/smoke/testApps/Micrometer/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
     compile group: 'io.micrometer', name: 'micrometer-core', version: '1.4.1'
 }
diff --git a/test/smoke/testApps/MongoDB/build.gradle b/test/smoke/testApps/MongoDB/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiCoreJar
     compile aiWebJar
 

diff --git a/test/smoke/testApps/OpenTelemetryApiSupport/build.gradle b/test/smoke/testApps/OpenTelemetryApiSupport/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
     }

diff --git a/test/smoke/testApps/Sampling/build.gradle b/test/smoke/testApps/Sampling/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile 'com.google.guava:guava:20.0'
 

diff --git a/test/smoke/testApps/SpringBoot1_3Auto/build.gradle b/test/smoke/testApps/SpringBoot1_3Auto/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.3.8.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'

diff --git a/test/smoke/testApps/SpringBootAuto/build.gradle b/test/smoke/testApps/SpringBootAuto/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'

diff --git a/test/smoke/testApps/SpringBootTest/build.gradle b/test/smoke/testApps/SpringBootTest/build.gradle
@@ -17,8 +17,6 @@ compileSmokeTestJava.sourceCompatibility = 1.8
 compileSmokeTestJava.targetCompatibility = 1.8
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile springBootStarterJar
     compile 'com.google.guava:guava:27.1-android'
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {

diff --git a/test/smoke/testApps/SpringCloudStream/build.gradle b/test/smoke/testApps/SpringCloudStream/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE'
     compile group: 'org.springframework.cloud', name: 'spring-cloud-stream', version: '2.2.1.RELEASE'
     compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-stream-kafka', version: '2.2.1.RELEASE'

diff --git a/test/smoke/testApps/SpringScheduling/build.gradle b/test/smoke/testApps/SpringScheduling/build.gradle
@@ -15,8 +15,6 @@ ext.testAppArtifactDir = war.destinationDirectory
 ext.testAppArtifactFilename = project.name + '.war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'

diff --git a/test/smoke/testApps/SystemExit/build.gradle b/test/smoke/testApps/SystemExit/build.gradle
@@ -12,7 +12,5 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
 }
diff --git a/test/smoke/testApps/TraceJavaUtilLoggingUsingAgent/build.gradle b/test/smoke/testApps/TraceJavaUtilLoggingUsingAgent/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
 }
 

diff --git a/test/smoke/testApps/TraceLog4j1_2/build.gradle b/test/smoke/testApps/TraceLog4j1_2/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile aiLog4j1_2Jar
     compile 'com.google.guava:guava:20.0'

diff --git a/test/smoke/testApps/TraceLog4j1_2UsingAgent/build.gradle b/test/smoke/testApps/TraceLog4j1_2UsingAgent/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile 'com.google.guava:guava:20.0'
 

diff --git a/test/smoke/testApps/TraceLog4j2/build.gradle b/test/smoke/testApps/TraceLog4j2/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile 'org.apache.logging.log4j:log4j-api:2.11.0'
     compile 'org.apache.logging.log4j:log4j-core:2.11.0'
     compile aiWebJar

diff --git a/test/smoke/testApps/TraceLog4j2UsingAgent/build.gradle b/test/smoke/testApps/TraceLog4j2UsingAgent/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile 'org.apache.logging.log4j:log4j-api:2.11.0'
     compile 'org.apache.logging.log4j:log4j-core:2.11.0'
     compile aiWebAutoJar

diff --git a/test/smoke/testApps/TraceLogBack/build.gradle b/test/smoke/testApps/TraceLogBack/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebJar
     compile aiLogbackJar
     compile 'com.google.guava:guava:20.0'

diff --git a/test/smoke/testApps/TraceLogBackUsingAgent/build.gradle b/test/smoke/testApps/TraceLogBackUsingAgent/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
     compile 'com.google.guava:guava:20.0'
 

diff --git a/test/smoke/testApps/VerifyShading/build.gradle b/test/smoke/testApps/VerifyShading/build.gradle
@@ -12,8 +12,6 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
     compile 'com.google.guava:guava:20.0'
 }
diff --git a/test/smoke/testApps/WebAuto/build.gradle b/test/smoke/testApps/WebAuto/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'war'
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile aiWebAutoJar
 
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'

diff --git a/test/smoke/testApps/WebFlux/build.gradle b/test/smoke/testApps/WebFlux/build.gradle
@@ -12,7 +12,5 @@ ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.1.7.RELEASE'
 }
diff --git a/test/smoke/testApps/build.gradle b/test/smoke/testApps/build.gradle
@@ -10,6 +10,7 @@ subprojects {
     repositories {
         jcenter()
         mavenCentral()
+        mavenLocal() // this is needed to resolve aiAgentJar transitive dependencies, at least in gRPC:extractIncludeProto
     }
 
     sourceSets {
@@ -29,6 +30,8 @@ subprojects {
     }
 
     dependencies {
+        compileOnly aiAgentJar // this is just to force building the agent first
+
         smokeTestCompile project(':test:smoke:framework:testCore')
         smokeTestCompile project(':test:smoke:framework:utils')
         smokeTestCompile 'org.hamcrest:hamcrest-core:1.3'

diff --git a/test/smoke/testApps/gRPC/build.gradle b/test/smoke/testApps/gRPC/build.gradle
@@ -40,8 +40,6 @@ protobuf {
 }
 
 dependencies {
-    compileOnly aiAgentJar // this is just to force building the agent first
-
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
 
     compile group: 'io.grpc', name: 'grpc-core', version: grpcVersion