From caf102fe1518a385ddb79757c1eed4fe559e0a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladimir=20=C5=A0or?= <vsor@splunk.com>
Date: Wed, 4 Nov 2020 17:02:33 +0200
Subject: [PATCH] Tag docker images for smoke tests with date and time. (#1553)

---
 smoke-tests/fake-backend/build.gradle                    | 9 +++------
 smoke-tests/grpc/build.gradle                            | 1 +
 .../io/opentelemetry/smoketest/grpc/TestService.java     | 2 +-
 smoke-tests/play/build.gradle                            | 1 +
 smoke-tests/springboot/build.gradle                      | 1 +
 .../smoketest/springboot/controller/WebController.java   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/smoke-tests/fake-backend/build.gradle b/smoke-tests/fake-backend/build.gradle
index b647a93c54..cfa9682831 100644
--- a/smoke-tests/fake-backend/build.gradle
+++ b/smoke-tests/fake-backend/build.gradle
@@ -30,10 +30,7 @@ dependencies {
 }
 
 jib {
-  to {
-    image = "open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend"
-  }
-  from {
-    image = "gcr.io/distroless/java-debian10:11"
-  }
+  from.image = "gcr.io/distroless/java-debian10:11"
+  to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend"
+  to.tags = [new Date().format("yyyyMMdd.HHmmSS")]
 }
diff --git a/smoke-tests/grpc/build.gradle b/smoke-tests/grpc/build.gradle
index 7cb9caf6e8..bc4420bb89 100644
--- a/smoke-tests/grpc/build.gradle
+++ b/smoke-tests/grpc/build.gradle
@@ -40,4 +40,5 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 jib {
   from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
   to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-grpc-jdk$targetJDK"
+  to.tags = [new Date().format("yyyyMMdd.HHmmSS")]
 }
diff --git a/smoke-tests/grpc/src/main/java/io/opentelemetry/smoketest/grpc/TestService.java b/smoke-tests/grpc/src/main/java/io/opentelemetry/smoketest/grpc/TestService.java
index 8e73869d55..54b1196494 100644
--- a/smoke-tests/grpc/src/main/java/io/opentelemetry/smoketest/grpc/TestService.java
+++ b/smoke-tests/grpc/src/main/java/io/opentelemetry/smoketest/grpc/TestService.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.smoketest.grpc;
 
 import io.grpc.stub.StreamObserver;
-import io.opentelemetry.extensions.auto.annotations.WithSpan;
+import io.opentelemetry.extension.auto.annotations.WithSpan;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse;
 import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc;
diff --git a/smoke-tests/play/build.gradle b/smoke-tests/play/build.gradle
index d069a45de7..b03214fbcd 100644
--- a/smoke-tests/play/build.gradle
+++ b/smoke-tests/play/build.gradle
@@ -40,5 +40,6 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 jib {
   from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
   to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-play-jdk$targetJDK"
+  to.tags = [new Date().format("yyyyMMdd.HHmmSS")]
   container.mainClass = "play.core.server.ProdServerStart"
 }
\ No newline at end of file
diff --git a/smoke-tests/springboot/build.gradle b/smoke-tests/springboot/build.gradle
index c7509942d4..367576b50e 100644
--- a/smoke-tests/springboot/build.gradle
+++ b/smoke-tests/springboot/build.gradle
@@ -34,4 +34,5 @@ def targetJDK = project.hasProperty("targetJDK") ? project.targetJDK : 11
 jib {
   from.image = "bellsoft/liberica-openjdk-alpine:$targetJDK"
   to.image = "open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk$targetJDK"
+  to.tags = [new Date().format("yyyyMMdd.HHmmSS")]
 }
\ No newline at end of file
diff --git a/smoke-tests/springboot/src/main/java/io/opentelemetry/smoketest/springboot/controller/WebController.java b/smoke-tests/springboot/src/main/java/io/opentelemetry/smoketest/springboot/controller/WebController.java
index 7b2b2b37fa..25c0339a2e 100644
--- a/smoke-tests/springboot/src/main/java/io/opentelemetry/smoketest/springboot/controller/WebController.java
+++ b/smoke-tests/springboot/src/main/java/io/opentelemetry/smoketest/springboot/controller/WebController.java
@@ -16,7 +16,7 @@
 
 package io.opentelemetry.smoketest.springboot.controller;
 
-import io.opentelemetry.extensions.auto.annotations.WithSpan;
+import io.opentelemetry.extension.auto.annotations.WithSpan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;