Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Fix Bug: Incorrect parenthood handling of postgres, data-send, redis … #103

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix Bug: Incorrect parenthood handling of postgres, data-send, redis … #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions public-interface/iot-entities/postgresql/models/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,8 @@ function wrapQuery(original) {
/*jshint -W098 */
return function wrappedQuery (sql, options) {
const context = contextProvider.instance();
var fatherSpan = context.get(spanContext.parent);
// Track if request coming from express
if (!fatherSpan)
{fatherSpan = {};}
var span = tracer.startSpan('postgres-call', { childOf: fatherSpan.span });
var fatherSpan = context.get(spanContext.active);
var span = tracer.startSpan('postgres-call', { childOf: fatherSpan });
span.log({
event: 'postgres query',
query: sql
Expand Down
7 changes: 2 additions & 5 deletions public-interface/iot-entities/redis/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ var config = require('../../config'),
function wrapSend(original) {
return function wrappedSend(commandObj) {
const context = contextProvider.instance();
var fatherSpan = context.get(spanContext.parent);
// Track if request coming from express
if (!fatherSpan)
{fatherSpan = {};}
var span = tracer.startSpan('redis-call', { childOf: fatherSpan.span });
var fatherSpan = context.get(spanContext.active);
var span = tracer.startSpan('redis-call', { childOf: fatherSpan });
span.log({
event: 'redis command',
command: commandObj.command
Expand Down
18 changes: 3 additions & 15 deletions public-interface/lib/advancedanalytics-proxy/data-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var MQTTConnector = require('./../../lib/mqtt'),
request = require('request'),
util = require('../dateUtil'),
logger = require('../logger').init(),
contextProvider = require('./../context-provider'),
context = require('./../context-provider').instance(),
tracer = require('./../express-jaeger').tracer,
spanContext = require('./../express-jaeger').spanContext,
opentracing = require('opentracing'),
Expand Down Expand Up @@ -70,21 +70,14 @@ var buildICFALMessage = function(data) {
};

function createSpan(name) {
const context = contextProvider.instance();
if (!jaegerConfig.tracing) {
return null;
}
var fatherSpan = context.get(spanContext.parent);
var fatherSpan = context.get(spanContext.active);
if (!fatherSpan) {
// something is wrong
logger.warn('Span must be dropped due to no father is present');
var rootSpan = context.get(spanContext.root);
if (rootSpan) {
rootSpan.setTag(opentracing.Tags.SAMPLING_PRIORITY, 0);
}
return null;
}
const span = tracer.startSpan(name, { childOf: fatherSpan.span });
const span = tracer.startSpan(name, { childOf: fatherSpan });
return span;
}

Expand Down Expand Up @@ -156,7 +149,6 @@ module.exports = function(config) {
};

this.submitDataREST = function(data, callback) {
const context = contextProvider.instance();
const span = createSpan('submitDataRest');

var dataMetric = new Metric();
Expand Down Expand Up @@ -239,7 +231,6 @@ module.exports = function(config) {
};

this.dataInquiry = function(data, callback){
const context = contextProvider.instance();
const span = createSpan('dataInquiry');

var dataInquiryMessage = buildDIMessage(data);
Expand Down Expand Up @@ -296,7 +287,6 @@ module.exports = function(config) {
};

this.dataInquiryAdvanced = function(data, callback) {
const context = contextProvider.instance();
const span = createSpan('dataInquiryAdvanced');

var accountId = data.accountId;
Expand Down Expand Up @@ -360,7 +350,6 @@ module.exports = function(config) {
};

this.report = function(data, callback) {
const context = contextProvider.instance();
const span = createSpan('dataReport');

var domainId = data.domainId;
Expand Down Expand Up @@ -407,7 +396,6 @@ module.exports = function(config) {
};

this.getFirstAndLastMeasurement = function(data, callback) {
const context = contextProvider.instance();
const span = createSpan('getFirstAndLastMeasurement');

var domainId = data.domainId;
Expand Down