Skip to content

Commit

Permalink
fix(jaeger): do not use built=in opentracing
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Marton committed Jul 4, 2017
1 parent 9f94cdf commit cfcc137
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 6 deletions.
7 changes: 6 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"jaeger-client": "3.5.3",
"lodash": "4.17.4",
"methods": "1.1.2",
"opentracing": "0.14.1",
"require-in-the-middle": "2.1.2",
"semver": "5.3.0",
"shimmer": "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/instrumentation/express.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const opentracing = require('opentracing')
const shimmer = require('shimmer')
const { opentracing } = require('jaeger-client')
const methods = require('methods').concat('use', 'route', 'param', 'all')
const cls = require('../cls')
const { isExpressV4 } = require('./util')
Expand Down
2 changes: 1 addition & 1 deletion src/instrumentation/expressError.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const shimmer = require('shimmer')
const { opentracing } = require('jaeger-client')
const opentracing = require('opentracing')
const cls = require('../cls')
const { isExpressV4 } = require('./util')

Expand Down
2 changes: 1 addition & 1 deletion src/instrumentation/httpClient.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const url = require('url')
const { opentracing } = require('jaeger-client')
const opentracing = require('opentracing')
const shimmer = require('shimmer')
const _ = require('lodash')
// eslint-disable-next-line
Expand Down
2 changes: 1 addition & 1 deletion src/instrumentation/mongodbCore.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { opentracing } = require('jaeger-client')
const opentracing = require('opentracing')
const shimmer = require('shimmer')
const cls = require('../cls')

Expand Down
2 changes: 1 addition & 1 deletion src/instrumentation/pg.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { opentracing } = require('jaeger-client')
const opentracing = require('opentracing')
const shimmer = require('shimmer')
const cls = require('../cls')

Expand Down

0 comments on commit cfcc137

Please sign in to comment.