From 806cb89c3768f23abd89a632387a673b9c2fd9a4 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Tue, 20 Sep 2022 14:00:33 +0200
Subject: [PATCH] include application_sid in cdr

---
 lib/call-session.js |  5 +++++
 lib/middleware.js   |  1 +
 package-lock.json   | 14 +++++++-------
 package.json        |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/call-session.js b/lib/call-session.js
index 85722fe..5da18db 100644
--- a/lib/call-session.js
+++ b/lib/call-session.js
@@ -88,6 +88,10 @@ class CallSession extends Emitter {
     return this.req.locals.account_sid;
   }
 
+  get application_sid() {
+    return this.req.locals.application_sid;
+  }
+
   get privateSipAddress() {
     return this.srf.locals.privateSipAddress;
   }
@@ -364,6 +368,7 @@ class CallSession extends Emitter {
                   ...initCdr(this.req.srf, inv),
                   service_provider_sid: this.req.locals.service_provider_sid,
                   account_sid: this.req.locals.account_sid,
+                  ...(this.req.locals.application_sid && {application_sid: this.req.locals.application_sid}),
                   trunk
                 };
               }
diff --git a/lib/middleware.js b/lib/middleware.js
index 42ee7e8..7c4e81d 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -18,6 +18,7 @@ module.exports = (srf, logger, opts) => {
     req.locals = req.locals || {};
     const callId = req.get('Call-ID');
     req.locals.account_sid = req.get('X-Account-Sid');
+    req.locals.application_sid = req.get('X-Application-Sid');
     const traceId = req.locals.trace_id = req.get('X-Trace-ID');
     req.locals.logger = logger.child({
       callId,
diff --git a/package-lock.json b/package-lock.json
index 3f60718..28aa43f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@jambonz/rtpengine-utils": "^0.3.1",
         "@jambonz/siprec-client-utils": "^0.1.4",
         "@jambonz/stats-collector": "^0.1.6",
-        "@jambonz/time-series": "^0.2.1",
+        "@jambonz/time-series": "^0.2.2",
         "cidr-matcher": "^2.1.1",
         "debug": "^4.3.4",
         "drachtio-fn-b2b-sugar": "^0.0.12",
@@ -644,9 +644,9 @@
       }
     },
     "node_modules/@jambonz/time-series": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.1.tgz",
-      "integrity": "sha512-uAoeZ3ibS7kEOGdT+vaY8BB8hOV4q38eEaF+d5OvLQaHCrPonNiwB8tWhhXDwtYdDompfqVRUy/plNA9fyS7Vw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.2.tgz",
+      "integrity": "sha512-QGljKP25R93nDenkuX7bXr7tZfsrRpHTK4ygUWzpRWIe44trY2wUcaTc+HevBSjCSshbOkB/Nn9Tzz19JTzO3w==",
       "dependencies": {
         "debug": "^4.3.1",
         "influx": "^5.9.3"
@@ -5598,9 +5598,9 @@
       }
     },
     "@jambonz/time-series": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.1.tgz",
-      "integrity": "sha512-uAoeZ3ibS7kEOGdT+vaY8BB8hOV4q38eEaF+d5OvLQaHCrPonNiwB8tWhhXDwtYdDompfqVRUy/plNA9fyS7Vw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.2.tgz",
+      "integrity": "sha512-QGljKP25R93nDenkuX7bXr7tZfsrRpHTK4ygUWzpRWIe44trY2wUcaTc+HevBSjCSshbOkB/Nn9Tzz19JTzO3w==",
       "requires": {
         "debug": "^4.3.1",
         "influx": "^5.9.3"
diff --git a/package.json b/package.json
index 0390e19..5092fab 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@jambonz/rtpengine-utils": "^0.3.1",
     "@jambonz/siprec-client-utils": "^0.1.4",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.2.1",
+    "@jambonz/time-series": "^0.2.2",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.4",
     "drachtio-fn-b2b-sugar": "^0.0.12",