gather: restart if we get an empty transcript (looking at you, Azure)

Dockerfile

@@ -1,10 +1,10 @@
-FROM node:slim
+FROM node:17.7.1-slim
 WORKDIR /opt/app/
-COPY package.json package-lock.json ./
-RUN npm ci
+COPY package.json ./
+RUN npm install
 RUN npm prune
 COPY . /opt/app
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
 
-CMD [ "npm", "start" ]
+CMD [ "npm", "start" ]

lib/http-routes/api/create-call.js

@@ -13,7 +13,6 @@ const dbUtils = require('../../utils/db-utils');
 
 router.post('/', async(req, res) => {
   const {logger} = req.app.locals;
-  const accountSid = req.body.account_sid;
 
   logger.debug({body: req.body}, 'got createCall request');
   try {
@@ -41,7 +40,7 @@ router.post('/', async(req, res) => {
       'X-Jambonz-Routing': target.type,
       'X-Jambonz-FS-UUID': srf.locals.fsUUID,
       'X-Call-Sid': callSid,
-      'X-Account-Sid': accountSid
+      'X-Account-Sid': req.body.account_sid
     };
 
     switch (target.type) {
@@ -50,7 +49,7 @@ router.post('/', async(req, res) => {
         uri = `sip:${target.number}@${sbcAddress}`;
         to = target.number;
         if ('teams' === target.type) {
-          const obj = await lookupTeamsByAccount(accountSid);
+          const obj = await lookupTeamsByAccount(req.body.account_sid);
           if (!obj) throw new Error('dial to ms teams not allowed; account must first be configured with teams info');
           Object.assign(opts.headers, {
             'X-MS-Teams-FQDN': obj.ms_teams_fqdn,
@@ -148,22 +147,10 @@ router.post('/', async(req, res) => {
             return;
           }
           inviteReq.srf = srf;
-          inviteReq.locals = {
-            ...(inviteReq || {}),
-            callSid,
-            application_sid: app.application_sid
-          };
           /* ok our outbound INVITE is in flight */
 
           const tasks = [restDial];
-          const rootSpan = new RootSpan('rest-call', inviteReq);
-          sipLogger = logger.child({
-            callSid,
-            callId: inviteReq.get('Call-ID'),
-            accountSid,
-            traceId: rootSpan.traceId
-          });
-          app.requestor.logger = app.notifier.logger = sipLogger;
+          const rootSpan = new RootSpan('rest-call', req);
           const callInfo = new CallInfo({
             direction: CallDirection.Outbound,
             req: inviteReq,
@@ -172,10 +159,10 @@ router.post('/', async(req, res) => {
             callSid,
             accountSid: req.body.account_sid,
             applicationSid: app.application_sid,
-            traceId: rootSpan.traceId
+            traceId: this.rootSpan.traceId
           });
           cs = new RestCallSession({
-            logger: sipLogger,
+            logger,
             application: app,
             srf,
             req: inviteReq,
@@ -189,6 +176,10 @@ router.post('/', async(req, res) => {
 
           res.status(201).json({sid: cs.callSid});
 
+          sipLogger = logger.child({
+            callSid: cs.callSid,
+            callId: callInfo.callId
+          });
           sipLogger.info(`outbound REST call attempt to ${JSON.stringify(target)} has been sent`);
         },
         cbProvisional: (prov) => {

lib/middleware.js

@@ -235,20 +235,7 @@ module.exports = function(srf, logger) {
       }
       /* retrieve the application to execute for this inbound call */
       const params = Object.assign(['POST', 'WS'].includes(app.call_hook.method) ? {sip: req.msg} : {},
-        req.locals.callInfo, {
-          defaults: {
-            synthesizer: {
-              vendor: app.speech_synthesis_vendor,
-              language: app.speech_synthesis_language,
-              voice: app.speech_synthesis_voice
-            },
-            recognizer: {
-              vendor: app.speech_recognizer_vendor,
-              language: app.speech_recognizer_language
-            }
-          }
-        });
-      logger.debug({params}, 'sending initial webhook');
+        req.locals.callInfo);
       const obj = rootSpan.startChildSpan('performAppWebhook');
       span = obj.span;
       const b3 = rootSpan.getTracingPropagation();

lib/session/adulting-call-session.js

@@ -8,15 +8,14 @@ const CallSession = require('./call-session');
 
  */
 class AdultingCallSession extends CallSession {
-  constructor({logger, application, singleDialer, tasks, callInfo, accountInfo, rootSpan}) {
+  constructor({logger, application, singleDialer, tasks, callInfo, accountInfo}) {
     super({
       logger,
       application,
       srf: singleDialer.dlg.srf,
       tasks,
       callInfo,
-      accountInfo,
-      rootSpan
+      accountInfo
     });
     this.sd = singleDialer;
 

lib/session/call-session.js

@@ -254,7 +254,7 @@ class CallSession extends Emitter {
           this.backgroundGatherTask && this.backgroundGatherTask.removeAllListeners();
           this.backgroundGatherTask && this.backgroundGatherTask.span.end();
           this.backgroundGatherTask = null;
-          if (autoEnable && !this.callGone && !this._stopping) {
+          if (autoEnable && !this.callGone) {
             this.logger.info('CallSession:enableBotMode: restarting background gather');
             setImmediate(() => this.enableBotMode(gather, true));
           }
@@ -274,7 +274,7 @@ class CallSession extends Emitter {
     if (this.backgroundGatherTask) {
       try {
         this.backgroundGatherTask.removeAllListeners();
-        this.backgroundGatherTask.kill().catch((err) => {});
+        this.backgroundGatherTask.kill();
       } catch (err) {}
       this.backgroundGatherTask = null;
     }
@@ -331,7 +331,7 @@ class CallSession extends Emitter {
             speech_credential_sid: credential.speech_credential_sid,
             accessKeyId: credential.access_key_id,
             secretAccessKey: credential.secret_access_key,
-            region: credential.aws_region || process.env.AWS_REGION
+            region: process.env.AWS_REGION || credential.aws_region
           };
         }
         else if ('microsoft' === vendor) {
@@ -422,8 +422,6 @@ class CallSession extends Emitter {
 
     // all done - cleanup
     this.logger.info('CallSession:exec all tasks complete');
-    this._stopping = true;
-    this.disableBotMode();
     this._onTasksDone();
     this._clearResources();
 
@@ -763,49 +761,6 @@ class CallSession extends Emitter {
     this.taskIdx = 0;
   }
 
-  /**
-   * Append tasks to the current execution stack UNLESS there is a gather in the stack.
-   * in that case, insert the tasks before the gather AND if the tasks include
-   * a gather then delete/remove the gather from the existing stack
-   * @param {*} t array of tasks
-   */
-  _injectTasks(newTasks) {
-    const gatherPos = this.tasks.map((t) => t.name).indexOf(TaskName.Gather);
-    const currentlyExecutingGather = this.currentTask?.name === TaskName.Gather;
-
-    this.logger.debug({
-      currentTaskList: listTaskNames(this.tasks),
-      newContent: listTaskNames(newTasks),
-      currentlyExecutingGather,
-      gatherPos
-    }, 'CallSession:_injectTasks - starting');
-
-    const killGather = () => {
-      this.logger.debug('CallSession:_injectTasks - killing current gather because we have new content');
-      this.currentTask.kill(this);
-    };
-
-    if (-1 === gatherPos) {
-      /* no gather in the stack  simply append tasks */
-      this.tasks.push(...newTasks);
-      this.logger.debug({
-        updatedTaskList: listTaskNames(this.tasks)
-      }, 'CallSession:_injectTasks - completed (simple append)');
-
-      /* we do need to kill the current gather if we are executing one */
-      if (currentlyExecutingGather) killGather();
-      return;
-    }
-
-    if (currentlyExecutingGather) killGather();
-    const newTasksHasGather = newTasks.find((t) => t.name === TaskName.Gather);
-    this.tasks.splice(gatherPos, newTasksHasGather ? 1 : 0, ...newTasks);
-
-    this.logger.debug({
-      updatedTaskList: listTaskNames(this.tasks)
-    }, 'CallSession:_injectTasks - completed');
-  }
-
   _onCommand({msgid, command, call_sid, queueCommand, data}) {
     this.logger.info({msgid, command, queueCommand}, 'CallSession:_onCommand - received command');
     const resolution = {reason: 'received command', queue: queueCommand, command};
@@ -818,15 +773,10 @@ class CallSession extends Emitter {
             this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_onCommand new task list');
             this.replaceApplication(t);
           }
-          else if (process.env.JAMBONES_INJECT_CONTENT) {
-            this.logger.debug({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks (injecting content)');
-            this._injectTasks(t);
-            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
-          }
           else {
-            this.logger.debug({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks');
+            this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks');
             this.tasks.push(...t);
-            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
+            this.logger.debug({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
           }
           resolution.command = listTaskNames(t);
         }

lib/tasks/config.js

@@ -12,12 +12,11 @@ class TaskConfig extends Task {
       'bargeIn'
     ].forEach((k) => this[k] = this.data[k] || {});
 
-    if (this.bargeIn.enable) {
+    if (this.hasBargeIn && this.bargeIn.enable === true) {
       this.gatherOpts = {
         verb: 'gather',
         timeout: 0,
-        bargein: true,
-        input: ['speech']
+        bargein: true
       };
       [
         'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
@@ -25,9 +24,9 @@ class TaskConfig extends Task {
       ].forEach((k) => {
         if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
       });
+      if (this.bargeIn.sticky) this.autoEnable = true;
     }
-    if (this.bargeIn.sticky) this.autoEnable = true;
-    this.preconditions = this.bargeIn.enable ? TaskPreconditions.Endpoint : TaskPreconditions.None;
+    this.preconditions = this.hasBargeIn ? TaskPreconditions.Endpoint : TaskPreconditions.None;
   }
 
   get name() { return TaskName.Config; }
@@ -36,9 +35,11 @@ class TaskConfig extends Task {
 
   get hasRecognizer() { return Object.keys(this.recognizer).length; }
 
+  get hasBargeIn() { return Object.keys(this.bargeIn).length; }
+
   get summary() {
     const phrase = [];
-    if (this.bargeIn.enable) phrase.push('enable barge-in');
+    if (this.hasBargeIn) phrase.push('enable barge-in');
     if (this.hasSynthesizer) {
       const {vendor:v, language:l, voice} = this.synthesizer;
       const s = `{${v},${l},${voice}}`;
@@ -74,21 +75,16 @@ class TaskConfig extends Task {
       cs.speechRecognizerLanguage = this.recognizer.language !== 'default'
         ? this.recognizer.language
         : cs.speechRecognizerLanguage;
+      this.gatherOpts.recognizer = this.recognizer;
       this.logger.info({recognizer: this.recognizer}, 'Config: updated recognizer');
     }
-    if ('enable' in this.bargeIn) {
+    if (this.hasBargeIn) {
       if (this.gatherOpts) {
-        this.gatherOpts.recognizer = this.hasRecognizer ?
-          this.recognizer :
-          {
-            vendor: cs.speechRecognizerVendor,
-            language: cs.speechRecognizerLanguage
-          };
-        this.logger.info({opts: this.gatherOpts}, 'Config: enabling bargeIn');
+        this.logger.debug({opts: this.gatherOpts}, 'Config: enabling bargeIn');
         cs.enableBotMode(this.gatherOpts, this.autoEnable);
       }
       else {
-        this.logger.info('Config: disabling bargeIn');
+        this.logger.debug('Config: disabling bargeIn');
         cs.disableBotMode();
       }
     }

lib/tasks/dial.js

@@ -351,7 +351,7 @@ class TaskDial extends Task {
       const b3 = this.getTracingPropagation();
       const httpHeaders = b3 && {b3};
       this.logger.info({callSid}, `Dial:_onInfo triggered dtmf match: ${match}`);
-      requestor.request('verb:hook', this.dtmfHook, {dtmf: match, ...callInfo.toJSON()}, httpHeaders)
+      requestor.request('verb:hook', this.dtmfHook, {dtmf: match, ...callInfo.toJSON(), httpHeaders})
         .catch((err) => this.logger.info(err, 'Dial:_onDtmf - error'));
     }
   }
@@ -406,11 +406,11 @@ class TaskDial extends Task {
       this._killOutdials();
     }, this.timeout * 1000);
 
-    this.span.setAttributes({'dial.target': JSON.stringify(this.target)});
+    this.span.setAttributes('dial.target', JSON.stringify(this.target));
     this.target.forEach(async(t) => {
       try {
-        t.confirmHook = t.confirmHook || this.confirmHook;
-        //t.method = t.method || this.confirmMethod || 'POST';
+        t.url = t.url || this.confirmUrl;
+        t.method = t.method || this.confirmMethod || 'POST';
         if (t.type === 'teams') t.teamsInfo = teamsInfo;
         if (t.type === 'user' && !t.name.includes('@') && !fqdn) {
           const user = t.name;

lib/tasks/dialogflow/index.js

@@ -295,9 +295,9 @@ class Dialogflow extends Task {
     }
 
     // if a final transcription, start a typing sound
-    if (this.thinkingMusic && !transcription.isEmpty && transcription.isFinal &&
+    if (this.thinkingSound > 0 && !transcription.isEmpty && transcription.isFinal &&
       transcription.confidence > 0.8) {
-      ep.play(this.data.thinkingMusic).catch((err) => this.logger.info(err, 'Error playing typing sound'));
+      ep.play(this.data.thinkingSound).catch((err) => this.logger.info(err, 'Error playing typing sound'));
     }
 
     // interrupt playback on speaking if bargein = true
@@ -405,8 +405,8 @@ class Dialogflow extends Task {
     this.dtmfEntry = dtmfEntry;
     this.digitBuffer = null;
     // if a final transcription, start a typing sound
-    if (this.thinkingMusic) {
-      ep.play(this.thinkingMusic).catch((err) => this.logger.info(err, 'Error playing typing sound'));
+    if (this.thinkingSound > 0) {
+      ep.play(this.thinkingSound).catch((err) => this.logger.info(err, 'Error playing typing sound'));
     }
 
     // kill the current dialogflow, which will result in us getting an immediate intent

lib/tasks/gather.js

@@ -236,7 +236,7 @@ class TaskGather extends Task {
         GOOGLE_SPEECH_USE_ENHANCED: true,
         GOOGLE_SPEECH_SINGLE_UTTERANCE: true,
         GOOGLE_SPEECH_MODEL: 'command_and_search',
-        GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: !!this.punctuation
+        GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: this.punctuation
       });
       if (this.hints && this.hints.length > 1) {
         opts.GOOGLE_SPEECH_HINTS = this.hints.map((h) => h.trim()).join(',');
@@ -362,9 +362,7 @@ class TaskGather extends Task {
     if ('microsoft' === this.vendor) {
       const final = evt.RecognitionStatus === 'Success';
       if (final) {
-        // don't sort based on confidence: https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1463
-        //const nbest = evt.NBest.sort((a, b) => b.Confidence - a.Confidence);
-        const nbest = evt.NBest;
+        const nbest = evt.NBest.sort((a, b) => b.Confidence - a.Confidence);
         evt = {
           is_final: true,
           alternatives: [
@@ -387,7 +385,7 @@ class TaskGather extends Task {
       }
     }
     if (evt.is_final) {
-      if (evt.alternatives[0].transcript === '' && !this.callSession.callGone && !this.killed) {
+      if (evt.alternatives[0].transcript === '') {
         this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, listen again');
         return this._startTranscribing(ep);
       }
@@ -435,17 +433,15 @@ class TaskGather extends Task {
   }
 
   _onNoSpeechDetected(cs, ep) {
-    if (!this.callSession.callGone && !this.killed) {
-      this.logger.debug('TaskGather:_onNoSpeechDetected - listen again');
-      return this._startTranscribing(ep);
-    }
+    this._resolve('timeout');
   }
 
   async _resolve(reason, evt) {
-    this.logger.debug(`TaskGather:resolve with reason ${reason}`);
     if (this.resolved) return;
+    if (this.callSession && this.callSession.callGone) return;
 
     this.resolved = true;
+    this.logger.info(`TaskGather:resolve with reason ${reason}`);
     clearTimeout(this.interDigitTimer);
 
     this.span.setAttributes({'stt.resolve': reason, 'stt.result': JSON.stringify(evt)});
@@ -455,36 +451,27 @@ class TaskGather extends Task {
     }
 
     this._clearTimer();
-
-    if (this.callSession && this.callSession.callGone) {
-      this.logger.debug('TaskGather:_resolve - call is gone, not invoking web callback');
-      this.notifyTaskDone();
-      return;
+    if (reason.startsWith('dtmf')) {
+      if (this.parentTask) this.parentTask.emit('dtmf', evt);
+      else {
+        this.emit('dtmf', evt);
+        await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
+      }
     }
-
-    try {
-      if (reason.startsWith('dtmf')) {
-        if (this.parentTask) this.parentTask.emit('dtmf', evt);
-        else {
-          this.emit('dtmf', evt);
-          await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
-        }
+    else if (reason.startsWith('speech')) {
+      if (this.parentTask) this.parentTask.emit('transcription', evt);
+      else {
+        this.emit('transcription', evt);
+        await this.performAction({speech: evt, reason: 'speechDetected'});
       }
-      else if (reason.startsWith('speech')) {
-        if (this.parentTask) this.parentTask.emit('transcription', evt);
-        else {
-          this.emit('transcription', evt);
-          await this.performAction({speech: evt, reason: 'speechDetected'});
-        }
+    }
+    else if (reason.startsWith('timeout')) {
+      if (this.parentTask) this.parentTask.emit('timeout', evt);
+      else {
+        this.emit('timeout', evt);
+        await this.performAction({reason: 'timeout'});
       }
-      else if (reason.startsWith('timeout')) {
-        if (this.parentTask) this.parentTask.emit('timeout', evt);
-        else {
-          this.emit('timeout', evt);
-          await this.performAction({reason: 'timeout'});
-        }
-      }
-    } catch (err) {  /*already logged error*/ }
+    }
     this.notifyTaskDone();
   }
 }

lib/tasks/say.js

@@ -51,64 +51,55 @@ class TaskSay extends Task {
           alert_type: AlertType.TTS_NOT_PROVISIONED,
           vendor
         }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
-        this.notifyError(`No speech credentials have been provisioned for ${vendor}`);
         throw new Error('no provisioned speech credentials for TTS');
       }
       // synthesize all of the text elements
       let lastUpdated = false;
 
-      /* produce an audio segment from the provided text */
-      const generateAudio = async(text) => {
+      /* otel: trace time for tts */
+      const {span} = this.startChildSpan('tts-generation', {
+        'tts.vendor': vendor,
+        'tts.language': language,
+        'tts.voice': voice
+      });
+      this.ttsSpan = span;
+
+      const filepath = (await Promise.all(this.text.map(async(text) => {
         if (this.killed) return;
         if (text.startsWith('silence_stream://')) return text;
-
-        /* otel: trace time for tts */
-        const {span} = this.startChildSpan('tts-generation', {
-          'tts.vendor': vendor,
-          'tts.language': language,
-          'tts.voice': voice
-        });
-        try {
-          const {filePath, servedFromCache} = await synthAudio(stats, {
-            text,
-            vendor,
-            language,
-            voice,
-            engine,
-            salt,
-            credentials
-          });
-          this.logger.debug(`file ${filePath}, served from cache ${servedFromCache}`);
-          if (filePath) cs.trackTmpFile(filePath);
-          if (!servedFromCache && !lastUpdated) {
-            lastUpdated = true;
-            updateSpeechCredentialLastUsed(credentials.speech_credential_sid)
-              .catch(() => {/*already logged error */});
-          }
-          span.setAttributes({'tts.cached': servedFromCache});
-          span.end();
-          return filePath;
-        } catch (err) {
-          this.logger.info({err}, 'Error synthesizing tts');
-          span.end();
+        const {filePath, servedFromCache} = await synthAudio(stats, {
+          text,
+          vendor,
+          language,
+          voice,
+          engine,
+          salt,
+          credentials
+        }).catch((err) => {
+          this.logger.info(err, 'Error synthesizing tts');
           writeAlerts({
             account_sid: cs.accountSid,
             alert_type: AlertType.TTS_NOT_PROVISIONED,
             vendor,
             detail: err.message
-          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
-          this.notifyError(err.message || err);
-          return;
+          });
+        }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
+        this.logger.debug(`file ${filePath}, served from cache ${servedFromCache}`);
+        if (filePath) cs.trackTmpFile(filePath);
+        if (!servedFromCache && !lastUpdated) {
+          lastUpdated = true;
+          updateSpeechCredentialLastUsed(credentials.speech_credential_sid)
+            .catch(() => {/*already logged error */});
         }
-      };
-
-      const arr = this.text.map((t) => generateAudio(t));
-      const filepath = (await Promise.all(arr)).filter((fp) => fp && fp.length);
+        this.ttsSpan.setAttributes({'tts.cached': servedFromCache});
+        return filePath;
+      }))).filter((fp) => fp && fp.length);
+      this.ttsSpan?.end();
       this.logger.debug({filepath}, 'synthesized files for tts');
 
       while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
         let segment = 0;
-        while (!this.killed && segment < filepath.length) {
+        do {
           if (cs.isInConference) {
             const {memberId, confName, confUuid} = cs;
             await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
@@ -118,10 +109,10 @@ class TaskSay extends Task {
             await ep.play(filepath[segment]);
             this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
           }
-          segment++;
-        }
+        } while (!this.killed && ++segment < filepath.length);
       }
     } catch (err) {
+      this.ttsSpan?.end();
       this.logger.info(err, 'TaskSay:exec error');
     }
     this.emit('playDone');

lib/tasks/task.js

@@ -137,12 +137,6 @@ class Task extends Emitter {
     return this.callSession.normalizeUrl(url, method, auth);
   }
 
-  notifyError(errMsg) {
-    const params = {error: errMsg, verb: this.name};
-    this.cs.requestor.request('jambonz:error', '/error', params)
-      .catch((err) => this.logger.info({err}, 'Task:notifyError error sending error'));
-  }
-
   async performAction(results, expectResponse = true) {
     if (this.actionHook) {
       const params = results ? Object.assign(results, this.cs.callInfo.toJSON()) : this.cs.callInfo.toJSON();

lib/tasks/transcribe.js

@@ -253,11 +253,6 @@ class TaskTranscribe extends Task {
       evt = newEvent;
     }
 
-    if (evt.alternatives[0].transcript === '' && !cs.callGone && !this.killed) {
-      this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, listen again');
-      return this._transcribe(ep);
-    }
-
     if (this.transcriptionHook) {
       const b3 = this.getTracingPropagation();
       const httpHeaders = b3 && {b3};

lib/utils/constants.json

@@ -115,7 +115,6 @@
     "session:redirect",
     "call:status",
     "queue:status",
-    "dial:confirm",
     "verb:hook",
     "jambonz:error"
   ],

lib/utils/http-requestor.js

@@ -50,11 +50,7 @@ class HttpRequestor extends BaseRequestor {
    * @param {object} [params] - request parameters
    */
   async request(type, hook, params, httpHeaders = {}) {
-    /* jambonz:error only sent over ws */
-    if (type === 'jambonz:error') return;
-
     assert(HookMsgTypes.includes(type));
-
     const payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
     const url = hook.url || hook;
     const method = hook.method || 'POST';

lib/utils/install-srf-locals.js

@@ -1,5 +1,6 @@
 const Mrf = require('drachtio-fsmrf');
 const ip = require('ip');
+const localIp = ip.address();
 const PORT = process.env.HTTP_PORT || 3000;
 const assert = require('assert');
 
@@ -166,13 +167,6 @@ function installSrfLocals(srf, logger) {
     commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
   });
 
-  let localIp;
-  try {
-    localIp = ip.address();
-  } catch (err) {
-    logger.error({err}, 'installSrfLocals - error detecting local ipv4 address');
-  }
-
   srf.locals = {...srf.locals,
     dbHelpers: {
       client,
@@ -207,6 +201,8 @@ function installSrfLocals(srf, logger) {
       getListPosition
     },
     parentLogger: logger,
+    ipv4: localIp,
+    serviceUrl: `http://${localIp}:${PORT}`,
     getSBC,
     getSmpp: () => {
       return process.env.SMPP_URL;
@@ -217,11 +213,6 @@ function installSrfLocals(srf, logger) {
     writeAlerts,
     AlertType
   };
-
-  if (localIp) {
-    srf.locals.ipv4 = localIp;
-    srf.locals.serviceUrl = `http://${localIp}:${PORT}`;
-  }
 }
 
 module.exports = installSrfLocals;

lib/utils/place-outdial.js

@@ -4,8 +4,6 @@ const SipError = require('drachtio-srf').SipError;
 const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
 const assert = require('assert');
-const normalizeJambones = require('../utils/normalize-jambones');
-const makeTask = require('../tasks/make_task');
 const ConfirmCallSession = require('../session/confirm-call-session');
 const AdultingCallSession = require('../session/adulting-call-session');
 const deepcopy = require('deepcopy');
@@ -311,8 +309,8 @@ class SingleDialer extends Emitter {
   async _executeApp(confirmHook) {
     try {
       // retrieve set of tasks
-      const json = await this.requestor.request('dial:confirm', confirmHook, this.callInfo.toJSON());
-      const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
+      const tasks = await this.requestor.request(confirmHook, this.callInfo.toJSON());
+
       // verify it contains only allowed verbs
       const allowedTasks = tasks.filter((task) => {
         return [
@@ -332,7 +330,6 @@ class SingleDialer extends Emitter {
         dlg: this.dlg,
         ep: this.ep,
         callInfo: this.callInfo,
-        accountInfo: this.accountInfo,
         tasks,
         rootSpan: this.rootSpan
       });
@@ -348,6 +345,7 @@ class SingleDialer extends Emitter {
   }
 
   async doAdulting({logger, tasks, application}) {
+    this.logger = logger;
     this.adulting = true;
     this.emit('adulting');
     if (this.ep) {
@@ -362,9 +360,8 @@ class SingleDialer extends Emitter {
     this.dlg.callSid = this.callSid;
     this.dlg.linkedSpanId = this.rootSpan.traceId;
     const rootSpan = new RootSpan('outbound-call', this.dlg);
-    const newLogger = logger.child({traceId: rootSpan.traceId});
     const cs = new AdultingCallSession({
-      logger: newLogger,
+      logger: this.logger,
       singleDialer: this,
       application,
       callInfo: this.callInfo,
@@ -372,7 +369,7 @@ class SingleDialer extends Emitter {
       tasks,
       rootSpan
     });
-    cs.exec().catch((err) => newLogger.error({err}, 'doAdulting: error executing session'));
+    cs.exec();
     return cs;
   }
 

lib/utils/ws-requestor.js

@@ -105,7 +105,6 @@ class WsRequestor extends BaseRequestor {
       /* save the message info for reply */
       const startAt = process.hrtime();
       this.messagesInFlight.set(msgid, {
-        timer,
         success: (response) => {
           clearTimeout(timer);
           const rtt = this._roundTrip(startAt);
@@ -136,8 +135,6 @@ class WsRequestor extends BaseRequestor {
       }
 
       for (const [msgid, obj] of this.messagesInFlight) {
-        const {timer} = obj;
-        clearTimeout(timer);
         obj.failure(`abandoning msgid ${msgid} since we have closed the socket`);
       }
       this.messagesInFlight.clear();
@@ -261,7 +258,7 @@ class WsRequestor extends BaseRequestor {
           assert.ok(false, `invalid type property: ${type}`);
       }
     } catch (err) {
-      this.logger.info({err, content}, 'WsRequestor:_onMessage - invalid incoming message');
+      this.logger.info({err}, 'WsRequestor:_onMessage - invalid incoming message');
     }
   }
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jambonz-feature-server",
-  "version": "v0.7.5",
+  "version": "v0.7.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "jambonz-feature-server",
-      "version": "v0.7.5",
+      "version": "v0.7.4",
       "license": "MIT",
       "dependencies": {
         "@cognigy/socket-client": "^4.5.5",
@@ -17,8 +17,8 @@
         "@jambonz/stats-collector": "^0.1.6",
         "@jambonz/time-series": "^0.1.6",
         "@opentelemetry/api": "^1.1.0",
+        "@opentelemetry/exporter-collector": "^0.25.0",
         "@opentelemetry/exporter-jaeger": "^1.1.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
         "@opentelemetry/exporter-zipkin": "^1.1.0",
         "@opentelemetry/instrumentation": "^0.27.0",
         "@opentelemetry/instrumentation-express": "^0.28.0",
@@ -38,7 +38,7 @@
         "express": "^4.17.1",
         "helmet": "^5.0.2",
         "ip": "^1.1.5",
-        "moment": "^2.29.2",
+        "moment": "^2.29.1",
         "parse-url": "^5.0.7",
         "pino": "^6.13.4",
         "short-uuid": "^4.2.0",
@@ -636,6 +636,105 @@
         "@opentelemetry/api": ">=1.0.0 <1.2.0"
       }
     },
+    "node_modules/@opentelemetry/exporter-collector": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-collector/-/exporter-collector-0.25.0.tgz",
+      "integrity": "sha512-xZYstLt4hz1aTloJaepWdjMMf9305MqwqbUWjcU/X9pOxvgFWRlchO6x/HQTw7ow0i/S+ShzC+greKnb+1WvLA==",
+      "deprecated": "Please use trace and metric specific exporters @opentelemetry/exporter-trace-otlp-http and @opentelemetry/exporter-metrics-otlp-http",
+      "dependencies": {
+        "@opentelemetry/api-metrics": "0.25.0",
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/resources": "0.25.0",
+        "@opentelemetry/sdk-metrics-base": "0.25.0",
+        "@opentelemetry/sdk-trace-base": "0.25.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/api-metrics": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz",
+      "integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==",
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/core": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz",
+      "integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "0.25.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=8.5.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/resources": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz",
+      "integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==",
+      "dependencies": {
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/semantic-conventions": "0.25.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/sdk-trace-base": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-0.25.0.tgz",
+      "integrity": "sha512-TInkLSF/ThM3GNVM+9tgnCVjyNLnRxvAkG585Fhu0HNwaEtCTUwI0r7AvMRIREOreeRWttBG6kvT0LOKdo8yjw==",
+      "dependencies": {
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/resources": "0.25.0",
+        "@opentelemetry/semantic-conventions": "0.25.0",
+        "lodash.merge": "^4.6.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz",
+      "integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-collector/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@opentelemetry/exporter-jaeger": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-jaeger/-/exporter-jaeger-1.1.0.tgz",
@@ -653,75 +752,6 @@
         "@opentelemetry/api": "^1.0.3"
       }
     },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.27.0.tgz",
-      "integrity": "sha512-ZE8Ns/GGW83E4igrby69shiqEkVo+cULzbm4DprSEMCWrPAL/NBobETFOiOQyBBBgIfrhi5EG6truUiafB1cMQ==",
-      "dependencies": {
-        "@opentelemetry/core": "1.0.1",
-        "@opentelemetry/resources": "1.0.1",
-        "@opentelemetry/sdk-trace-base": "1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/core": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.0.1.tgz",
-      "integrity": "sha512-90nQ2X6b/8X+xjcLDBYKooAcOsIlwLRYm+1VsxcX5cHl6V4CSVmDpBreQSDH/A21SqROzapk6813008SatmPpQ==",
-      "dependencies": {
-        "@opentelemetry/semantic-conventions": "1.0.1"
-      },
-      "engines": {
-        "node": ">=8.5.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.1.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/resources": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.0.1.tgz",
-      "integrity": "sha512-p8DevOaAEepPucUtImR4cZKHOE2L1jgQAtkdZporV+XnxPA/HqCHPEESyUVuo4f5M0NUlL6k5Pba75KwNJlTRg==",
-      "dependencies": {
-        "@opentelemetry/core": "1.0.1",
-        "@opentelemetry/semantic-conventions": "1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.1.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/sdk-trace-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.0.1.tgz",
-      "integrity": "sha512-JVSAepTpW7dnqfV7XFN0zHj1jXGNd5OcvIGQl76buogqffdgJdgJWQNrOuUJaus56zrOtlzqFH+YtMA9RGEg8w==",
-      "dependencies": {
-        "@opentelemetry/core": "1.0.1",
-        "@opentelemetry/resources": "1.0.1",
-        "@opentelemetry/semantic-conventions": "1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.1.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.0.1.tgz",
-      "integrity": "sha512-7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@opentelemetry/exporter-zipkin": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.1.0.tgz",
@@ -901,6 +931,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/@opentelemetry/propagator-b3": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz",
+      "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==",
+      "dependencies": {
+        "@opentelemetry/core": "1.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.2.0"
+      }
+    },
     "node_modules/@opentelemetry/propagator-jaeger": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-jaeger/-/propagator-jaeger-1.1.0.tgz",
@@ -930,6 +974,86 @@
         "@opentelemetry/api": ">=1.0.0 <1.2.0"
       }
     },
+    "node_modules/@opentelemetry/sdk-metrics-base": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics-base/-/sdk-metrics-base-0.25.0.tgz",
+      "integrity": "sha512-7fwPlAFB5Xw8mnVQfq0wqKNw3RXiAMad9T1bk5Sza9LK/L6hz8RTuHWCsFMsj+1OOSAaiPFuUMYrK1J75+2IAg==",
+      "dependencies": {
+        "@opentelemetry/api-metrics": "0.25.0",
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/resources": "0.25.0",
+        "lodash.merge": "^4.6.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/api-metrics": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz",
+      "integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==",
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/core": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz",
+      "integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "0.25.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=8.5.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/resources": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz",
+      "integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==",
+      "dependencies": {
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/semantic-conventions": "0.25.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.2"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz",
+      "integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics-base/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@opentelemetry/sdk-trace-base": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.1.0.tgz",
@@ -965,20 +1089,6 @@
         "@opentelemetry/api": ">=1.1.0 <1.2.0"
       }
     },
-    "node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/propagator-b3": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz",
-      "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==",
-      "dependencies": {
-        "@opentelemetry/core": "1.1.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.2.0"
-      }
-    },
     "node_modules/@opentelemetry/sdk-trace-node/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -4021,6 +4131,11 @@
       "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
     "node_modules/long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -4199,9 +4314,9 @@
       "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is="
     },
     "node_modules/moment": {
-      "version": "2.29.2",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
-      "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
       "engines": {
         "node": "*"
       }
@@ -6670,6 +6785,68 @@
         "@opentelemetry/semantic-conventions": "1.1.0"
       }
     },
+    "@opentelemetry/exporter-collector": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-collector/-/exporter-collector-0.25.0.tgz",
+      "integrity": "sha512-xZYstLt4hz1aTloJaepWdjMMf9305MqwqbUWjcU/X9pOxvgFWRlchO6x/HQTw7ow0i/S+ShzC+greKnb+1WvLA==",
+      "requires": {
+        "@opentelemetry/api-metrics": "0.25.0",
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/resources": "0.25.0",
+        "@opentelemetry/sdk-metrics-base": "0.25.0",
+        "@opentelemetry/sdk-trace-base": "0.25.0"
+      },
+      "dependencies": {
+        "@opentelemetry/api-metrics": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz",
+          "integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==",
+          "requires": {}
+        },
+        "@opentelemetry/core": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz",
+          "integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==",
+          "requires": {
+            "@opentelemetry/semantic-conventions": "0.25.0",
+            "semver": "^7.3.5"
+          }
+        },
+        "@opentelemetry/resources": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz",
+          "integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==",
+          "requires": {
+            "@opentelemetry/core": "0.25.0",
+            "@opentelemetry/semantic-conventions": "0.25.0"
+          }
+        },
+        "@opentelemetry/sdk-trace-base": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-0.25.0.tgz",
+          "integrity": "sha512-TInkLSF/ThM3GNVM+9tgnCVjyNLnRxvAkG585Fhu0HNwaEtCTUwI0r7AvMRIREOreeRWttBG6kvT0LOKdo8yjw==",
+          "requires": {
+            "@opentelemetry/core": "0.25.0",
+            "@opentelemetry/resources": "0.25.0",
+            "@opentelemetry/semantic-conventions": "0.25.0",
+            "lodash.merge": "^4.6.2"
+          }
+        },
+        "@opentelemetry/semantic-conventions": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz",
+          "integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg=="
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "@opentelemetry/exporter-jaeger": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-jaeger/-/exporter-jaeger-1.1.0.tgz",
@@ -6681,50 +6858,6 @@
         "jaeger-client": "^3.15.0"
       }
     },
-    "@opentelemetry/exporter-trace-otlp-http": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.27.0.tgz",
-      "integrity": "sha512-ZE8Ns/GGW83E4igrby69shiqEkVo+cULzbm4DprSEMCWrPAL/NBobETFOiOQyBBBgIfrhi5EG6truUiafB1cMQ==",
-      "requires": {
-        "@opentelemetry/core": "1.0.1",
-        "@opentelemetry/resources": "1.0.1",
-        "@opentelemetry/sdk-trace-base": "1.0.1"
-      },
-      "dependencies": {
-        "@opentelemetry/core": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.0.1.tgz",
-          "integrity": "sha512-90nQ2X6b/8X+xjcLDBYKooAcOsIlwLRYm+1VsxcX5cHl6V4CSVmDpBreQSDH/A21SqROzapk6813008SatmPpQ==",
-          "requires": {
-            "@opentelemetry/semantic-conventions": "1.0.1"
-          }
-        },
-        "@opentelemetry/resources": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.0.1.tgz",
-          "integrity": "sha512-p8DevOaAEepPucUtImR4cZKHOE2L1jgQAtkdZporV+XnxPA/HqCHPEESyUVuo4f5M0NUlL6k5Pba75KwNJlTRg==",
-          "requires": {
-            "@opentelemetry/core": "1.0.1",
-            "@opentelemetry/semantic-conventions": "1.0.1"
-          }
-        },
-        "@opentelemetry/sdk-trace-base": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.0.1.tgz",
-          "integrity": "sha512-JVSAepTpW7dnqfV7XFN0zHj1jXGNd5OcvIGQl76buogqffdgJdgJWQNrOuUJaus56zrOtlzqFH+YtMA9RGEg8w==",
-          "requires": {
-            "@opentelemetry/core": "1.0.1",
-            "@opentelemetry/resources": "1.0.1",
-            "@opentelemetry/semantic-conventions": "1.0.1"
-          }
-        },
-        "@opentelemetry/semantic-conventions": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.0.1.tgz",
-          "integrity": "sha512-7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg=="
-        }
-      }
-    },
     "@opentelemetry/exporter-zipkin": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.1.0.tgz",
@@ -6853,6 +6986,14 @@
         }
       }
     },
+    "@opentelemetry/propagator-b3": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz",
+      "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==",
+      "requires": {
+        "@opentelemetry/core": "1.1.0"
+      }
+    },
     "@opentelemetry/propagator-jaeger": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-jaeger/-/propagator-jaeger-1.1.0.tgz",
@@ -6870,6 +7011,56 @@
         "@opentelemetry/semantic-conventions": "1.1.0"
       }
     },
+    "@opentelemetry/sdk-metrics-base": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics-base/-/sdk-metrics-base-0.25.0.tgz",
+      "integrity": "sha512-7fwPlAFB5Xw8mnVQfq0wqKNw3RXiAMad9T1bk5Sza9LK/L6hz8RTuHWCsFMsj+1OOSAaiPFuUMYrK1J75+2IAg==",
+      "requires": {
+        "@opentelemetry/api-metrics": "0.25.0",
+        "@opentelemetry/core": "0.25.0",
+        "@opentelemetry/resources": "0.25.0",
+        "lodash.merge": "^4.6.2"
+      },
+      "dependencies": {
+        "@opentelemetry/api-metrics": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz",
+          "integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==",
+          "requires": {}
+        },
+        "@opentelemetry/core": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz",
+          "integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==",
+          "requires": {
+            "@opentelemetry/semantic-conventions": "0.25.0",
+            "semver": "^7.3.5"
+          }
+        },
+        "@opentelemetry/resources": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz",
+          "integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==",
+          "requires": {
+            "@opentelemetry/core": "0.25.0",
+            "@opentelemetry/semantic-conventions": "0.25.0"
+          }
+        },
+        "@opentelemetry/semantic-conventions": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz",
+          "integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg=="
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "@opentelemetry/sdk-trace-base": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.1.0.tgz",
@@ -6893,14 +7084,6 @@
         "semver": "^7.3.5"
       },
       "dependencies": {
-        "@opentelemetry/propagator-b3": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz",
-          "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==",
-          "requires": {
-            "@opentelemetry/core": "1.1.0"
-          }
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -9307,6 +9490,11 @@
       "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
       "dev": true
     },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
     "long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -9435,9 +9623,9 @@
       "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is="
     },
     "moment": {
-      "version": "2.29.2",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
-      "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "ms": {
       "version": "2.1.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "v0.7.5",
+  "version": "v0.7.4",
   "main": "app.js",
   "engines": {
     "node": ">= 10.16.0"
@@ -34,8 +34,8 @@
     "@jambonz/stats-collector": "^0.1.6",
     "@jambonz/time-series": "^0.1.6",
     "@opentelemetry/api": "^1.1.0",
+    "@opentelemetry/exporter-collector": "^0.25.0",
     "@opentelemetry/exporter-jaeger": "^1.1.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
     "@opentelemetry/exporter-zipkin": "^1.1.0",
     "@opentelemetry/instrumentation": "^0.27.0",
     "@opentelemetry/instrumentation-express": "^0.28.0",
@@ -55,7 +55,7 @@
     "express": "^4.17.1",
     "helmet": "^5.0.2",
     "ip": "^1.1.5",
-    "moment": "^2.29.2",
+    "moment": "^2.29.1",
     "parse-url": "^5.0.7",
     "pino": "^6.13.4",
     "short-uuid": "^4.2.0",

tracer.js

@@ -6,7 +6,7 @@ const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventi
 const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
-const  { OTLPTraceExporter } = require ('@opentelemetry/exporter-trace-otlp-http');
+const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector');
 //const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 //const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
 //const { PinoInstrumentation } = require('@opentelemetry/instrumentation-pino');
@@ -29,7 +29,7 @@ module.exports = (serviceName) => {
       exporter = new ZipkinExporter({url:process.env.OTEL_EXPORTER_ZIPKIN_URL});
     }
     else {
-      exporter = new OTLPTraceExporter({
+      exporter = new CollectorTraceExporter({
         url: process.OTEL_EXPORTER_COLLECTOR_URL
       });
     }