deep copy

Author: rajdchak

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

@@ -178,9 +178,24 @@ private HttpReferrerAuditHeader(
     // build the referrer up. so as to find/report problems early
     initialHeader = buildHttpReferrer();
   }
-
+  
   /**
-   * Build the referrer string.
+   * Copy constructor.
+   * Creates a deep copy of a HttpReferrerAuditHeader object
+   */
+  public HttpReferrerAuditHeader(HttpReferrerAuditHeader httpReferrerAuditHeader) {
+    this.contextId = requireNonNull(httpReferrerAuditHeader.contextId);
+    this.evaluated = new ConcurrentHashMap<>(httpReferrerAuditHeader.evaluated);
+    this.filter = ImmutableSet.copyOf(httpReferrerAuditHeader.filter);
+    this.operationName = requireNonNull(httpReferrerAuditHeader.operationName);
+    this.path1 = httpReferrerAuditHeader.path1;
+    this.path2 = httpReferrerAuditHeader.path2;
+    this.spanId = requireNonNull(httpReferrerAuditHeader.spanId);
+    this.attributes = new ConcurrentHashMap<>(httpReferrerAuditHeader.attributes);
+    this.initialHeader = httpReferrerAuditHeader.initialHeader;
+  }
+    
+   /* Build the referrer string.
    * This includes dynamically evaluating all of the evaluated
    * attributes.
    * If there is an error creating the string it will be logged once

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AAuditHeaders.java

@@ -4,21 +4,22 @@
 import org.apache.hadoop.fs.store.audit.HttpReferrerAuditHeader;
 import software.amazon.s3.analyticsaccelerator.request.AuditHeaders;
 
+import static org.apache.hadoop.fs.audit.AuditConstants.PARAM_THREAD0;
+import static org.apache.hadoop.fs.audit.AuditConstants.PARAM_TIMESTAMP;
+import static org.apache.hadoop.fs.audit.CommonAuditContext.currentThreadID;
+
 public class S3AAuditHeaders implements AuditHeaders {
 
-    HttpReferrerAuditHeader referrer;
+    private final HttpReferrerAuditHeader referrer;
 
     public S3AAuditHeaders(HttpReferrerAuditHeader referrer) {
         this.referrer = referrer;
     }
 
     @Override
-    public void setGetRange(String range) {
-        referrer.set(AuditConstants.PARAM_RANGE, range);
-    }
-
-    @Override
-    public String buildReferrerHeader() {
-        return referrer.buildHttpReferrer();
+    public String modifyAndBuildReferrerHeader(String range) {
+        HttpReferrerAuditHeader copyReferrer = new HttpReferrerAuditHeader(this.referrer);
+        copyReferrer.set(AuditConstants.PARAM_RANGE, range);
+        return copyReferrer.buildHttpReferrer();
     }
 }