open-telemetry · iNikem · Aug 12, 2020 · Aug 12, 2020 · Aug 12, 2020
diff --git a/.github/workflows/build-play-smoke-dist.yaml b/.github/workflows/build-play-smoke-dist.yaml
@@ -8,7 +8,7 @@ on:
     branches: 'master'
 
 jobs:
-  test:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -20,10 +20,11 @@ jobs:
       - name: Cache gradle dependencies
         uses: burrunan/gradle-cache-action@v1
         with:
-          job-id: jdk11
-
-      - name: Login to GitHub Package Registry
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u ${{ github.repository }} --password-stdin
+          job-id: play-smoke
 
       - name: Build Docker Image
-        run: cd smoke-tests/play && ./gradlew jib
+        run: |
+          ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jib -PtargetJDK=14 -Djib.httpTimeout=120000 -Djib.console=plain
+        working-directory: smoke-tests/play
diff --git a/.github/workflows/build-springboot-smoke-dist.yaml b/.github/workflows/build-springboot-smoke-dist.yaml
@@ -8,7 +8,7 @@ on:
     branches: 'master'
 
 jobs:
-  test:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -20,10 +20,11 @@ jobs:
       - name: Cache gradle dependencies
         uses: burrunan/gradle-cache-action@v1
         with:
-          job-id: jdk11
-
-      - name: Login to GitHub Package Registry
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u ${{ github.repository }} --password-stdin
+          job-id: springboot-smoke
 
       - name: Build Docker Image
-        run: cd smoke-tests/springboot && ./gradlew jib
+        run: |
+          ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jib -PtargetJDK=14 -Djib.httpTimeout=120000 -Djib.console=plain
+        working-directory: smoke-tests/springboot
diff --git a/smoke-tests/play/build.gradle b/smoke-tests/play/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id "org.gradle.playframework" version "0.9"
-  id 'com.google.cloud.tools.jib' version '2.4.0'
+  id 'com.google.cloud.tools.jib' version '2.5.0'
 }
 
 ext {
@@ -35,8 +35,10 @@ dependencies {
   implementation "com.typesafe.play:filters-helpers_$scalaVersion:$playVersion"
 }
 
+def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
+
 jib {
-  from.image = "bellsoft/liberica-openjdk-alpine:11"
-  to.image = "docker.pkg.github.com/open-telemetry/opentelemetry-java-instrumentation/smoke-play"
+  from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
+  to.image = "docker.pkg.github.com/open-telemetry/opentelemetry-java-instrumentation/smoke-play-jdk$targetJDK"
   container.mainClass = "play.core.server.ProdServerStart"
 }
diff --git a/smoke-tests/play/gradle/wrapper/gradle-wrapper.properties b/smoke-tests/play/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/smoke-tests/play/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy b/smoke-tests/play/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
diff --git a/smoke-tests/springboot/build.gradle b/smoke-tests/springboot/build.gradle
@@ -2,22 +2,28 @@ plugins {
   id 'org.springframework.boot' version '2.3.2.RELEASE'
   id 'io.spring.dependency-management' version '1.0.9.RELEASE'
   id 'java'
-  id 'com.google.cloud.tools.jib' version '2.4.0'
+  id 'com.google.cloud.tools.jib' version '2.5.0'
 }
 
 group = 'io.opentelemetry'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '8'
 
 repositories {
   jcenter()
 }
 
 dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-web'
+  implementation 'io.opentelemetry:opentelemetry-extension-auto-annotations:0.7.0'
 }
 
+compileJava {
+  options.release = 8
+}
+
+def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
+
 jib {
-  from.image = "bellsoft/liberica-openjdk-alpine:11"
-  to.image = "docker.pkg.github.com/open-telemetry/opentelemetry-java-instrumentation/smoke-springboot"
+  from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
+  to.image = "docker.pkg.github.com/open-telemetry/opentelemetry-java-instrumentation/smoke-springboot-jdk$targetJDK"
 }
diff --git a/smoke-tests/springboot/gradle/wrapper/gradle-wrapper.properties b/smoke-tests/springboot/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/smoke-tests/springboot/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy b/smoke-tests/springboot/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
diff --git a/...src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeWithEmbeddedExporterTest.groovy b/...src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeWithEmbeddedExporterTest.groovy
diff --git a/...ingboot/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy b/...ingboot/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy