HADOOP-17511. Regression: Test failure in TestHttpReferrerAuditHeader

Change-Id: Ic6ce36df6a3f6e12ed4ee8b6829460e8e875121b

Author: steveloughran

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/audit/HttpReferrerAuditHeader.java

@@ -64,9 +64,11 @@ public final class HttpReferrerAuditHeader {
 
   /**
    * Format of path to build: {@value}.
-   * the params passed in are (context ID, span ID, op)
+   * the params passed in are (context ID, span ID, op).
+   * Update
+   * {@code TestHttpReferrerAuditHeader.SAMPLE_LOG_ENTRY} on changes
    */
-  public static final String REFERRER_PATH_FORMAT = "hadoop/1/%3$s/%2$s/";
+  public static final String REFERRER_PATH_FORMAT = "/hadoop/1/%3$s/%2$s/";
 
   private static final Logger LOG =
       LoggerFactory.getLogger(HttpReferrerAuditHeader.class);
@@ -185,7 +187,7 @@ public String buildHttpReferrer() {
           null);
       header = uri.toASCIIString();
     } catch (URISyntaxException e) {
-      WARN_OF_URL_CREATION.warn("Failed to build URI for {}/{}", e);
+      WARN_OF_URL_CREATION.warn("Failed to build URI for auditor: " + e, e);
       header = "";
     }
     return header;

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/audit/impl/LoggingAuditor.java

@@ -90,13 +90,6 @@ public class LoggingAuditor
    */
   private final Map<String, String> attributes = new HashMap<>();
 
-  /**
-   * UGI principal at time of creation.
-   * This is mapped into the common context if it is not already set there
-   * when a span is created.
-   */
-  private final String principal;
-
   /**
    * Should the referrer header be added?
    */
@@ -129,15 +122,12 @@ public LoggingAuditor() {
 
 
     // add the principal
-    String p;
     try {
       UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-      p = ugi.getUserName();
-      addAttribute(PARAM_PRINCIPAL, p);
-    } catch (IOException ignored) {
-      p = "";
+      addAttribute(PARAM_PRINCIPAL, ugi.getUserName());
+    } catch (IOException ex) {
+      LOG.warn("Auditor unable to determine principal", ex);
     }
-    principal = p;
   }
 
   /**
@@ -260,8 +250,6 @@ private LoggingAuditSpan(
           // thread at the time of creation.
           .withAttribute(PARAM_THREAD0,
               currentThreadID())
-          // principal when the auditor was created.
-          .withAttribute(PARAM_PRINCIPAL, principal)
           .withAttribute(PARAM_TIMESTAMP, Long.toString(getTimestamp()))
           .withEvaluated(context.getEvaluatedEntries())
           .withFilter(filters)

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/audit/TestHttpReferrerAuditHeader.java

@@ -202,7 +202,7 @@ public void testHeaderFiltering() throws Throwable {
           + " 794"
           + " 55"
           + " 17"
-          + " \"https://audit.example.org/op_create/"
+          + " \"https://audit.example.org/hadoop/1/op_create/"
           + "e8ede3c7-8506-4a43-8268-fe8fcbb510a4-00000278/"
           + "?op=op_create"
           + "&p1=fork-0001/test/testParseBrokenCSVFile"