Skip to content

Commit 403154a

Browse files
rochdevrochdev
authored
move code to individual package folders to prepare for Lerna (#588)
1 parent d5497be commit 403154a

File tree

252 files changed

+403
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+403
-363
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ versions
103103
build
104104
prebuilds
105105
docs/test.js
106-
!test/node_modules
106+
!packages/*/test/node_modules

‎.npmignore

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
*
22
!ext/**/*
3-
!lib/**/*
3+
!packages/*/lib/**/*
4+
!packages/*/src/**/*
5+
!packages/*/index.js
46
!scripts/post_install.js
5-
!src/**/*
67
!CONTRIBUTING.md
78
!LICENSE
89
!LICENSE-3rdparty.csv
910
!README.md
1011
!binding.gyp
11-
!index.js
1212
!index.d.ts
13+
!index.js
1314
!package.json

‎benchmark/core.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
const benchmark = require('./benchmark')
44
const proxyquire = require('proxyquire')
55
const Uint64BE = require('int64-buffer').Uint64BE
6-
const platform = require('../src/platform')
7-
const node = require('../src/platform/node')
6+
const platform = require('../packages/dd-trace/src/platform')
7+
const node = require('../packages/dd-trace/src/platform/node')
88

99
platform.use(node)
1010

11-
const Config = require('../src/config')
12-
const DatadogTracer = require('../src/tracer')
13-
const DatadogSpanContext = require('../src/opentracing/span_context')
14-
const TextMapPropagator = require('../src/opentracing/propagation/text_map')
15-
const Writer = proxyquire('../src/writer', {
11+
const Config = require('../packages/dd-trace/src/config')
12+
const DatadogTracer = require('../packages/dd-trace/src/tracer')
13+
const DatadogSpanContext = require('../packages/dd-trace/src/opentracing/span_context')
14+
const TextMapPropagator = require('../packages/dd-trace/src/opentracing/propagation/text_map')
15+
const Writer = proxyquire('../packages/dd-trace/src/writer', {
1616
'./platform': { request: () => Promise.resolve() }
1717
})
18-
const Sampler = require('../src/sampler')
19-
const format = require('../src/format')
20-
const encode = require('../src/encode')
18+
const Sampler = require('../packages/dd-trace/src/sampler')
19+
const format = require('../packages/dd-trace/src/format')
20+
const encode = require('../packages/dd-trace/src/encode')
2121
const config = new Config('benchmark', { service: 'benchmark' })
2222

2323
const suite = benchmark('core')

‎benchmark/dd-trace.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const tracer = require('..').init()
3+
const tracer = require('../packages/dd-trace').init()
44
const benchmark = require('./benchmark')
55

66
const suite = benchmark('dd-trace')

‎benchmark/platform/node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict'
22

33
const benchmark = require('../benchmark')
4-
const platform = require('../../src/platform')
5-
const node = require('../../src/platform/node')
4+
const platform = require('../../packages/dd-trace/src/platform')
5+
const node = require('../../packages/dd-trace/src/platform/node')
66

77
platform.use(node)
88

‎benchmark/scope/async-listener.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const proxyquire = require('proxyquire')
44
const benchmark = require('../benchmark')
55

6-
const suite = benchmark('scope')
6+
const suite = benchmark('scope (async-listener)')
77

88
const spanStub = require('../stubs/span')
99

@@ -18,7 +18,7 @@ const asyncListener = {
1818
}
1919
}
2020

21-
const Scope = proxyquire('../../src/scope/async-listener', {
21+
const Scope = proxyquire('../../packages/dd-trace/src/scope/async-listener', {
2222
'@datadog/async-listener': asyncListener
2323
})
2424

‎benchmark/scope/async_hooks.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict'
22

33
const proxyquire = require('proxyquire')
4-
const platform = require('../../src/platform')
5-
const node = require('../../src/platform/node')
4+
const platform = require('../../packages/dd-trace/src/platform')
5+
const node = require('../../packages/dd-trace/src/platform/node')
66
const benchmark = require('../benchmark')
77

8-
const suite = benchmark('scope')
8+
const suite = benchmark('scope (async_hooks)')
99

1010
const spanStub = require('../stubs/span')
1111

@@ -32,7 +32,7 @@ const asyncHooks = {
3232
}
3333
}
3434

35-
const Scope = proxyquire('../../src/scope/async_hooks', {
35+
const Scope = proxyquire('../../packages/dd-trace/src/scope/async_hooks', {
3636
'./async_hooks/': asyncHooks,
3737
'../platform': platform
3838
})

‎benchmark/stubs/span.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const Uint64BE = require('int64-buffer').Uint64BE
4-
const constants = require('../../src/constants')
4+
const constants = require('../../packages/dd-trace/src/constants')
55

66
const SAMPLE_RATE_METRIC_KEY = constants.SAMPLE_RATE_METRIC_KEY
77

‎binding.gyp

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"targets": [{
33
"target_name": "metrics",
44
"sources": [
5-
"src/native/metrics/Collector.cpp",
6-
"src/native/metrics/EventLoop.cpp",
7-
"src/native/metrics/GarbageCollection.cpp",
8-
"src/native/metrics/Heap.cpp",
9-
"src/native/metrics/Histogram.cpp",
10-
"src/native/metrics/Object.cpp",
11-
"src/native/metrics/Process.cpp",
12-
"src/native/metrics/SpanTracker.cpp",
13-
"src/native/metrics/utils.cpp",
14-
"src/native/metrics/main.cpp"
5+
"packages/dd-trace/src/native/metrics/Collector.cpp",
6+
"packages/dd-trace/src/native/metrics/EventLoop.cpp",
7+
"packages/dd-trace/src/native/metrics/GarbageCollection.cpp",
8+
"packages/dd-trace/src/native/metrics/Heap.cpp",
9+
"packages/dd-trace/src/native/metrics/Histogram.cpp",
10+
"packages/dd-trace/src/native/metrics/Object.cpp",
11+
"packages/dd-trace/src/native/metrics/Process.cpp",
12+
"packages/dd-trace/src/native/metrics/SpanTracker.cpp",
13+
"packages/dd-trace/src/native/metrics/utils.cpp",
14+
"packages/dd-trace/src/native/metrics/main.cpp"
1515
],
1616
"include_dirs": [
17-
"src/native",
17+
"packages/dd-trace/src/native",
1818
"<!(node -e \"require('nan')\")"
1919
],
2020
"xcode_settings": {

‎index.js

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
'use strict'
22

3-
const platform = require('./src/platform')
4-
const node = require('./src/platform/node')
5-
const TracerProxy = require('./src/proxy')
6-
7-
platform.use(node)
8-
9-
module.exports = new TracerProxy()
10-
module.exports.default = module.exports
11-
module.exports.tracer = module.exports
3+
module.exports = require('./packages/dd-trace')

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"type:doc": "cd docs && yarn && yarn build",
1414
"type:test": "cd docs && yarn && yarn test",
1515
"lint": "eslint . && node scripts/check_licenses.js",
16-
"services": "node ./scripts/install_plugin_modules && node test/setup/services",
17-
"tdd": "yarn services && NO_DEPRECATION=* mocha --watch 'test/setup/**/*.js'",
18-
"test": "SERVICES=* yarn services && NO_DEPRECATION=* cov8 --include \"src/**/*.js\" -- mocha --exit 'test/setup/all.js' 'test/**/*.spec.js'",
19-
"test:core": "mocha --exit --exclude \"test/plugins/*.spec.js\" --exclude \"test/plugins/http*/*.spec.js\" --file test/setup/core.js \"test/**/*.spec.js\"",
20-
"test:plugins": "yarn services && NO_DEPRECATION=* cov8 --include \"src/**/*.js\" -- mocha --exit --file \"test/setup/all.js\" \"test/plugins/@($(echo $PLUGINS)).spec.js\" \"test/plugins/@($(echo $PLUGINS))/**/*.spec.js\"",
21-
"leak:core": "node ./scripts/install_plugin_modules && (cd test/leak && yarn) && NODE_PATH=./test/leak/node_modules node --no-warnings ./node_modules/.bin/tape 'test/leak/{,!(node_modules|plugins)/**/}/*.js'",
22-
"leak:plugins": "yarn services && (cd test/leak && yarn) && NODE_PATH=./test/leak/node_modules node --no-warnings ./node_modules/.bin/tape \"test/leak/plugins/@($(echo $PLUGINS)).js\""
16+
"services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
17+
"tdd": "node scripts/tdd.js",
18+
"test": "SERVICES=* yarn services && NO_DEPRECATION=* cov8 --include \"src/**/*.js\" -- mocha --exit 'packages/dd-trace/test/setup/all.js' 'packages/*/test/**/*.spec.js'",
19+
"test:core": "mocha --exit --file packages/dd-trace/test/setup/core.js \"packages/dd-trace/test/**/*.spec.js\"",
20+
"test:plugins": "yarn services && NO_DEPRECATION=* cov8 --include \"packages/*/src/**/*.js\" -- mocha --exit --file \"packages/dd-trace/test/setup/all.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\"",
21+
"leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
22+
"leak:plugins": "yarn services && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape \"packages/datadog-plugin-@($(echo $PLUGINS))/test/leak.js\""
2323
},
2424
"repository": {
2525
"type": "git",

‎test/.eslintrc.json ‎packages/.eslintrc.json

File renamed without changes.

‎src/plugins/amqp10.js ‎packages/datadog-plugin-amqp10/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const analyticsSampler = require('../analytics_sampler')
3+
const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
44

55
function createWrapSend (tracer, config) {
66
return function wrapSend (send) {

‎test/plugins/amqp10.spec.js ‎packages/datadog-plugin-amqp10/test/index.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const agent = require('./agent')
4-
const plugin = require('../../src/plugins/amqp10')
3+
const agent = require('../../dd-trace/test/plugins/agent')
4+
const plugin = require('../src')
55

66
wrapIt()
77

@@ -15,7 +15,7 @@ describe('Plugin', () => {
1515
describe('amqp10', () => {
1616
withVersions(plugin, 'amqp10', version => {
1717
beforeEach(() => {
18-
tracer = require('../..')
18+
tracer = require('../../dd-trace')
1919
})
2020

2121
afterEach(() => {
@@ -36,7 +36,7 @@ describe('Plugin', () => {
3636
beforeEach(() => {
3737
return agent.load(plugin, 'amqp10')
3838
.then(() => {
39-
const amqp = require(`../../versions/amqp10@${version}`).get()
39+
const amqp = require(`../../../versions/amqp10@${version}`).get()
4040
const None = amqp.Policy.Utils.SenderCallbackPolicies.None
4141
const OnSettle = amqp.Policy.Utils.SenderCallbackPolicies.OnSettle
4242

@@ -175,7 +175,7 @@ describe('Plugin', () => {
175175
beforeEach(() => {
176176
return agent.load(plugin, 'amqp10', { service: 'test' })
177177
.then(() => {
178-
const amqp = require(`../../versions/amqp10@${version}`).get()
178+
const amqp = require(`../../../versions/amqp10@${version}`).get()
179179

180180
client = new amqp.Client()
181181

‎test/leak/plugins/amqp10.js ‎packages/datadog-plugin-amqp10/test/leak.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict'
22

3-
require('../../..')
3+
require('../../dd-trace')
44
.init({ plugins: false, sampleRate: 0 })
55
.use('amqp10')
66

77
const test = require('tape')
8-
const profile = require('../../profile')
8+
const profile = require('../../dd-trace/test/profile')
99

1010
test('amqp10 plugin should not leak', t => {
1111
const amqp = require('../../../versions/amqp10').get()

‎src/plugins/amqplib.js ‎packages/datadog-plugin-amqplib/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const kebabCase = require('lodash.kebabcase')
4-
const analyticsSampler = require('../analytics_sampler')
4+
const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
55

66
let methods = {}
77

‎test/plugins/amqplib.spec.js ‎packages/datadog-plugin-amqplib/test/index.spec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const agent = require('./agent')
4-
const plugin = require('../../src/plugins/amqplib')
3+
const agent = require('../../dd-trace/test/plugins/agent')
4+
const plugin = require('../src')
55

66
wrapIt()
77

@@ -13,7 +13,7 @@ describe('Plugin', () => {
1313
describe('amqplib', () => {
1414
withVersions(plugin, 'amqplib', version => {
1515
beforeEach(() => {
16-
tracer = require('../..')
16+
tracer = require('../../dd-trace')
1717
})
1818

1919
afterEach(() => {
@@ -31,7 +31,7 @@ describe('Plugin', () => {
3131

3232
describe('when using a callback', () => {
3333
beforeEach(done => {
34-
require(`../../versions/amqplib@${version}`).get('amqplib/callback_api')
34+
require(`../../../versions/amqplib@${version}`).get('amqplib/callback_api')
3535
.connect((err, conn) => {
3636
connection = conn
3737

@@ -217,7 +217,7 @@ describe('Plugin', () => {
217217

218218
describe('when using a promise', () => {
219219
beforeEach(() => {
220-
return require(`../../versions/amqplib@${version}`).get().connect()
220+
return require(`../../../versions/amqplib@${version}`).get().connect()
221221
.then(conn => (connection = conn))
222222
.then(conn => conn.createChannel())
223223
.then(ch => (channel = ch))
@@ -246,7 +246,7 @@ describe('Plugin', () => {
246246
})
247247

248248
beforeEach(done => {
249-
require(`../../versions/amqplib@${version}`).get('amqplib/callback_api')
249+
require(`../../../versions/amqplib@${version}`).get('amqplib/callback_api')
250250
.connect((err, conn) => {
251251
connection = conn
252252

‎test/leak/plugins/amqplib.js ‎packages/datadog-plugin-amqplib/test/leak.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict'
22

3-
require('../../..')
3+
require('../../dd-trace')
44
.init({ plugins: false, sampleRate: 0 })
55
.use('amqplib')
66

77
const test = require('tape')
8-
const profile = require('../../profile')
8+
const profile = require('../../dd-trace/test/profile')
99

1010
test('amqplib plugin should not leak when using callbacks', t => {
1111
require('../../../versions/amqplib').get('amqplib/callback_api')

‎src/plugins/bluebird.js ‎packages/datadog-plugin-bluebird/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const tx = require('./util/promise')
3+
const tx = require('../../dd-trace/src/plugins/util/promise')
44

55
module.exports = [
66
{

‎packages/datadog-plugin-bluebird/test/index.spec.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict'
2+
3+
const assertPromise = require('../../dd-trace/test/plugins/promise')
4+
5+
assertPromise('bluebird')

‎src/plugins/bunyan.js ‎packages/datadog-plugin-bunyan/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const tx = require('./util/log')
3+
const tx = require('../../dd-trace/src/plugins/util/log')
44

55
function createWrapEmit (tracer, config) {
66
return function wrapEmit (emit) {

‎test/plugins/bunyan.spec.js ‎packages/datadog-plugin-bunyan/test/index.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict'
22

33
const Writable = require('stream').Writable
4-
const agent = require('./agent')
5-
const plugin = require('../../src/plugins/bunyan')
4+
const agent = require('../../dd-trace/test/plugins/agent')
5+
const plugin = require('../src')
66

77
wrapIt()
88

@@ -13,7 +13,7 @@ describe('Plugin', () => {
1313
let span
1414

1515
function setup (version) {
16-
const bunyan = require(`../../versions/bunyan@${version}`).get()
16+
const bunyan = require(`../../../versions/bunyan@${version}`).get()
1717

1818
span = tracer.startSpan('test')
1919

@@ -28,7 +28,7 @@ describe('Plugin', () => {
2828
describe('bunyan', () => {
2929
withVersions(plugin, 'bunyan', version => {
3030
beforeEach(() => {
31-
tracer = require('../..')
31+
tracer = require('../../dd-trace')
3232
return agent.load(plugin, 'bunyan')
3333
})
3434

‎src/plugins/cassandra-driver.js ‎packages/datadog-plugin-cassandra-driver/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const tx = require('./util/tx')
3+
const tx = require('../../dd-trace/src/plugins/util/tx')
44

55
function createWrapInnerExecute (tracer, config) {
66
return function wrapInnerExecute (_innerExecute) {

0 commit comments

Comments
 (0)