commit 4b3c2ebcc45bf86d12106211f584ddc2bbe50520
author Jakob Buchgraber <buchgr@google.com> Thu Apr 04 02:01:48 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 04 02:03:34 2019 -0700
tree 2b6f5af29ef98904ee4066a236b0149d455cbc49
parent 53156db1e30fe7197889c3cbc8d1321ff9b85143

remote: improve profiler support

Add profiler tasks for common code paths and add user readable names.

Closes #7892.

PiperOrigin-RevId: 241890706

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
index a482f1b..3b1732d 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
@@ -38,6 +38,7 @@
 import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus;
 import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
 import com.google.devtools.build.lib.profiler.Profiler;
+import com.google.devtools.build.lib.profiler.ProfilerTask;
 import com.google.devtools.build.lib.profiler.SilentCloseable;
 import com.google.devtools.build.lib.remote.merkletree.MerkleTree;
 import com.google.devtools.build.lib.remote.options.RemoteOptions;
@@ -127,13 +128,14 @@
     Context withMetadata =
         TracingMetadataUtils.contextWithMetadata(buildRequestId, commandId, actionKey);
 
+    Profiler prof = Profiler.instance();
     if (checkCache) {
       // Metadata will be available in context.current() until we detach.
       // This is done via a thread-local variable.
       Context previous = withMetadata.attach();
       try {
         ActionResult result;
-        try (SilentCloseable c = Profiler.instance().profile("RemoteCache.getCachedActionResult")) {
+        try (SilentCloseable c = prof.profile(ProfilerTask.REMOTE_CACHE_CHECK, "check cache hit")) {
           result = remoteCache.getCachedActionResult(actionKey);
         }
         if (result != null && result.getExitCode() == 0) {
@@ -143,7 +145,8 @@
           InMemoryOutput inMemoryOutput = null;
           switch (remoteOutputsMode) {
             case MINIMAL:
-              try (SilentCloseable c = Profiler.instance().profile("RemoteCache.downloadMinimal")) {
+              try (SilentCloseable c =
+                  prof.profile(ProfilerTask.REMOTE_DOWNLOAD, "download outputs minimal")) {
                 inMemoryOutput =
                     remoteCache.downloadMinimal(
                         result,
@@ -155,7 +158,8 @@
               }
               break;
             case ALL:
-              try (SilentCloseable c = Profiler.instance().profile("RemoteCache.download")) {
+              try (SilentCloseable c =
+                  prof.profile(ProfilerTask.REMOTE_DOWNLOAD, "download outputs")) {
                 remoteCache.download(result, execRoot, context.getFileOutErr());
               }
               break;
@@ -206,8 +210,7 @@
           }
 
           if (options.experimentalGuardAgainstConcurrentChanges) {
-            try (SilentCloseable c =
-                Profiler.instance().profile("RemoteCache.checkForConcurrentModifications")) {
+            try (SilentCloseable c = prof.profile("RemoteCache.checkForConcurrentModifications")) {
               checkForConcurrentModifications();
             } catch (IOException e) {
               report(Event.warn(e.getMessage()));
@@ -218,7 +221,7 @@
           Context previous = withMetadata.attach();
           Collection<Path> files =
               RemoteSpawnRunner.resolveActionInputs(execRoot, spawn.getOutputFiles());
-          try (SilentCloseable c = Profiler.instance().profile("RemoteCache.upload")) {
+          try (SilentCloseable c = prof.profile(ProfilerTask.UPLOAD_TIME, "upload outputs")) {
             remoteCache.upload(
                 actionKey, action, command, execRoot, files, context.getFileOutErr());
           } catch (IOException e) {