Fix jaeger: postgres is now child of route span, jaeger config update…

… to work with docker
Open-IoT-Service-Platform · Jan 14, 2019 · ace761c · ace761c
1 parent 5b0aa8b
commit ace761c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/public-interface/app.js b/public-interface/app.js
@@ -61,10 +61,9 @@ appServer.set('env', ENV);
 appServer.set('port', api_port);
 appServer.disable('x-powered-by');
 appServer.enable('trust proxy');
-appServer.use(bodyParser.json({limit: config.api.bodySizeLimit}));
-appServer.use(bodyParser.urlencoded({extended: true, limit: config.api.bodySizeLimit}));
 appServer.use(favicon(__dirname + '/dashboard/public/favicon.png'));
-appServer.registerHttpContextAndStartTracing();
+appServer.use(contextProvider.middleware);
+appServer.startTracing();
 appServer.use(compress());
 if (config.api.forceSSL) {
     appServer.use(forceSSL);
@@ -74,7 +73,6 @@ if (config.api.forceSSL) {
 appServer.use('/ui/public', express.static('dashboard/public'));
 
 appServer.use(httpHeadersInjector.forwardedHeaders);
-appServer.use(contextProvider.middleware);
 appServer.use(bodyParser.json({limit: config.api.bodySizeLimit}));
 appServer.use(bodyParser.urlencoded({extended: true, limit: config.api.bodySizeLimit}));
 appServer.use(XSS());

diff --git a/public-interface/iot-entities/postgresql/models/index.js b/public-interface/iot-entities/postgresql/models/index.js
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 'use strict';
-var httpContext = require('express-http-context'),
-    tracer = require('../../../lib/express-jaeger/').tracer,
+var contextProvider = require('../../../lib/context-provider').instance(),
+    expressJaeger = require('../../../lib/express-jaeger'),
+    tracer = expressJaeger.tracer,
     Sequelize = require('sequelize'),
     config = require('../../../config').postgres,
     accounts = require('./accounts'),
@@ -61,8 +62,8 @@ var sequelize = new Sequelize(
 var origQueryFunc = sequelize.query;
 function patchQuery() {
     return function(sql, options) {
-        var initSpan = httpContext.get('initSpan');
-        var span = tracer.startSpan('postgres-call', { childOf: initSpan });
+        var routeSpan = contextProvider.get('routeSpan');
+        var span = tracer.startSpan('postgres-call', { childOf: routeSpan });
         return origQueryFunc.apply(this, arguments).then(
             result => {
                 span.finish();

diff --git a/public-interface/lib/express-jaeger/jaeger-tracer.js b/public-interface/lib/express-jaeger/jaeger-tracer.js
@@ -10,6 +10,8 @@ var initTracer = function(serviceName) {
         },
         reporter: {
             logSpans: true,
+            agentHost: "jaeger",
+            agentPort: 6832
         },
     };
     const options = {
@@ -18,7 +20,7 @@ var initTracer = function(serviceName) {
                 console.log("INFO ", msg);
             },
             error(msg) {
-                console.log("ERROR", msg);
+                console.log("ERROR ", msg);
             },
         },
     };

diff --git a/public-interface/lib/express-jaeger/traced-express.js b/public-interface/lib/express-jaeger/traced-express.js
@@ -1,8 +1,8 @@
-var httpContext = require('express-http-context'),
+var contextProvider = require('../../lib/context-provider').instance(),
     express = require('express'),
     tracer = require('./jaeger-tracer');
 
-var httpContextRegistered = false;
+var contextRegistered = false;
 
 var startRequest = function(req, res, next) {
     const span = tracer.startSpan('start-request');
@@ -12,8 +12,8 @@ var startRequest = function(req, res, next) {
     const middlewareSpan = tracer.startSpan('middleware', { childOf: span });
     const routeSpan = tracer.startSpan(req.path, { childOf: span });
     routeSpan.setTag(req.method);
-    httpContext.set('middlewareSpan', middlewareSpan);
-    httpContext.set('routeSpan', routeSpan);
+    contextProvider.set('middlewareSpan', middlewareSpan);
+    contextProvider.set('routeSpan', routeSpan);
     res.on('finish', function() {
         span.log({
             event: 'request finish'
@@ -34,10 +34,9 @@ var useOriginal = express.application.use,
     deleteOriginal = express.application.delete,
     allOriginal = express.application.all;
 
-express.application['registerHttpContextAndStartTracing'] = function() {
-    useOriginal.apply(this, ['/', httpContext.middleware]);
+express.application['startTracing'] = function() {
     useOriginal.apply(this, ['/', startRequest]);
-    httpContextRegistered = true;
+    contextRegistered = true;
 };
 
 var patchMiddlewares = function(middlewares, startIndex, method, parentSpanName) {
@@ -49,7 +48,7 @@ var patchMiddlewares = function(middlewares, startIndex, method, parentSpanName)
             var serviceName = middlewares[i].name;
             var spanTransform = function(service, name) {
                 return function(req, res, next) {
-                    const parentSpan = httpContext.get(parentSpanName);
+                    const parentSpan = contextProvider.get(parentSpanName);
                     const span = tracer.startSpan(name, {
                         childOf: parentSpan
                     });
@@ -65,7 +64,7 @@ var patchMiddlewares = function(middlewares, startIndex, method, parentSpanName)
 
 var forkedRegister = function(original, method, parentSpanName) {
     return function() {
-        if (httpContextRegistered) {
+        if (contextRegistered) {
             var path = typeof arguments[0] === "string" ? arguments[0] : '/';
             var start = typeof arguments[0] === "string" ? 1 : 0;
             patchMiddlewares(arguments, start, method, parentSpanName);