From e67cb18b6d59b7a7549d1a9f1e1967bee87692d1 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Tue, 11 Apr 2023 16:31:53 -0400 Subject: [PATCH] fix bug from prev commit --- lib/config.js | 2 ++ package.json | 4 ++-- tracer.js | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/config.js b/lib/config.js index f47a8d12..7dd1b1d3 100644 --- a/lib/config.js +++ b/lib/config.js @@ -64,6 +64,7 @@ const JAMBONES_ESL_LISTEN_ADDRESS = process.env.JAMBONES_ESL_LISTEN_ADDRESS; const JAMBONES_OTEL_ENABLED = process.env.JAMBONES_OTEL_ENABLED; const JAMBONES_OTEL_SERVICE_NAME = process.env.JAMBONES_OTEL_SERVICE_NAME || 'jambonz-feature-server'; const OTEL_EXPORTER_JAEGER_AGENT_HOST = process.env.OTEL_EXPORTER_JAEGER_AGENT_HOST; +const OTEL_EXPORTER_JAEGER_ENDPOINT = process.env.OTEL_EXPORTER_JAEGER_ENDPOINT; const OTEL_EXPORTER_ZIPKIN_URL = process.env.OTEL_EXPORTER_ZIPKIN_URL; const OTEL_EXPORTER_COLLECTOR_URL = process.env.OTEL_EXPORTER_COLLECTOR_URL; @@ -147,6 +148,7 @@ module.exports = { JAMBONES_OTEL_ENABLED, JAMBONES_OTEL_SERVICE_NAME, OTEL_EXPORTER_JAEGER_AGENT_HOST, + OTEL_EXPORTER_JAEGER_ENDPOINT, OTEL_EXPORTER_ZIPKIN_URL, OTEL_EXPORTER_COLLECTOR_URL, diff --git a/package.json b/package.json index b7ad4548..ecf3a306 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "start": "node app", "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ", "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test", - "jslint": "eslint app.js lib", - "jslint:fix": "eslint app.js lib --fix" + "jslint": "eslint app.js tracer.js lib", + "jslint:fix": "eslint app.js tracer.js lib --fix" }, "dependencies": { "@jambonz/db-helpers": "^0.7.4", diff --git a/tracer.js b/tracer.js index e4e65680..3f546b81 100644 --- a/tracer.js +++ b/tracer.js @@ -7,10 +7,11 @@ 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 { - JAMBONES_OTEL_ENABLED, +const { + JAMBONES_OTEL_ENABLED, OTEL_EXPORTER_JAEGER_AGENT_HOST, - OTEL_EXPORTER_ZIPKIN_URL, + OTEL_EXPORTER_JAEGER_ENDPOINT, + OTEL_EXPORTER_ZIPKIN_URL, } = require('./lib/config'); module.exports = (serviceName) => {