newrelic 9.7.1 → 9.7.2

package/NEWS.md

@@ -1,3 +1,7 @@
+### v9.7.2 (2022-12-07)
+
+* Updated `@grpc/grpc-js` instrumentation to work with 1.8.0.
+
 ### v9.7.1 (2022-12-06)
 
 * Reintroduced throttling during reading of instrumented application's dependency tree during startup, to prevent EMFILE issues.

package/lib/instrumentation/grpc-js/grpc.js

@@ -12,11 +12,23 @@ const DESTINATION = DESTINATIONS.TRANS_EVENT | DESTINATIONS.ERROR_EVENT
 const semver = require('semver')
 
 module.exports = function instrument(shim) {
-  const genericShim = shim.makeSpecializedShim(shim.GENERIC, 'call-stream')
-  const callStream = genericShim.require('./build/src/call-stream')
-  genericShim.wrap(callStream.Http2CallStream.prototype, 'start', wrapStart)
+  const grpcVersion = shim.require('./package.json').version
+  const genericShim = shim.makeSpecializedShim(shim.GENERIC, 'grpc-client-interceptor')
+
+  if (semver.gte(grpcVersion, '1.8.0')) {
+    const resolvingCall = genericShim.require('./build/src/resolving-call')
+    genericShim.wrap(resolvingCall.ResolvingCall.prototype, 'start', wrapStart)
+  } else {
+    const callStream = genericShim.require('./build/src/call-stream')
+    genericShim.wrap(callStream.Http2CallStream.prototype, 'start', wrapStart)
+  }
 
   const webFrameworkShim = shim.makeSpecializedShim(shim.WEB_FRAMEWORK, 'server')
+  if (semver.lt(grpcVersion, '1.4.0')) {
+    shim.logger.debug('gRPC server-side instrumentation only supported on grpc-js >=1.4.0')
+    return
+  }
+
   const server = webFrameworkShim.require('./build/src/server')
   webFrameworkShim.setFramework('gRPC')
   webFrameworkShim.wrap(server.Server.prototype, 'register', wrapRegister)
@@ -41,9 +53,11 @@ function wrapStart(shim, original) {
 
     const channel = this.channel
     const authorityName = (channel.target && channel.target.path) || channel.getDefaultAuthority
+    // in 1.8.0 this changed from methodName to method
+    const method = this.methodName || this.method
 
     const segment = shim.createSegment({
-      name: `External/${authorityName}${this.methodName}`,
+      name: `External/${authorityName}${method}`,
       opaque: true,
       recorder: recordExternal(authorityName, 'gRPC')
     })
@@ -89,10 +103,10 @@ function wrapStart(shim, original) {
 
         const protocol = 'grpc'
 
-        const url = `${protocol}://${authorityName}${this.methodName}`
+        const url = `${protocol}://${authorityName}${method}`
 
         segment.addAttribute('http.url', url)
-        segment.addAttribute('http.method', this.methodName)
+        segment.addAttribute('http.method', method)
 
         if (originalListener && originalListener.onReceiveStatus) {
           const onReceiveStatuts = shim.bindSegment(originalListener.onReceiveStatus, segment)
@@ -212,20 +226,3 @@ function shouldTrackError(statusCode, config) {
     !config.grpc.ignore_status_codes.includes(statusCode)
   )
 }
-
-module.exports = function instrument(shim) {
-  const genericShim = shim.makeSpecializedShim(shim.GENERIC, 'call-stream')
-  const callStream = genericShim.require('./build/src/call-stream')
-  genericShim.wrap(callStream.Http2CallStream.prototype, 'start', wrapStart)
-
-  const webFrameworkShim = shim.makeSpecializedShim(shim.WEB_FRAMEWORK, 'server')
-  const grpcVersion = shim.require('./package.json').version
-  if (semver.lt(grpcVersion, '1.4.0')) {
-    shim.logger.debug('gRPC server-side instrumentation only supported on grpc-js >=1.4.0')
-    return
-  }
-
-  const server = webFrameworkShim.require('./build/src/server')
-  webFrameworkShim.setFramework('gRPC')
-  webFrameworkShim.wrap(server.Server.prototype, 'register', wrapRegister)
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "9.7.1",
+  "version": "9.7.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [