From 8be14e1ecbaae9756e11e87e5ff6c0283e81a5ef Mon Sep 17 00:00:00 2001
From: Sameeksha Vaity <savaity@microsoft.com>
Date: Thu, 9 Mar 2023 11:02:49 -0800
Subject: [PATCH] Test Proxy minor updates (#33943)

---
 .../src/main/java/com/azure/core/test/InterceptorManager.java | 4 ++++
 .../main/java/com/azure/core/test/utils/TestProxyUtils.java   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
index fc51bd266721..9fd651b2fba1 100644
--- a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
@@ -444,10 +444,14 @@ public void addSanitizers(List<TestProxySanitizer> testProxySanitizers) {
 
     /**
      * Add matcher rules to match recorded data in playback.
+     * Matchers are only applied for playback session and so this will be a noop when invoked in RECORD/LIVE mode.
      * @param testProxyMatchers the list of matcher rules when playing back recorded data.
      * @throws RuntimeException Playback has not started.
      */
     public void addMatchers(List<TestProxyRequestMatcher> testProxyMatchers) {
+        if (testMode != TestMode.PLAYBACK) {
+            return;
+        }
         if (testProxyPlaybackClient != null) {
             testProxyPlaybackClient.addMatcherRequests(testProxyMatchers);
         } else {
diff --git a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestProxyUtils.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestProxyUtils.java
index 1bb190fef776..6c6dcca2ead7 100644
--- a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestProxyUtils.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestProxyUtils.java
@@ -45,7 +45,7 @@ public class TestProxyUtils {
         "(?:<SecondaryKey>)(?<secret>.*)(?:</SecondaryKey>)"));
 
     private static final String URL_REGEX = "(?<=http://|https://)([^/?]+)";
-    private static final List<String> HEADERS_TO_REDACT = new ArrayList<>(Arrays.asList("Ocp-Apim-Subscription-Key"));
+    private static final List<String> HEADERS_TO_REDACT = new ArrayList<>(Arrays.asList("Ocp-Apim-Subscription-Key", "Operation-Location", "api-key"));
     private static final String REDACTED_VALUE = "REDACTED";
 
     private static final String DELEGATION_KEY_CLIENTID_REGEX = "(?:<SignedOid>)(?<secret>.*)(?:</SignedOid>)";