Merge pull request #3642 from rajithacharith/choreo-new

Add traceId header to oauth-agent requests.
wso2 · Feb 11, 2025 · 42aaea6 · 42aaea6
2 parents 266e153 + 49c4689
commit 42aaea6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...arent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java b/...arent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java
@@ -68,6 +68,7 @@ public class APIConstants {
     public static final String PATH_HEADER = ":path";
 
     public static final String LOG_TRACE_ID = "traceId";
+    public static final String OAUTH_AGENT_TRACE_ID_HEADER = "x-correlation-id";
 
     /**
      * Holds the common set of constants related to the output status codes of the security validations.

diff --git a/...ent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyUtils.java b/...ent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyUtils.java
@@ -34,6 +34,7 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
 import org.wso2.choreo.connect.enforcer.config.ConfigHolder;
 import org.wso2.choreo.connect.enforcer.constants.APIConstants;
 import org.wso2.choreo.connect.enforcer.constants.APISecurityConstants;
@@ -124,6 +125,8 @@ public static Optional<String> exchangePATToJWT(String patHash) {
             // Create a request to exchange API key to JWT.
             HttpPost exchangeRequest = new HttpPost(url.toURI());
             exchangeRequest.addHeader("Content-Type", ContentType.APPLICATION_JSON.toString());
+            exchangeRequest.addHeader(APIConstants.OAUTH_AGENT_TRACE_ID_HEADER,
+                    ThreadContext.get(APIConstants.LOG_TRACE_ID));
             exchangeRequest.setEntity(new StringEntity(createKeyHashExchangeRequest(patHash)));
             try (CloseableHttpResponse response = httpClient.execute(exchangeRequest)) {
                 if (response.getStatusLine().getStatusCode() == 200) {
@@ -162,6 +165,8 @@ public static Optional<String> exchangeAPIKeyToJWT(String apiKeyId) {
             // Create a request to exchange API key to JWT.
             HttpPost exchangeRequest = new HttpPost(url.toURI());
             exchangeRequest.addHeader("Content-Type", ContentType.APPLICATION_JSON.toString());
+            exchangeRequest.addHeader(APIConstants.OAUTH_AGENT_TRACE_ID_HEADER,
+                    ThreadContext.get(APIConstants.LOG_TRACE_ID));
             exchangeRequest.setEntity(new StringEntity(createKeyHashExchangeRequest(apiKeyId)));
             try (CloseableHttpResponse response = httpClient.execute(exchangeRequest)) {
                 if (response.getStatusLine().getStatusCode() == 200) {