Skip to content

Commit

Permalink
build: use self-hosted native dependencies
Browse files Browse the repository at this point in the history
This commit replaces dependencies that have native addons with ones
forked by RisingStack, to enable us distributing hosted versions of
the compiled binaries.
  • Loading branch information
dszakallas committed Mar 30, 2017
1 parent 8f8778f commit 7a3acbe
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions lib/agent/metrics/apm/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var os = require('os')
var gc = require('../../../optionalDependencies/gc-stats')()
var eventLoopStats = require('../../../optionalDependencies/event-loop-stats')
var gc = require('../../../optionalDependencies/@risingstack/gc-stats')()
var eventLoopStats = require('../../../optionalDependencies/@risingstack/event-loop-stats')
var inherits = require('util').inherits
var Agent = require('../../agent')

Expand Down
2 changes: 1 addition & 1 deletion lib/agent/metrics/apm/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var expect = require('chai').expect
var os = require('os')
var eventLoopStats = require('event-loop-stats')
var eventLoopStats = require('@risingstack/event-loop-stats')

var ApmMetrics = require('./')
var Timer = require('../../timer')
Expand Down
2 changes: 1 addition & 1 deletion lib/agent/profiler/cpu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var format = require('util').format
var inherits = require('util').inherits
var Agent = require('../../agent')

var v8profiler = require('../../../optionalDependencies/v8-profiler')
var v8profiler = require('../../../optionalDependencies/@risingstack/v8-profiler')

function CpuProfiler (options) {
var _this = this
Expand Down
2 changes: 1 addition & 1 deletion lib/agent/profiler/cpu/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var expect = require('chai').expect
var EventEmitter = require('events').EventEmitter

var v8profiler = require('../../../optionalDependencies/v8-profiler')
var v8profiler = require('../../../optionalDependencies/@risingstack/v8-profiler')
var CpuProfiler = require('./')

describe('The Cpu Profiler module', function () {
Expand Down
2 changes: 1 addition & 1 deletion lib/agent/profiler/memory/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var format = require('util').format
var inherits = require('util').inherits
var Agent = require('../../agent')

var v8profiler = require('../../../optionalDependencies/v8-profiler')
var v8profiler = require('../../../optionalDependencies/@risingstack/v8-profiler')

function MemoryProfiler (options) {
var _this = this
Expand Down
2 changes: 1 addition & 1 deletion lib/agent/profiler/memory/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var expect = require('chai').expect
var EventEmitter = require('events').EventEmitter

var v8profiler = require('../../../optionalDependencies/v8-profiler')
var v8profiler = require('../../../optionalDependencies/@risingstack/v8-profiler')

var MemoryProfiler = require('./')

Expand Down
2 changes: 1 addition & 1 deletion lib/agent/tracer/collector.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

var debug = require('../../utils/debug')('agent:tracer')
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')
var ExpiringBuffer = require('./expiringBuffer')
var uuid = require('uuid')
var assign = require('lodash.assign')
Expand Down
2 changes: 1 addition & 1 deletion lib/agent/tracer/collector.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var Collector = require('./collector')
var uuid = require('uuid')
var levels = require('./severity')
var defaults = require('lodash.defaults')
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')
var assign = require('lodash.assign')

var options = {
Expand Down
2 changes: 1 addition & 1 deletion lib/instrumentations/trace-instrumentation-amqplib.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var Module = require('module')

var defaults = require('lodash.defaults')
var get = require('lodash.get')
var microtime = require('../optionalDependencies/microtime')
var microtime = require('../optionalDependencies/@risingstack/microtime')
var debug = require('../utils/debug')('instrumentation')
var format = require('util').format

Expand Down
2 changes: 1 addition & 1 deletion lib/instrumentations/trace-instrumentation-http/request.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var debug = require('../../utils/debug')('instrumentation')
var url = require('url')
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')

var util = require('./util')
var format = require('util').format
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var expect = require('chai').expect
var request = require('./request')
var ExternalEdgeMetrics = require('../../agent/metrics/externalEdge/index')
var Collector = require('../../agent/tracer/collector')
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')

describe('The http.request wrapper module', function () {
var config
Expand Down
2 changes: 1 addition & 1 deletion lib/instrumentations/trace-instrumentation-http/server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')
var debug = require('../../utils/debug')('instrumentation')
var Shimmer = require('../../utils/shimmer')

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var expect = require('chai').expect
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')
var Collector = require('../../agent/tracer/collector')
var IncomingEdgeMetrics = require('../../agent/metrics/incomingEdge/index')

Expand Down
2 changes: 1 addition & 1 deletion lib/instrumentations/utils/wrapQuery.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')
var EventEmitter = require('events')
var debug = require('../../utils/debug')('instrumentation')
var format = require('util').format
Expand Down
2 changes: 1 addition & 1 deletion lib/instrumentations/utils/wrapQuery.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var expect = require('chai').expect
var wrapQuery = require('./wrapQuery')
var microtime = require('../../optionalDependencies/microtime')
var microtime = require('../../optionalDependencies/@risingstack/microtime')

describe('wrapQuery', function () {
var agent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var debug = require('../utils/debug')()
var debug = require('../../utils/debug')()
var eventLoopStats

try {
eventLoopStats = require('event-loop-stats')
eventLoopStats = require('@risingstack/event-loop-stats')
} catch (ex) {
debug.warn("event-loop-stats couldn't be required")
eventLoopStats = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var debug = require('../utils/debug')()
var debug = require('../../utils/debug')()
var gcStats

try {
gcStats = require('gc-stats')
gcStats = require('@risingstack/gc-stats')
} catch (ex) {
gcStats = function () {
debug.warn("gc-stats couldn't be required")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var debug = require('../utils/debug')()
var debug = require('../../utils/debug')()
var microtime

try {
microtime = require('microtime')
microtime = require('@risingstack/microtime')
} catch (ex) {
debug.warn("microtime couldn't be required")
microtime = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var debug = require('../utils/debug')()
var debug = require('../../utils/debug')()
var v8profiler

try {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
"uuid": "3.0.1"
},
"optionalDependencies": {
"microtime": "2.1.2",
"event-loop-stats": "1.0.0",
"gc-stats": "1.0.0",
"v8-profiler": "5.7.0"
"@risingstack/microtime": "2.1.6",
"@risingstack/gc-stats": "1.0.7",
"@risingstack/event-loop-stats": "1.0.5",
"@risingstack/v8-profiler": "5.7.4"
},
"devDependencies": {
"chai": "^3.5.0",
Expand Down
2 changes: 1 addition & 1 deletion test/instrumentations/amqplib/amqplib.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require('../test-setup.spec.js')

var expect = require('chai').expect
var wrapper = require('../../../lib/instrumentations/trace-instrumentation-amqplib')
var microtime = require('../../../lib/optionalDependencies/microtime')
var microtime = require('../../../lib/optionalDependencies/@risingstack/microtime')
var Storage = require('../../../lib/agent/storage')

describe.only('amqplib', function () {
Expand Down

0 comments on commit 7a3acbe

Please sign in to comment.