[gobblin] branch master updated: Tag metrics with proxy url if available (#3423)

[zi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zihanli58 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e59fb4  Tag metrics with proxy url if available (#3423)
8e59fb4 is described below

commit 8e59fb4a67baa4db70695b07a50186ea76dac154
Author: William Lo <lo...@gmail.com>
AuthorDate: Thu Nov 4 14:05:43 2021 -0700

    Tag metrics with proxy url if available (#3423)
---
 .../src/main/java/org/apache/gobblin/azkaban/AzkabanJobLauncher.java  | 4 +++-
 .../gobblin/service/modules/orchestration/AzkabanMultiCallables.java  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/azkaban/AzkabanJobLauncher.java b/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/azkaban/AzkabanJobLauncher.java
index 0d143b1..9756544 100644
--- a/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/azkaban/AzkabanJobLauncher.java
+++ b/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/azkaban/AzkabanJobLauncher.java
@@ -105,6 +105,7 @@ public class AzkabanJobLauncher extends AbstractJob implements ApplicationLaunch
 
   private static final String HADOOP_FS_DEFAULT_NAME = "fs.default.name";
   private static final String AZKABAN_LINK_JOBEXEC_URL = "azkaban.link.jobexec.url";
+  private static final String AZKABAN_LINK_JOBEXEC_PROXY_URL = "azkaban.link.jobexec.proxyUrl";
   private static final String AZKABAN_FLOW_EXEC_ID = "azkaban.flow.execid";
   private static final String MAPREDUCE_JOB_CREDENTIALS_BINARY = "mapreduce.job.credentials.binary";
 
@@ -379,7 +380,8 @@ public class AzkabanJobLauncher extends AbstractJob implements ApplicationLaunch
   private static List<? extends Tag<?>> addAdditionalMetadataTags(Properties jobProps) {
     List<Tag<?>> metadataTags = Lists.newArrayList();
     String jobExecutionId = jobProps.getProperty(AZKABAN_FLOW_EXEC_ID, "");
-    String jobExecutionUrl = jobProps.getProperty(AZKABAN_LINK_JOBEXEC_URL, "");
+    // Display the proxy URL in the metadata tag if it exists
+    String jobExecutionUrl = jobProps.getProperty(AZKABAN_LINK_JOBEXEC_PROXY_URL, jobProps.getProperty(AZKABAN_LINK_JOBEXEC_URL, ""));
 
     metadataTags.add(new Tag<>(TimingEvent.FlowEventConstants.FLOW_GROUP_FIELD,
         jobProps.getProperty(ConfigurationKeys.FLOW_GROUP_KEY, "")));
diff --git a/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/service/modules/orchestration/AzkabanMultiCallables.java b/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/service/modules/orchestration/AzkabanMultiCallables.java
index 344d3b2..ec335c9 100644
--- a/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/service/modules/orchestration/AzkabanMultiCallables.java
+++ b/gobblin-modules/gobblin-azkaban/src/main/java/org/apache/gobblin/service/modules/orchestration/AzkabanMultiCallables.java
@@ -491,7 +491,7 @@ class AzkabanMultiCallables {
         this.invalidSession = true;
         throw e;
       } catch (Exception e) {
-        throw new AzkabanClientException("Azkaban client failed to get proxy users", e);
+        throw new AzkabanClientException(String.format("Azkaban client failed to get proxy users for %s", client.url), e);
       }
     }
   }