@builtioflow/uhm-nodejs-agent - npm Package Compare versions

Comparing version 10.16.4 to 10.16.5

lib/plugins/reliability-test-server/utils/utils.js

@@ -34,5 +34,21 @@ "use strict";
       Tags.OPERATION_NAME.tag(span, req.path);
-      Tags.TENANT_ID.tag(span, "2103828399");
       Tags.TRANSACTION_STATUS.tag(span, "1");
       Tags.URL.tag(span, "http://dummyWorkflowlogurl");
+
+      // const SERVICE_DOMAIN_NAME = "https://abc.com";
+      const SERVICE_DOMAIN_NAME = "";
+      const SUBDOMAIN = "io-int-apac";
+      const SAG_REALM_NAME = "brightstarapac";
+      Tags.SERVICE_DOMAIN_NAME.tag(span, SERVICE_DOMAIN_NAME);
+      Tags.SUBDOMAIN.tag(span, SUBDOMAIN);
+      Tags.SAG_REALM_NAME.tag(span, SAG_REALM_NAME);
+
+      let tId;
+      try {
+        tId = utils.getTenantIdTag(SERVICE_DOMAIN_NAME, SAG_REALM_NAME);
+      } catch (error) {
+        logger.warn("%s. Using subdomain as tenantId tag", error.message);
+        tId = SUBDOMAIN;
+      }
+      Tags.TENANT_ID.tag(span, tId);
       onFinished(res, function(err) {
@@ -39,0 +55,0 @@ if (err) {

lib/plugins/wmio/engine/WorkerManagerAdapter/WorkerPoolExecutorInterceptor.js

@@ -104,3 +104,3 @@ "use strict";
                   if (actionId && !ignoreActions.includes(action.actionId)) {
-                    let localSpan = prepareLocalspan(action, uhmResource);
+                    let localSpan = prepareLocalspan(action, uhmResource, resource);
                     localSpans.push(localSpan);
@@ -138,3 +138,4 @@ }
               // adding tenant id tag
-              Tags.TENANT_ID.tag(span, utils.resolveTenantID(resource.jobData.tenant_name));
+              // Tags.TENANT_ID.tag(span, utils.resolveTenantID(resource.jobData.tenant_name));
+              setTenantRelatedInfo(resource, span);
               // adding transaction id tag as bill_uid
@@ -186,3 +187,3 @@ Tags.TRANSACTION_ID.tag(span, resource.jobData.bill_uid);
 
-  function prepareLocalspan(action, uhmResource) {
+  function prepareLocalspan(action, uhmResource, resource) {
     let localSpan = uhmResource._contextManager.createLocalSpan(action.name);
@@ -195,3 +196,4 @@ const icon = _.get(action, "icon", false) ? action.icon : action.name;
     Tags.NODE_TYPES.tag(localSpan, "Connector");
-    Tags.TENANT_ID.tag(localSpan, _.get(action, "tenantName", ""));
+    // Tags.TENANT_ID.tag(localSpan, _.get(action, "tenantName", ""));
+    setTenantRelatedInfo(resource, localSpan);
     Tags.OPERATION_NAME.tag(localSpan, _.get(action, "providerName", ""));
@@ -209,3 +211,15 @@ Tags.PROVIDER_ICON.tag(localSpan, icon);
 
-  return originModule;
+  function setTenantRelatedInfo(resource, span) {
+    Tags.SUBDOMAIN.tag(span, resource.jobData.tenant_name);
+    Tags.SERVICE_DOMAIN_NAME.tag(span, resource.jobData.service_domain);
+    Tags.SAG_REALM_NAME.tag(span, resource.jobData.realm_name);
+    let tId;
+    try {
+      tId = utils.getTenantIdTag(resource.jobData.service_domain, resource.jobData.realm_name);
+    } catch (error) {
+      logger.warn("%s. Using subdomain as tenantId tag for workflow '%s' with bill ID '%s'", error.message, resource.jobData.name, resource.jobData.bill_uid);
+      tId = resource.jobData.tenant_name;
+    }
+    Tags.TENANT_ID.tag(span, tId);
+  }
 };

lib/plugins/wmio/engine/WorkflowTaskManagerAdapter/WTMAbstractInterceptor.js

@@ -110,3 +110,4 @@ "use strict";
               // adding tenant id tag
-              Tags.TENANT_ID.tag(span, utils.resolveTenantID(resource.jobData.tenant_name));
+              // Tags.TENANT_ID.tag(span, utils.resolveTenantID(resource.jobData.tenant_name));
+              setTenantRelatedInfo(resource, span);
               // adding transaction id tag as bill_uid
@@ -157,3 +158,17 @@ Tags.TRANSACTION_ID.tag(span, resource.jobData.bill_uid);
 
+  function setTenantRelatedInfo(resource, span) {
+    Tags.SUBDOMAIN.tag(span, resource.jobData.tenant_name);
+    Tags.SERVICE_DOMAIN_NAME.tag(span, resource.jobData.service_domain);
+    Tags.SAG_REALM_NAME.tag(span, resource.jobData.realm_name);
+    let tId;
+    try {
+      tId = utils.getTenantIdTag(resource.jobData.service_domain, resource.jobData.realm_name);
+    } catch (error) {
+      logger.warn("%s. Using subdomain as tenantId tag for workflow '%s' with bill ID '%s'", error.message, resource.jobData.name, resource.jobData.bill_uid);
+      tId = resource.jobData.tenant_name;
+    }
+    Tags.TENANT_ID.tag(span, tId);
+  }
+
   return originModule;
 };

lib/trace/tags.js

@@ -44,2 +44,5 @@ /*
     this.PROVIDER_VERSION = new Tag("pversion");
+    this.SERVICE_DOMAIN_NAME = new Tag("service_domain_name");
+    this.SUBDOMAIN = new Tag("subdomain");
+    this.SAG_REALM_NAME = new Tag("sag_realm_name");
 };
@@ -46,0 +49,0 @@

lib/utils/index.js

@@ -132,2 +132,12 @@ /*
 
+Utils.prototype.getTenantIdTag = function(serviceDomain, sagCloudRealm) {
+  if (serviceDomain && serviceDomain.trim().length > 0 && sagCloudRealm && sagCloudRealm.trim().length > 0) {
+    let cRealmName = serviceDomain.replace(/^https?:\/\//, "");
+    cRealmName = serviceDomain.split(".")[0];
+    return (cRealmName.toLowerCase() === sagCloudRealm.toLowerCase()) ? sagCloudRealm : serviceDomain.replace(/^https?:\/\//, "");
+  } else {
+    throw new Error("Error computing tenantID. Missing serviceDomain/sagCloudRealm");
+  }
+};
+
 module.exports = exports = new Utils();

package.json

 {
   "name": "@builtioflow/uhm-nodejs-agent",
-  "version": "10.16.4",
+  "version": "10.16.5",
   "description": "A nodejs agent for skyapm agents",
@@ -5,0 +5,0 @@ "main": "index.js",

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 12 instances in 1 package

Fixed alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

594087

increased by0.45%

Lines of code

15925

increased by0.34%

Number of low supply chain risk alerts

53

decreased by-40.45%

No dependency changes