Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 3bcd307

Browse files
butlerxWardormeur
authored andcommitted
add seneca new-relic (#285)
* add seneca new-relic
1 parent 90efd64 commit 3bcd307

File tree

4 files changed

+53
-20
lines changed

4 files changed

+53
-20
lines changed

newrelic.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@
1010
exports.config = {
1111
app_name: ['cp-users-service'],
1212
agent_enabled: false, // set via NEW_RELIC_ENABLED for production
13-
license_key: '', // set via NEW_RELIC_LICENSE_KEY
14-
filepath: '/tmp/newrelic_agent_users.log'
13+
license_key: '', // set via NEW_RELIC_LICENSE_KEY
14+
filepath: '/tmp/newrelic_agent_users.log',
15+
transaction_tracer: {
16+
record_sql: 'obfuscated'
17+
},
18+
logging: {
19+
/**
20+
* Level at which to log. 'trace' is most useful to New Relic when diagnosing
21+
* issues with the agent, 'info' and higher will impose the least overhead on
22+
* production applications.
23+
*/
24+
level: 'info'
25+
}
1526
};

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"le_node": "1.1.0",
4242
"lodash": "3.7.0",
4343
"moment": "2.10.3",
44-
"newrelic": "1.19.2",
44+
"newrelic": "^2.6.0",
4545
"node-uuid": "1.4.3",
4646
"optimist": "0.6.1",
4747
"pg": "5.1.0",
@@ -52,6 +52,7 @@
5252
"seneca": "1.4",
5353
"seneca-auth": "1.0",
5454
"seneca-mail": "^0.2.2",
55+
"seneca-newrelic": "Wardormeur/seneca-newrelic",
5556
"seneca-postgresql-store": "2.3",
5657
"seneca-store-query": "0.0.5",
5758
"seneca-user": "1.0",

service.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
process.setMaxListeners(0);
33
require('events').EventEmitter.prototype._maxListeners = 100;
44

5-
if (process.env.NEW_RELIC_ENABLED === 'true') require('newrelic');
6-
5+
const newrelic = process.env.NEW_RELIC_ENABLED === 'true' ? require('newrelic') : undefined;
6+
const senecaNR = require('seneca-newrelic');
77
var config = require('./config/config.js')();
88
var seneca = require('seneca')(config);
99
var _ = require('lodash');
@@ -29,6 +29,18 @@ if (process.env.MAILTRAP_ENABLED === 'true') {
2929
seneca.use('mail', config.email);
3030
}
3131

32+
if (!_.isUndefined(newrelic)) {
33+
seneca.use(senecaNR, {
34+
newrelic,
35+
roles: ['cd-users'],
36+
filter (p) {
37+
p.user = p.user ? p.user.id : undefined;
38+
p.login = p.login ? p.login.id : undefined;
39+
return p;
40+
}
41+
});
42+
}
43+
3244
function shutdown (err) {
3345
if (err !== undefined) {
3446
var error = {

yarn.lock

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
# yarn lockfile v1
33

44

5+
"@newrelic/native-metrics@^2.1.0":
6+
version "2.1.2"
7+
resolved "https://registry.yarnpkg.com/@newrelic/native-metrics/-/native-metrics-2.1.2.tgz#9a595dc602654b717188a294507087a51e79fba3"
8+
dependencies:
9+
nan "^2.4.0"
10+
511
abbrev@1:
612
version "1.1.1"
713
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -228,7 +234,7 @@ async@^0.9.0:
228234
version "0.9.2"
229235
resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
230236

231-
async@^2.0.0-rc.5, async@^2.0.1:
237+
async@^2.0.0-rc.5, async@^2.0.1, async@^2.1.4:
232238
version "2.6.0"
233239
resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
234240
dependencies:
@@ -808,7 +814,7 @@ [email protected]:
808814
version "0.0.1"
809815
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
810816

811-
concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0:
817+
concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0:
812818
version "1.6.0"
813819
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
814820
dependencies:
@@ -3402,7 +3408,7 @@ [email protected]:
34023408
safe-buffer "5.1.1"
34033409
sqlstring "2.3.0"
34043410

3405-
nan@^2.0.8, nan@^2.3.0:
3411+
nan@^2.0.8, nan@^2.3.0, nan@^2.4.0:
34063412
version "2.8.0"
34073413
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
34083414

@@ -3436,15 +3442,18 @@ [email protected]:
34363442
version "0.0.3"
34373443
resolved "https://registry.yarnpkg.com/newline/-/newline-0.0.3.tgz#0f6a74493223dba04fe7dbfb6cdc804bf7e46dd0"
34383444

3439-
newrelic@1.19.2:
3440-
version "1.19.2"
3441-
resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-1.19.2.tgz#f69d26a90c418f351f85acaa6b6c1b94f5e25353"
3445+
newrelic@^2.6.0:
3446+
version "2.6.0"
3447+
resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-2.6.0.tgz#8672c25c3bda68582ba8dd00a25e3198ef98e42e"
34423448
dependencies:
3449+
async "^2.1.4"
3450+
concat-stream "^1.5.0"
34433451
https-proxy-agent "^0.3.5"
34443452
json-stringify-safe "^5.0.0"
3445-
readable-stream "^1.1.13"
3446-
semver "^4.2.0"
3447-
yakaa "^1.0.1"
3453+
readable-stream "^2.1.4"
3454+
semver "^5.3.0"
3455+
optionalDependencies:
3456+
"@newrelic/native-metrics" "^2.1.0"
34483457

34493458
next-tick@1:
34503459
version "1.0.0"
@@ -4112,7 +4121,7 @@ [email protected], readable-stream@^2.0.0, readable-stream@^2.0.2, readable-
41124121
isarray "0.0.1"
41134122
string_decoder "~0.10.x"
41144123

4115-
readable-stream@^1.1.13, readable-stream@~1.1.9:
4124+
readable-stream@~1.1.9:
41164125
version "1.1.14"
41174126
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
41184127
dependencies:
@@ -4534,7 +4543,7 @@ [email protected]:
45344543
version "5.1.1"
45354544
resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.1.tgz#a3292a373e6f3e0798da0b20641b9a9c5bc47e19"
45364545

4537-
semver@^4.1.0, semver@^4.2.0, semver@^4.3.1:
4546+
semver@^4.1.0, semver@^4.3.1:
45384547
version "4.3.6"
45394548
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
45404549

@@ -4621,6 +4630,10 @@ [email protected]:
46214630
dependencies:
46224631
lodash "3.10.1"
46234632

4633+
seneca-newrelic@Wardormeur/seneca-newrelic:
4634+
version "0.0.1"
4635+
resolved "https://codeload.github.com/Wardormeur/seneca-newrelic/tar.gz/7d58f553b7301ab114c391a77f6eea132e6d4af9"
4636+
46244637
46254638
version "2.3.0"
46264639
resolved "https://registry.yarnpkg.com/seneca-postgresql-store/-/seneca-postgresql-store-2.3.0.tgz#9cbe6746198dd68490ed37f1ba28318fb7b1e7d9"
@@ -5448,10 +5461,6 @@ y18n@^3.2.0:
54485461
version "3.2.1"
54495462
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
54505463

5451-
yakaa@^1.0.1:
5452-
version "1.0.1"
5453-
resolved "https://registry.yarnpkg.com/yakaa/-/yakaa-1.0.1.tgz#3ecaae72f3d089da58089403126204cec772e60a"
5454-
54555464
yallist@^2.0.0, yallist@^2.1.2:
54565465
version "2.1.2"
54575466
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"

0 commit comments

Comments
 (0)