Log on sdkTrxIdAdder

Adhidarma Hadiwinoto
1 parent 2b5b3ab021
Showing 1 changed file with 28 additions and 5 deletions Side-by-side Diff
gateway/pull.js
@@ -131,7 +131,9 @@ function replaceRc(originalRc) {
     return config.replace_rc[originalRc] || originalRc;
 }
  
-function report(data, xid) {
+function report(data, xidFromCaller) {
+    const xid = xidFromCaller || uniqid();
+
     let corePullReportUrl;
  
     if (data && data.trx_id && data.rc) {
@@ -161,12 +163,24 @@ function report(data, xid) {
         data.misc.advice_url = config.push_server.advice.url;
     }
  
-    let trxId = Number(data.trx_id) - (Number(config.sdk_trx_id_adder) || 0);
+    const sdkTrxIdAdder = Number(config.sdk_trx_id_adder) || 0;
+    let trxId = Number(data.trx_id) - sdkTrxIdAdder;
+
+    if (sdkTrxIdAdder) {
+        logger.verbose(`${MODULE_NAME} 3E0016E8: REPORT: Adjusting trx id`, {
+            xid,
+            sdkTrxIdAdder,
+            trxId: data.trx_id,
+            adjustedTrxId: trxId,
+        });
+    }
+
     if (trxId <= 0) {
         logger.warn(`${MODULE_NAME} 6A8C7303: REPORT: calculated trx_id is a negative number, using uncalculated trx_id`, {
+            xid,
             uncalculated: data.trx_id,
             calculated: trxId,
-            sdk_trx_id_adder: config.sdk_trx_id_adder,
+            sdkTrxIdAdder,
         });
         trxId = data.trx_id;
     }
@@ -257,8 +271,17 @@ function forwardCoreTaskToPartner(coreMessage, startTime, xid) {
     incrementCounterTrx();
  
     task.remote_product = getRemoteProduct(task.product);
-    if (Number(config.sdk_trx_id_adder)) {
-        task.trx_id = Number(task.trx_id) + Number(config.sdk_trx_id_adder);
+    const sdkTrxIdAdder = Number(config.sdk_trx_id_adder);
+    if (sdkTrxIdAdder) {
+        const newTrxId = Number(task.trx_id) + sdkTrxIdAdder;
+        logger.verbose(`${MODULE_NAME} 873BA19B: Adjusting trx id`, {
+            xid,
+            sdkTrxIdAdder,
+            originalTrxId: task.trx_id,
+            newTrxId,
+        });
+
+        task.trx_id = newTrxId;
     }
  
     putTaskToMatrix(task);
...	...	@@ -131,7 +131,9 @@ function replaceRc(originalRc) {
131	131	return config.replace_rc[originalRc] \|\| originalRc;
132	132	}
133	133
134		-function report(data, xid) {
	134	+function report(data, xidFromCaller) {
	135	+ const xid = xidFromCaller \|\| uniqid();
	136	+
135	137	let corePullReportUrl;
136	138
137	139	if (data && data.trx_id && data.rc) {
...	...	@@ -161,12 +163,24 @@ function report(data, xid) {
161	163	data.misc.advice_url = config.push_server.advice.url;
162	164	}
163	165
164		- let trxId = Number(data.trx_id) - (Number(config.sdk_trx_id_adder) \|\| 0);
	166	+ const sdkTrxIdAdder = Number(config.sdk_trx_id_adder) \|\| 0;
	167	+ let trxId = Number(data.trx_id) - sdkTrxIdAdder;
	168	+
	169	+ if (sdkTrxIdAdder) {
	170	+ logger.verbose(`${MODULE_NAME} 3E0016E8: REPORT: Adjusting trx id`, {
	171	+ xid,
	172	+ sdkTrxIdAdder,
	173	+ trxId: data.trx_id,
	174	+ adjustedTrxId: trxId,
	175	+ });
	176	+ }
	177	+
165	178	if (trxId <= 0) {
166	179	logger.warn(`${MODULE_NAME} 6A8C7303: REPORT: calculated trx_id is a negative number, using uncalculated trx_id`, {
	180	+ xid,
167	181	uncalculated: data.trx_id,
168	182	calculated: trxId,
169		- sdk_trx_id_adder: config.sdk_trx_id_adder,
	183	+ sdkTrxIdAdder,
170	184	});
171	185	trxId = data.trx_id;
172	186	}
...	...	@@ -257,8 +271,17 @@ function forwardCoreTaskToPartner(coreMessage, startTime, xid) {
257	271	incrementCounterTrx();
258	272
259	273	task.remote_product = getRemoteProduct(task.product);
260		- if (Number(config.sdk_trx_id_adder)) {
261		- task.trx_id = Number(task.trx_id) + Number(config.sdk_trx_id_adder);
	274	+ const sdkTrxIdAdder = Number(config.sdk_trx_id_adder);
	275	+ if (sdkTrxIdAdder) {
	276	+ const newTrxId = Number(task.trx_id) + sdkTrxIdAdder;
	277	+ logger.verbose(`${MODULE_NAME} 873BA19B: Adjusting trx id`, {
	278	+ xid,
	279	+ sdkTrxIdAdder,
	280	+ originalTrxId: task.trx_id,
	281	+ newTrxId,
	282	+ });
	283	+
	284	+ task.trx_id = newTrxId;
262	285	}
263	286
264	287	putTaskToMatrix(task);