Merge pull request #12125 from piyumaldk/master

Handling null for tenant domain
wso2 · Aug 21, 2023 · fcd7f20 · fcd7f20
2 parents 5fde548 + e2bdff3
commit fcd7f20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...n.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java b/...n.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java
@@ -139,6 +139,7 @@ public class APIMgtGatewayConstants {
  public static final String CUSTOM_ANALYTICS_RESPONSE_PROPERTIES = "apim.analytics.response.properties";
  public static final String CUSTOM_ANALYTICS_PROPERTY_SEPARATOR = ",";
  public static final String API_UUID_PROPERTY = "API_UUID";
+ public static final String TENANT_DOMAIN = "tenant.info.domain";
 
  /**
  * Constants for swagger schema validator

diff --git a/...main/java/org/wso2/carbon/apimgt/gateway/handlers/common/APIMgtLatencySynapseHandler.java b/...main/java/org/wso2/carbon/apimgt/gateway/handlers/common/APIMgtLatencySynapseHandler.java
@@ -139,10 +139,11 @@ public boolean handleResponseOutFlow(MessageContext messageContext) {
  if (responseLatencySpan != null) {
  GatewayUtils.setAPIRelatedTags(responseLatencySpan, messageContext);
  API api = GatewayUtils.getAPI(messageContext);
+ String tenantDomain = (String) messageContext.getProperty(APIMgtGatewayConstants.TENANT_DOMAIN);
  if (api != null) {
  TelemetryUtil.updateOperation(responseLatencySpan,
  api.getApiName().concat("--").concat(api.getApiVersion()).concat("--")
- .concat(GatewayUtils.getTenantDomain()));
+ .concat(tenantDomain));
  }
  TelemetryUtil.finishSpan(responseLatencySpan);
  }
@@ -157,10 +158,11 @@ public boolean handleResponseOutFlow(MessageContext messageContext) {
  if (responseLatencySpan != null) {
  GatewayUtils.setAPIRelatedTags(responseLatencySpan, messageContext);
  API api = GatewayUtils.getAPI(messageContext);
+ String tenantDomain = (String) messageContext.getProperty(APIMgtGatewayConstants.TENANT_DOMAIN);
  if (api != null) {
  Util.updateOperation(responseLatencySpan,
  api.getApiName().concat("--").concat(api.getApiVersion()).concat("--")
- .concat(GatewayUtils.getTenantDomain()));
+ .concat(tenantDomain));
  }
  if (responseLatencySpan != null) {
  Util.finishSpan(responseLatencySpan);