Fix ACTIVITY_E2E_LATENCY metrics (#537)

Author: meiliang86

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 }
 
 plugins {
-    id 'net.minecrell.licenser' version '0.4.1'
+    id "com.github.hierynomus.license" version"0.15.0"
     id 'com.github.sherter.google-java-format' version '0.8'
     id 'net.ltgt.errorprone' version  '1.1.1'
     id 'java-library'
@@ -66,6 +66,7 @@ dependencies {
 
 license {
     header rootProject.file('license-header.txt')
+    skipExistingHeaders true
     exclude 'com/uber/cadence/*.java' // generated code
 }
 
@@ -212,7 +213,7 @@ task registerDomain(type:JavaExec) {
 
 test {
     dependsOn 'registerDomain'
-    dependsOn 'checkLicenseMain'
+    dependsOn 'licenseMain'
     testLogging {
         events 'passed', 'skipped', 'failed'
         exceptionFormat 'full'

src/main/java/com/uber/cadence/internal/common/Retryer.java

@@ -1,8 +1,8 @@
 /*
+ *  Modifications Copyright (c) 2017-2020 Uber Technologies Inc.
+ *  Portions of the Software are attributed to Copyright (c) 2020 Temporal Technologies Inc.
  *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
- *  Modifications copyright (C) 2017 Uber Technologies, Inc.
- *
  *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
  *  use this file except in compliance with the License. A copy of the License is
  *  located at
@@ -22,6 +22,7 @@
 import com.uber.cadence.*;
 import com.uber.cadence.common.RetryOptions;
 import java.time.Duration;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.function.BiFunction;
@@ -124,7 +125,7 @@ public static <R, T extends Throwable> R retryWithResult(
         return result;
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
-        return null;
+        throw new CancellationException();
       } catch (Exception e) {
         throttler.failure();
         if (options.getDoNotRetry() != null) {

src/main/java/com/uber/cadence/internal/testservice/StateMachines.java

@@ -1,8 +1,8 @@
 /*
+ *  Modifications Copyright (c) 2017-2020 Uber Technologies Inc.
+ *  Portions of the Software are attributed to Copyright (c) 2020 Temporal Technologies Inc.
  *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
- *  Modifications copyright (C) 2017 Uber Technologies, Inc.
- *
  *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
  *  use this file except in compliance with the License. A copy of the License is
  *  located at
@@ -743,6 +743,7 @@ private static void scheduleActivityTask(
             .setScheduleToCloseTimeoutSeconds(scheduleToCloseTimeoutSeconds)
             .setStartToCloseTimeoutSeconds(d.getStartToCloseTimeoutSeconds())
             .setScheduledTimestamp(ctx.currentTimeInNanoseconds())
+            .setScheduledTimestampOfThisAttempt(ctx.currentTimeInNanoseconds())
             .setHeader(d.getHeader())
             .setAttempt(0);
 
@@ -1057,11 +1058,13 @@ private static boolean attemptActivityRetry(
       data.nextBackoffIntervalSeconds =
           data.retryState.getBackoffIntervalInSeconds(errorReason, data.store.currentTimeMillis());
       if (data.nextBackoffIntervalSeconds > 0) {
-        data.activityTask.getTask().setHeartbeatDetails(data.heartbeatDetails);
+        PollForActivityTaskResponse task = data.activityTask.getTask();
+        task.setHeartbeatDetails(data.heartbeatDetails);
         ctx.onCommit(
             (historySize) -> {
               data.retryState = nextAttempt;
-              data.activityTask.getTask().setAttempt(nextAttempt.getAttempt());
+              task.setAttempt(nextAttempt.getAttempt());
+              task.setScheduledTimestampOfThisAttempt(ctx.currentTimeInNanoseconds());
             });
         return true;
       } else {

src/main/java/com/uber/cadence/internal/worker/ActivityWorker.java

@@ -1,8 +1,8 @@
 /*
+ *  Modifications Copyright (c) 2017-2020 Uber Technologies Inc.
+ *  Portions of the Software are attributed to Copyright (c) 2020 Temporal Technologies Inc.
  *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
- *  Modifications copyright (C) 2017 Uber Technologies, Inc.
- *
  *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
  *  use this file except in compliance with the License. A copy of the License is
  *  located at
@@ -184,10 +184,10 @@ public void handle(PollForActivityTaskResponse task) throws Exception {
         sendReply(task, response, metricsScope);
         sw.stop();
 
-        metricsScope
-            .timer(MetricsType.ACTIVITY_E2E_LATENCY)
-            .record(
-                Duration.ofNanos(System.nanoTime() - task.getScheduledTimestampOfThisAttempt()));
+        long nanoTime =
+            TimeUnit.NANOSECONDS.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+        Duration duration = Duration.ofNanos(nanoTime - task.getScheduledTimestampOfThisAttempt());
+        metricsScope.timer(MetricsType.ACTIVITY_E2E_LATENCY).record(duration);
 
       } catch (CancellationException e) {
         RespondActivityTaskCanceledRequest cancelledRequest =