oneapm - npm Package Compare versions

Comparing version 3.0.3 to 3.0.5

api.js

@@ -5,3 +5,3 @@ 'use strict';
     , util = require('util')
-    , logger = require('oneapm-logger').child({ component: 'api' })
+    , logger = require(_oneapm_logger_path_).child({ component: 'api' })
     , NAMES = require(path.join(__dirname, 'lib', 'metrics', 'names'))
@@ -8,0 +8,0 @@ , genericRecorder = require(path.join(__dirname, 'lib', 'metrics', 'recorders',

index.js

 'use strict';
 
 // this file can be included multiple times
-
-var logger = require('oneapm-logger');
+var path = require('path');
+global._oneapm_logger_path_ = path.join(__dirname, 'lib', 'logger');
+var logger = require(_oneapm_logger_path_);
 var locales = require('./locales');
@@ -55,3 +56,3 @@ var semver = require('semver');
      */
-    var config = require('oneapm-config').initialize();
+    var config = require(path.join(__dirname, 'lib', 'config', 'config')).initialize();
 
@@ -58,0 +59,0 @@ if (!config.agent_enabled) {

lib/agent.js

@@ -8,3 +8,3 @@ 'use strict';
 var Events = require(path.join(__dirname, 'events.js'));
-var logger = require('oneapm-logger');
+var logger = require(_oneapm_logger_path_);
 var sampler = require(path.join(__dirname, 'sampler.js'));
@@ -11,0 +11,0 @@ var NAMES = require(path.join(__dirname, 'metrics', 'names.js'));

lib/collector/api.js

 'use strict';
 
 var path = require('path'),
-    logger = require('oneapm-logger').child({
+    logger = require(_oneapm_logger_path_).child({
         component: 'collector_api'
@@ -6,0 +6,0 @@ }),

lib/collector/facts.js

 'use strict';
 
 var os = require('os');
-var myip = require('oneapm-util').myip
+var myip = require('../util/myip')
 
@@ -6,0 +6,0 @@ module.exports = function facts(agent) {

lib/collector/parse-response.js

@@ -5,3 +5,3 @@ 'use strict';
     format = require('util').format,
-    logger = require('oneapm-logger')
+    logger = require(_oneapm_logger_path_)
         .child({
@@ -8,0 +8,0 @@ component: 'oneapm_response'

lib/collector/remote-method.js

@@ -10,3 +10,3 @@ 'use strict';
     lookup = require('dns').lookup,
-    logger = require('oneapm-logger')
+    logger = require(_oneapm_logger_path_)
         .child({
@@ -16,3 +16,3 @@ component: 'remote_method_invoke'
     parse = require('./parse-response.js'),
-    Sink = require('oneapm-util')['stream-sink'];
+    Sink = require('../util/stream-sink');
 
@@ -19,0 +19,0 @@ /*

lib/db/parse-sql.js

 'use strict';
 
 var path = require('path');
-var logger = require('oneapm-logger').child({ component: 'parse_sql' });
+var logger = require(_oneapm_logger_path_).child({ component: 'parse_sql' });
 var StatementMatcher = require(path.join(__dirname, 'statement-matcher'));
@@ -6,0 +6,0 @@ var ParsedStatement = require(path.join(__dirname, 'parsed-statement'));

lib/db/tracer.js

 'use strict'
 
-var logger = require('oneapm-logger').child({ component: 'query_tracer' });
+var logger = require(_oneapm_logger_path_).child({ component: 'query_tracer' });
 var obfuscate = require('../util/sql/obfuscate');
@@ -5,0 +5,0 @@ var Stats = require('../stats');

lib/environment.js

@@ -6,3 +6,3 @@ 'use strict';
 var os = require('os');
-var logger = require('oneapm-logger');
+var logger = require(_oneapm_logger_path_);
 var isDocker = require('is-docker');
@@ -9,0 +9,0 @@

lib/error.js

@@ -5,3 +5,3 @@ 'use strict';
 var urltils = require(path.join(__dirname, 'util', 'urltils'));
-var logger = require('oneapm-logger').child({ component: 'error_tracer' });
+var logger = require(_oneapm_logger_path_).child({ component: 'error_tracer' });
 var NAMES = require(path.join(__dirname, 'metrics', 'names'));
@@ -8,0 +8,0 @@ var codec = require('./util/codec')

lib/events.js

 var assert = require('assert')
-var logger = require('oneapm-logger');
+var logger = require(_oneapm_logger_path_);
 
@@ -4,0 +4,0 @@ function Events(mapper) {

lib/instrumentation/connect.js

@@ -5,3 +5,3 @@ 'use strict';
     , shimmer = require(path.join(__dirname, '..', 'shimmer'))
-    , logger = require('oneapm-logger').child({ component: 'connect' })
+    , logger = require(_oneapm_logger_path_).child({ component: 'connect' })
     ;
@@ -8,0 +8,0 @@

lib/instrumentation/core/http.js

@@ -5,9 +5,9 @@ 'use strict';
 var shimmer = require('../../shimmer.js');
-var logger = require('oneapm-logger').child({ component: 'http' });
-var stackUtil = require('oneapm-util').stack;
+var logger = require(_oneapm_logger_path_).child({ component: 'http' });
+var stackUtil = require('../../util/stack');
 var recordWeb = require('../../metrics/recorders/http.js');
 var instrumentOutbound = require('../../transaction/tracer/instrumentation/outbound.js');
-var myip = require('oneapm-util').myip;
-var fullUrl = require('oneapm-util')['full-url'];
-var lastIO = require('oneapm-util')['last-io'];
+var myip = require('../../util/myip');
+var fullUrl = require('../../util/full-url');
+var lastIO = require('../../util/last-io');
 var generateGuid = require('../../util/generate-guid.js')
@@ -208,3 +208,3 @@ var urltils = require('../../util/urltils.js')
                 if (callback && typeof callback === 'function') {
-                    callback.call(args);
+                    callback.apply(this, arguments);
                 }
@@ -211,0 +211,0 @@ }

lib/instrumentation/express.js

@@ -6,3 +6,3 @@ 'use strict';
 var urltils = require(path.join(__dirname, '..', 'util', 'urltils.js'));
-var logger = require('oneapm-logger').child({ component: 'express' });
+var logger = require(_oneapm_logger_path_).child({ component: 'express' });
 var record = require(path.join(__dirname, '..', 'metrics', 'recorders', 'generic.js'));
@@ -9,0 +9,0 @@ var NAMES = require(path.join(__dirname, '..', 'metrics', 'names.js'));

lib/instrumentation/hapi.js

@@ -6,3 +6,3 @@ 'use strict';
 var urltils = require('../util', 'urltils.js')
-var logger = require('oneapm-logger').child({ component: 'hapi' })
+var logger = require(_oneapm_logger_path_).child({ component: 'hapi' })
 var record = require('../metrics/recorders/generic.js')
@@ -9,0 +9,0 @@ var NAMES = require('../metrics/names.js')

lib/instrumentation/mongodb.js

@@ -8,3 +8,3 @@ "use strict";
 var urltils = require('../util/urltils.js');
-var logger = require('oneapm-logger').child({
+var logger = require(_oneapm_logger_path_).child({
     component: 'mongodb'
@@ -11,0 +11,0 @@ });

lib/instrumentation/mysql.js

 'use strict';
 
 var path = require('path')
-  , logger = require('oneapm-logger').child({component: 'mysql'})
+  , logger = require(_oneapm_logger_path_).child({component: 'mysql'})
   , shimmer = require(path.join(__dirname, '..', 'shimmer'))
@@ -6,0 +6,0 @@ , parseSql = require(path.join(__dirname, '..', 'db', 'parse-sql'))

lib/instrumentation/mysql2.js

 'use strict';
 
 var path = require('path')
-  , logger = require('oneapm-logger').child({component: 'mysql2'})
+  , logger = require(_oneapm_logger_path_).child({component: 'mysql2'})
   , shimmer = require(path.join(__dirname, '..', 'shimmer'))
@@ -6,0 +6,0 @@ , parseSql = require(path.join(__dirname, '..', 'db', 'parse-sql'))

lib/instrumentation/node-cassandra-cql.js

@@ -6,3 +6,3 @@ 'use strict';
 var stackUtil = require('../util/stack')
-var logger = require('oneapm-logger').child({ component: 'node-cassandra-cql' })
+var logger = require(_oneapm_logger_path_).child({ component: 'node-cassandra-cql' })
 var record = require('../metrics/recorders/nosql.js')
@@ -9,0 +9,0 @@ var CASSANDRA = require('../metrics/names').CASSANDRA

lib/instrumentation/pg.js

@@ -6,3 +6,3 @@ 'use strict';
   , parseSql    = require(path.join(__dirname, '..', 'db', 'parse-sql'))
-  , logger      = require('oneapm-logger').child({component : 'pg'})
+  , logger      = require(_oneapm_logger_path_).child({component : 'pg'})
   , POSTGRES    = require(path.join(__dirname, '..', 'metrics', 'names')).POSTGRES
@@ -9,0 +9,0 @@ ;

lib/instrumentation/redis.js

@@ -6,3 +6,3 @@ 'use strict';
 var stackUtil = require('../util/stack')
-var logger = require('oneapm-logger').child({ component: 'redis' })
+var logger = require(_oneapm_logger_path_).child({ component: 'redis' })
 var record = require('../metrics/recorders/nosql.js')
@@ -9,0 +9,0 @@ var REDIS = require('../metrics/names').REDIS

lib/instrumentation/restify.js

@@ -5,3 +5,3 @@ 'use strict';
 var shimmer = require('../shimmer')
-var logger = require('oneapm-logger').child({ component: 'restify' })
+var logger = require(_oneapm_logger_path_).child({ component: 'restify' })
 var urltils = require('../util/urltils.js')
@@ -8,0 +8,0 @@ var NAMES = require('../metrics/names.js')

lib/instrumentation/thinkjs.js

 var path = require('path');
 var NAMES = require('../metrics/names.js');
-var logger = require('oneapm-logger').child({ component: 'thinkjs' });
+var logger = require(_oneapm_logger_path_).child({ component: 'thinkjs' });
 var shimmer = require('../shimmer.js');
@@ -5,0 +5,0 @@

lib/instrumentation/thrift.js

@@ -6,3 +6,3 @@ 'use strict';
 var stackUtil = require('../util/stack')
-var logger = require('oneapm-logger')
+var logger = require(_oneapm_logger_path_)
 var recordThrift = require('../metrics/recorders/thrift.js')
@@ -9,0 +9,0 @@ var NAMES = require('../metrics/names')

lib/metrics/mapper.js

 'use strict';
 
 var path = require('path')
-var logger = require('oneapm-logger').child({ component: 'mapper' })
+var logger = require(_oneapm_logger_path_).child({ component: 'mapper' })
 
@@ -6,0 +6,0 @@ /**

lib/metrics/normalizer.js

 'use strict';
 
 var path = require('path')
-var logger = require('oneapm-logger').child({ component: 'metric_normalizer' })
+var logger = require(_oneapm_logger_path_).child({ component: 'metric_normalizer' })
 var deepEqual = require('../util/deep-equal')
@@ -6,0 +6,0 @@ var Rule = require('./normalizer/rule')

lib/metrics/normalizer/rule.js

 'use strict';
 
 var path = require('path');
-var logger = require('oneapm-logger').child({ component: 'normalizer_rule' });
+var logger = require(_oneapm_logger_path_).child({ component: 'normalizer_rule' });
 
@@ -6,0 +6,0 @@ /**

lib/shimmer.js

 'use strict';
 
 var path = require('path');
-var logger = require('oneapm-logger').child({ component: 'shimmer' });
+var logger = require(_oneapm_logger_path_).child({ component: 'shimmer' });
 
@@ -6,0 +6,0 @@ /*

lib/util/inject-script.js

@@ -5,3 +5,3 @@ /**
 var path = require('path');
-var logger = require('oneapm-logger')
+var logger = require(_oneapm_logger_path_)
     .child({ component: 'api-inject-script' });
@@ -8,0 +8,0 @@

package.json

 {
   "name": "oneapm",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "author": "OneAPM Node.js agent team <[e-mail]>",
@@ -33,10 +33,7 @@ "description": "OneAPM agent",
     "is-docker": "^1.0.0",
-    "oneapm-config": "^1.2.1",
-    "oneapm-logger": "^2.0.0",
-    "oneapm-util": "^1.0.0",
     "pidusage-fork": "^0.1.1",
     "redis-commands": "^1.3.1",
+    "request": "^2.79.0",
     "semver": "^4.3.6",
-    "sqlstring": "^2.2.0",
-    "request": "^2.79.0"
+    "sqlstring": "^2.2.0"
   },
@@ -43,0 +40,0 @@ "files": [

stub_api.js

 'use strict';
 
 var path = require('path')
-    , logger = require('oneapm-logger')
+    , logger = require(_oneapm_logger_path_)
     , RealAPI = require(path.join(__dirname, 'api.js'))
@@ -6,0 +6,0 @@ ;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 4 instances in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

413386

increased by12.22%

Dependency count

9

decreased by-25%

Number of package files

78

increased by6.85%

Lines of code

10155

increased by13.71%

Worsened metrics

Number of low supply chain risk alerts

102

increased by67.21%

Dependency changes

• - Removedoneapm-config@^1.2.1

• - Removedoneapm-logger@^2.0.0

• - Removedoneapm-util@^1.0.0

• - Removedoneapm-config@1.2.2(transitive)

• - Removedoneapm-logger@2.0.0(transitive)

• - Removedoneapm-util@1.0.0(transitive)