newrelic 12.0.0 → 12.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/NEWS.md
CHANGED
|
@@ -1,84 +1,114 @@
|
|
|
1
|
-
### v12.
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
* Removed
|
|
38
|
-
* Updated
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
*
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
*
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
*
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
*
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
*
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
1
|
+
### v12.1.0 (2024-08-12)
|
|
2
|
+
|
|
3
|
+
#### Bug fixes
|
|
4
|
+
|
|
5
|
+
* Pick log message from merging object in Pino instrumentation ([#2421](https://github.com/newrelic/node-newrelic/pull/2421)) ([599072b](https://github.com/newrelic/node-newrelic/commit/599072b43b77a8c11c9ef414b08dfe6e04bca9d2))
|
|
6
|
+
* Added TLS verification for Redis ([#2446](https://github.com/newrelic/node-newrelic/pull/2446)) ([9a16b70](https://github.com/newrelic/node-newrelic/commit/9a16b7016a943a0c2817ab2151eaa81f5ea19760))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
#### Documentation
|
|
10
|
+
|
|
11
|
+
* Updated compatibility report ([#2440](https://github.com/newrelic/node-newrelic/pull/2440)) ([32abe5f](https://github.com/newrelic/node-newrelic/commit/32abe5f90d93d470737986b3bfe6c797915c4215))
|
|
12
|
+
* Updated examples to properly use specs ([#2422](https://github.com/newrelic/node-newrelic/pull/2422)) ([f7e8c58](https://github.com/newrelic/node-newrelic/commit/f7e8c5831305ac0bcb2c906ec176863552a083c4))
|
|
13
|
+
* Fixed typo in doc header ([#2433](https://github.com/newrelic/node-newrelic/pull/2433)) ([9726e23](https://github.com/newrelic/node-newrelic/commit/9726e231fe631623f882df38344df4db9ce67b70))
|
|
14
|
+
|
|
15
|
+
#### Miscellaneous chores
|
|
16
|
+
|
|
17
|
+
* Added entity relationship attributes to SQS segments ([#2436](https://github.com/newrelic/node-newrelic/pull/2436)) ([578aead](https://github.com/newrelic/node-newrelic/commit/578aead8c0b2d18dced4eaca54b19c769f398868))
|
|
18
|
+
* Converted agent unit tests to node:test ([#2414](https://github.com/newrelic/node-newrelic/pull/2414)) ([b32f793](https://github.com/newrelic/node-newrelic/commit/b32f7934fec5dc9e7b29dee5d1994ab180bb0c37))
|
|
19
|
+
* Fixed mongodb-esm tests in combination with security agent ([#2444](https://github.com/newrelic/node-newrelic/pull/2444)) ([5d617de](https://github.com/newrelic/node-newrelic/commit/5d617de99bc89b678b8c11aaebcad5dcacf0b5c3))
|
|
20
|
+
* Limited superagent tests to avoid new breaking release ([#2439](https://github.com/newrelic/node-newrelic/pull/2439)) ([f1dd8e7](https://github.com/newrelic/node-newrelic/commit/f1dd8e73b8329a075667f6696d2a27bc749e4e7a))
|
|
21
|
+
* Removed promise resolvers from callback based agent unit tests ([#2450](https://github.com/newrelic/node-newrelic/pull/2450)) ([3766895](https://github.com/newrelic/node-newrelic/commit/3766895cd7cc8145ba8eef6d49330e0d354158a1))
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
#### Tests
|
|
25
|
+
|
|
26
|
+
* Moved pkgVersion to collection-common to avoid a conflict with ESM tests ([#2438](https://github.com/newrelic/node-newrelic/pull/2438)) ([7260fa3](https://github.com/newrelic/node-newrelic/commit/7260fa36372877bb6f60637f8255312fcf207a0a))
|
|
27
|
+
* Restored mongodb-esm tests ([#2434](https://github.com/newrelic/node-newrelic/pull/2434)) ([67a12e3](https://github.com/newrelic/node-newrelic/commit/67a12e32c6deef0c7f8397ac75c369f3371519e8))
|
|
28
|
+
* Updated custom test reporter to only log failed tests when there are failures ([#2425](https://github.com/newrelic/node-newrelic/pull/2425)) ([baa37ec](https://github.com/newrelic/node-newrelic/commit/baa37ece0d027ca6d57fd5b52ceedfaa97ecbfaa))
|
|
29
|
+
* Updated tls redis tests to work with older versions of redis v4 ([#2454](https://github.com/newrelic/node-newrelic/pull/2454)) ([ffd9b17](https://github.com/newrelic/node-newrelic/commit/ffd9b177e85ed73963f88767e9d3e20c57ea372d))
|
|
30
|
+
|
|
31
|
+
### v12.0.0 (2024-07-31)
|
|
32
|
+
#### ⚠ BREAKING CHANGES
|
|
33
|
+
|
|
34
|
+
* Dropped support for Node.js 16
|
|
35
|
+
* Removed legacy context manager
|
|
36
|
+
* Removed support for `redis` < 2.6.0
|
|
37
|
+
* Removed instrumentation for `director`
|
|
38
|
+
* Updated `mongodb` instrumentation to drop support for versions 2 and 3
|
|
39
|
+
|
|
40
|
+
#### Features
|
|
41
|
+
|
|
42
|
+
* Dropped support for Node.js 16 ([#2394](https://github.com/newrelic/node-newrelic/pull/2394)) ([1870010](https://github.com/newrelic/node-newrelic/commit/1870010a1d7dc417fc03ae526a9709e382b3fe1f))
|
|
43
|
+
* Removed legacy context manager ([#2404](https://github.com/newrelic/node-newrelic/pull/2404)) ([321244c](https://github.com/newrelic/node-newrelic/commit/321244c357bc5dd9b4aeefc308cda5e80b8012b0))
|
|
44
|
+
* Removed support for `redis` < 2.6.0 ([#2405](https://github.com/newrelic/node-newrelic/pull/2405)) ([e2c0a31](https://github.com/newrelic/node-newrelic/commit/e2c0a31b5230e0ffbdc3d4567619190570b7167c))
|
|
45
|
+
* Removed instrumentation for `director` ([#2402](https://github.com/newrelic/node-newrelic/pull/2402)) ([1b355e7](https://github.com/newrelic/node-newrelic/commit/1b355e733aef0e14c5f4cb2899642a3d5b6f18ce))
|
|
46
|
+
* Added `server.address` to amqplib spans ([#2406](https://github.com/newrelic/node-newrelic/pull/2406)) ([09636a4](https://github.com/newrelic/node-newrelic/commit/09636a4ce90969e7aea229ef008bd35f57e09217))
|
|
47
|
+
* Updated `mongodb` instrumentation to drop support for versions 2 and 3 ([#2398](https://github.com/newrelic/node-newrelic/pull/2398)) ([a0ae32a](https://github.com/newrelic/node-newrelic/commit/a0ae32a6a61112e0473d477075543485d02313cf))
|
|
48
|
+
* Migrated instrumentation for `next` into agent ([#2409](https://github.com/newrelic/node-newrelic/pull/2409)) ([b55d8e1](https://github.com/newr elic/node-newrelic/commit/b55d8e1ca09e6055ea09f4fcd773a05245e7203f))
|
|
49
|
+
* You no longer need to load Next.js instrumentation via `@newrelic/next`.
|
|
50
|
+
* Instead you must load the agent via `NODE_OPTIONS='-r newrelic' next start`
|
|
51
|
+
|
|
52
|
+
#### Documentation
|
|
53
|
+
|
|
54
|
+
* Updated compatibility report ([#2401](https://github.com/newrelic/node-newrelic/pull/2401)) ([a53085d](https://github.com/newrelic/node-newrelic/commit/a53085ddce2f2d7a4c9288fbf63fbf82436fb15f))
|
|
55
|
+
|
|
56
|
+
#### Miscellaneous chores
|
|
57
|
+
|
|
58
|
+
* Added test configs for defined targets in the aws test suite ([#2403](https://github.com/newrelic/node-newrelic/pull/2403)) ([cf514d9](https://github.com/newrelic/node-newrelic/commit/cf514d97b82889b14a342cbded630bae73992c35))
|
|
59
|
+
* Added producer and consumer metrics to kafkajs instrumentation ([#2407](https://github.com/newrelic/node-newrelic/pull/2407)) ([41c1cc6](https://github.com/newrelic/node-newrelic/commit/41c1cc6d9815a1b89a7ab043b5da5f032969a87e))
|
|
60
|
+
* Switched to using Node built-in test runner ([#2387](https://github.com/newrelic/node-newrelic/pull/2387)) ([b9f64b7](https://github.com/newrelic/node-newrelic/commit/b9f64b76b8777fc790a4694a95318f401a56abdd))
|
|
61
|
+
* Updated `@newrelic/native-metrics` to 11.0.0 ([#2412](https://github.com/newrelic/node-newrelic/pull/2412)) ([aef69e2](https://github.com/newrelic/node-newrelic/commit/aef69e28cc3ead2079cfc0bdf9bde74129a3711f))
|
|
62
|
+
* Updated dashboard links in developer-setup.md ([#2397](https://github.com/newrelic/node-newrelic/pull/2397)) ([16866da](https://github.com/newrelic/node-newrelic/commit/16866da381366ad848ea06be44fd838d57c9fb67))
|
|
63
|
+
* Verified MySQL host:port metric is recorded ([#2400](https://github.com/newrelic/node-newrelic/pull/2400)) ([74176f7](https://github.com/newrelic/node-newrelic/commit/74176f77f70247a3cf65b1b49c5414279b4eeca6))
|
|
64
|
+
|
|
65
|
+
#### Tests
|
|
66
|
+
|
|
67
|
+
* Removed mongodb-esm tests as they are not atomic and conflicting with mongodb tests in CI ([#2416](https://github.com/newrelic/node-newrelic/pull/2416)) ([e587b9d](https://github.com/newrelic/node-newrelic/commit/e587b9dcb795cca3c29c6e0da18770401c3085a0))
|
|
68
|
+
* Updated minimum version of lesser used versions of 3rd party libraries ([#2399](https://github.com/newrelic/node-newrelic/pull/2399)) ([ef8c006](https://github.com/newrelic/node-newrelic/commit/ef8c00674c22b4794c6cee823d46ad9db7d67fed))
|
|
69
|
+
|
|
70
|
+
### v11.23.2 (2024-07-22)
|
|
71
|
+
|
|
72
|
+
#### Features
|
|
73
|
+
|
|
74
|
+
* Added support for `fs.glob` in Node 22+ ([#2369](https://github.com/newrelic/node-newrelic/pull/2369)) ([1791a4e](https://github.com/newrelic/node-newrelic/commit/1791a4ef4a31e36757c47a9947ef8840fdd995c2))
|
|
75
|
+
|
|
76
|
+
#### Bug fixes
|
|
77
|
+
|
|
78
|
+
* Updated aws-sdk v3 instrumentation to load custom middleware last to properly get the external http span to add `aws.*` attributes ([#2382](https://github.com/newrelic/node-newrelic/pull/2382)) ([751801b](https://github.com/newrelic/node-newrelic/commit/751801be814343c9ddcee3dd7e83f87a1c6786d4))
|
|
79
|
+
* Updated cassandra-driver instrumentation to properly trace promise based executions ([#2351](https://github.com/newrelic/node-newrelic/pull/2351)) ([bab9a8b](https://github.com/newrelic/node-newrelic/commit/bab9a8bab4ab6af8efa70d8559bdcc7ca6f5df32))
|
|
80
|
+
|
|
81
|
+
#### Documentation
|
|
82
|
+
|
|
83
|
+
* Removed examples/api/ ([#2381](https://github.com/newrelic/node-newrelic/pull/2381)) ([fb964de](https://github.com/newrelic/node-newrelic/commit/fb964de863f8989161f9a780f9eddc6e3ec91138))
|
|
84
|
+
* Removed out of date `ROADMAP_Node.md` from root of project ([#2367](https://github.com/newrelic/node-newrelic/pull/2367)) ([4be870c](https://github.com/newrelic/node-newrelic/commit/4be870c758d9b931866ef3e6781d01bf176671a9))
|
|
85
|
+
* Updated compatibility report ([#2345](https://github.com/newrelic/node-newrelic/pull/2345)) ([f08adc3](https://github.com/newrelic/node-newrelic/commit/f08adc3a30bdf3e5d23bd00efeb3b16ac06cd3e5))
|
|
86
|
+
|
|
87
|
+
#### Miscellaneous chores
|
|
88
|
+
|
|
89
|
+
* Always upload status logs in compatibility report CI ([#2341](https://github.com/newrelic/node-newrelic/pull/2341)) ([b3f1ee3](https://github.com/newrelic/node-newrelic/commit/b3f1ee3fe40c38c7484661dfb2e599df4f31003e))
|
|
90
|
+
|
|
91
|
+
#### Tests
|
|
92
|
+
|
|
93
|
+
* Removed `server.start` in grpc tests as it is deprecated and no longer needed ([#2372](https://github.com/newrelic/node-newrelic/pull/2372)) ([d212b15](https://github.com/newrelic/node-newrelic/commit/d212b15c929ebca22881f3d41a8d7f99033847a8))
|
|
94
|
+
* Updated benchmark test results to output result files ([#2350](https://github.com/newrelic/node-newrelic/pull/2350)) ([1b51a68](https://github.com/newrelic/node-newrelic/commit/1b51a68200dae14b865a6db06d62655a25a62c2d))
|
|
95
|
+
|
|
96
|
+
#### Continuous integration
|
|
97
|
+
|
|
98
|
+
* Added benchmark test GitHub Action ([#2366](https://github.com/newrelic/node-newrelic/pull/2366)) ([afd3ab4](https://github.com/newrelic/node-newrelic/commit/afd3ab48611ec8409be1472ebbc63db24cff8e73))
|
|
99
|
+
* Increased the limit of installs from 2 to a bigger number for versioned tests ([#2346](https://github.com/newrelic/node-newrelic/pull/2346)) ([f85a385](https://github.com/newrelic/node-newrelic/commit/f85a38524f1d41e82b2c5085c41d79d1263b63c3))
|
|
100
|
+
* Updated `bin/create-docs-pr` to create an empty array if changelog.json is missing security ([#2348](https://github.com/newrelic/node-newrelic/pull/2348)) ([7d5368c](https://github.com/newrelic/node-newrelic/commit/7d5368ce873affbf2593bd6b1cc32259da852e1d))
|
|
101
|
+
|
|
102
|
+
### v11.23.1 (2024-07-11)
|
|
103
|
+
|
|
104
|
+
#### Bug fixes
|
|
105
|
+
|
|
106
|
+
* Updated redis v4 instrumentation to work with transactions(multi/exec) ([#2343](https://github.com/newrelic/node-newrelic/pull/2343)) ([39eb842](https://github.com/newrelic/node-newrelic/commit/39eb8421b84f7fe298acf5c9c89de31ee0cc2604))
|
|
107
|
+
|
|
108
|
+
#### Documentation
|
|
109
|
+
|
|
110
|
+
* Updated compatibility report ([#2342](https://github.com/newrelic/node-newrelic/pull/2342)) ([5c9e3e6](https://github.com/newrelic/node-newrelic/commit/5c9e3e6bfa8a388c7dd071ecb0231b069f065645))
|
|
111
|
+
|
|
82
112
|
### v11.23.0 (2024-07-10)
|
|
83
113
|
|
|
84
114
|
#### Features
|
package/THIRD_PARTY_NOTICES.md
CHANGED
|
@@ -71,6 +71,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
|
|
|
71
71
|
* [proxyquire](#proxyquire)
|
|
72
72
|
* [rfdc](#rfdc)
|
|
73
73
|
* [rimraf](#rimraf)
|
|
74
|
+
* [self-cert](#self-cert)
|
|
74
75
|
* [should](#should)
|
|
75
76
|
* [sinon](#sinon)
|
|
76
77
|
* [superagent](#superagent)
|
|
@@ -4023,6 +4024,22 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
4023
4024
|
|
|
4024
4025
|
```
|
|
4025
4026
|
|
|
4027
|
+
### self-cert
|
|
4028
|
+
|
|
4029
|
+
This product includes source derived from [self-cert](https://github.com/jsumners/self-cert) ([v2.0.0](https://github.com/jsumners/self-cert/tree/v2.0.0)), distributed under the [MIT License](https://github.com/jsumners/self-cert/blob/v2.0.0/Readme.md):
|
|
4030
|
+
|
|
4031
|
+
```
|
|
4032
|
+
MIT License
|
|
4033
|
+
|
|
4034
|
+
Copyright (c) <year> <copyright holders>
|
|
4035
|
+
|
|
4036
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
4037
|
+
|
|
4038
|
+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
4039
|
+
|
|
4040
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
4041
|
+
```
|
|
4042
|
+
|
|
4026
4043
|
### should
|
|
4027
4044
|
|
|
4028
4045
|
This product includes source derived from [should](https://github.com/shouldjs/should.js) ([v13.2.3](https://github.com/shouldjs/should.js/tree/v13.2.3)), distributed under the [MIT License](https://github.com/shouldjs/should.js/blob/v13.2.3/LICENSE):
|
|
@@ -4053,7 +4070,7 @@ THE SOFTWARE.
|
|
|
4053
4070
|
|
|
4054
4071
|
### sinon
|
|
4055
4072
|
|
|
4056
|
-
This product includes source derived from [sinon](https://github.com/sinonjs/sinon) ([
|
|
4073
|
+
This product includes source derived from [sinon](https://github.com/sinonjs/sinon) ([v5.1.1](https://github.com/sinonjs/sinon/tree/v5.1.1)), distributed under the [BSD-3-Clause License](https://github.com/sinonjs/sinon/blob/v5.1.1/LICENSE):
|
|
4057
4074
|
|
|
4058
4075
|
```
|
|
4059
4076
|
(The BSD License)
|
|
@@ -93,7 +93,7 @@ function getRedisParams(clientOpts) {
|
|
|
93
93
|
// see: https://github.com/redis/node-redis/blob/5576a0db492cda2cd88e09881bc330aa956dd0f5/packages/client/lib/client/index.ts#L160
|
|
94
94
|
if (clientOpts?.url) {
|
|
95
95
|
const parsedURL = new URL(clientOpts.url)
|
|
96
|
-
clientOpts.socket = { host: parsedURL.hostname }
|
|
96
|
+
clientOpts.socket = Object.assign({}, clientOpts.socket, { host: parsedURL.hostname })
|
|
97
97
|
if (parsedURL.port) {
|
|
98
98
|
clientOpts.socket.port = parsedURL.port
|
|
99
99
|
}
|
|
@@ -50,10 +50,26 @@ function getSqsSpec(shim, original, name, args) {
|
|
|
50
50
|
callback: shim.LAST,
|
|
51
51
|
destinationName: grabLastUrlSegment(QueueUrl),
|
|
52
52
|
destinationType: shim.QUEUE,
|
|
53
|
-
opaque: true
|
|
53
|
+
opaque: true,
|
|
54
|
+
after({ segment }) {
|
|
55
|
+
const { region, accountId, queue } = urlComponents(QueueUrl)
|
|
56
|
+
segment.addAttribute('messaging.system', 'aws_sqs')
|
|
57
|
+
segment.addAttribute('cloud.region', region)
|
|
58
|
+
segment.addAttribute('cloud.account.id', accountId)
|
|
59
|
+
segment.addAttribute('messaging.destination.name', queue)
|
|
60
|
+
}
|
|
54
61
|
})
|
|
55
62
|
}
|
|
56
63
|
|
|
64
|
+
const urlReg = /\/\/sqs\.(?<region>[\w-]+)\.amazonaws\.com(:\d+)?\/(?<accountId>\d+)\/(?<queue>.+)$/
|
|
65
|
+
function urlComponents(queueUrl) {
|
|
66
|
+
const matches = urlReg.exec(queueUrl)
|
|
67
|
+
if (matches?.groups) {
|
|
68
|
+
return matches.groups
|
|
69
|
+
}
|
|
70
|
+
return { region: undefined, accountId: undefined, queue: undefined }
|
|
71
|
+
}
|
|
72
|
+
|
|
57
73
|
module.exports.sqsMiddlewareConfig = {
|
|
58
74
|
middleware: sqsMiddleware,
|
|
59
75
|
init(shim) {
|
|
@@ -15,6 +15,7 @@ const {
|
|
|
15
15
|
} = require('../../util/application-logging')
|
|
16
16
|
const semver = require('semver')
|
|
17
17
|
|
|
18
|
+
// eslint-disable-next-line sonarjs/cognitive-complexity
|
|
18
19
|
module.exports = function instrument(shim, tools) {
|
|
19
20
|
const pinoVersion = shim.pkgVersion
|
|
20
21
|
|
|
@@ -50,13 +51,21 @@ module.exports = function instrument(shim, tools) {
|
|
|
50
51
|
return function wrappedAsJson() {
|
|
51
52
|
const args = shim.argsToArray.apply(shim, arguments)
|
|
52
53
|
const level = this?.levels?.labels?.[args[2]]
|
|
54
|
+
// Pino log methods accept a singular object (a merging object) that can
|
|
55
|
+
// have a `msg` property for the log message. In such cases, we need to
|
|
56
|
+
// update that log property instead of the second parameter.
|
|
57
|
+
const useMergeObj = args[1] === undefined && Object.hasOwn(args[0], 'msg')
|
|
53
58
|
|
|
54
59
|
if (isMetricsEnabled(config)) {
|
|
55
60
|
incrementLoggingLinesMetrics(level, metrics)
|
|
56
61
|
}
|
|
57
62
|
|
|
58
63
|
if (isLocalDecoratingEnabled(config)) {
|
|
59
|
-
|
|
64
|
+
if (useMergeObj === true) {
|
|
65
|
+
args[0].msg += agent.getNRLinkingMetadata()
|
|
66
|
+
} else {
|
|
67
|
+
args[1] += agent.getNRLinkingMetadata()
|
|
68
|
+
}
|
|
60
69
|
}
|
|
61
70
|
|
|
62
71
|
/**
|
|
@@ -69,7 +78,7 @@ module.exports = function instrument(shim, tools) {
|
|
|
69
78
|
if (isLogForwardingEnabled(config, agent)) {
|
|
70
79
|
const chindings = this[symbols.chindingsSym]
|
|
71
80
|
const formatLogLine = reformatLogLine({
|
|
72
|
-
msg: args[1],
|
|
81
|
+
msg: useMergeObj === true ? args[0].msg : args[1],
|
|
73
82
|
logLine,
|
|
74
83
|
agent,
|
|
75
84
|
chindings,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "newrelic",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.1.0",
|
|
4
4
|
"author": "New Relic Node.js agent team <nodejs@newrelic.com>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"contributors": [
|
|
@@ -256,8 +256,9 @@
|
|
|
256
256
|
"proxyquire": "^1.8.0",
|
|
257
257
|
"rfdc": "^1.3.1",
|
|
258
258
|
"rimraf": "^2.6.3",
|
|
259
|
+
"self-cert": "^2.0.0",
|
|
259
260
|
"should": "*",
|
|
260
|
-
"sinon": "^
|
|
261
|
+
"sinon": "^5.1.1",
|
|
261
262
|
"superagent": "^9.0.1",
|
|
262
263
|
"tap": "^16.3.4",
|
|
263
264
|
"temp": "^0.8.1"
|