newrelic 9.0.2 → 9.0.3

package/NEWS.md

@@ -1,3 +1,9 @@
+### v9.0.3 (2022-09-06)
+
+* Updated gRPC client instrumenation to respect `grpc.record_errors` when deciding to log errors on gRPC client requests.
+
+* Fixed transaction name finalization to properly copy the appropriate transaction name to root segment.
+
 ### v9.0.2 (2022-08-23)
 
 * Added unit test suite for `lib/logger.js`.

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

@@ -78,9 +78,7 @@ function wrapStart(shim, original) {
         segment.addAttribute('grpc.statusCode', code)
         segment.addAttribute('grpc.statusText', details)
 
-        // Java captures client errors based on status code
-        // but has specific gRPC configuration to turn off
-        if (code !== 0) {
+        if (code !== 0 && shim.agent.config.grpc.record_errors) {
           // this is currently just creating an error from the details string
           shim.agent.errors.add(segment.transaction, details)
         }

package/lib/transaction/index.js

@@ -418,13 +418,7 @@ function finalizeNameFromUri(requestURL, statusCode) {
 
   this.url = urltils.scrub(requestURL)
   this.statusCode = statusCode
-
-  // Derive the name from the request URL.
-  const partialName = this._partialNameFromUri(requestURL, statusCode)
-  this._partialName = partialName.value
-  if (partialName.ignore) {
-    this.ignore = true
-  }
+  this.name = this.getFullName()
 
   // If a namestate stack exists, copy route parameters over to the trace.
   if (!this.nameState.isEmpty() && this.baseSegment) {
@@ -448,17 +442,6 @@ function finalizeNameFromUri(requestURL, statusCode) {
     }, this)
   }
 
-  // Apply transaction name normalization rules (sent by server) to full name.
-  const fullName = TYPE_METRICS[this.type] + '/' + this._partialName
-  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
-  if (normalized.ignore) {
-    this.ignore = true
-  }
-  this.name = normalized.value
-
-  // 5. transaction segment term normalizer
-  this.name = this.agent.txSegmentNormalizer.normalize(this.name).value
-
   // Allow the API to explicitly set the ignored status.
   if (this.forceIgnore !== null) {
     this.ignore = this.forceIgnore
@@ -528,25 +511,22 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
 Transaction.prototype.finalizeName = function finalizeName(name) {
   // If no name is given, and this is a web transaction with a url, then
   // finalize the name using the stored url.
-  if (name == null && this.type === 'web' && this.url) {
+  if (name == null && this.isWeb() && this.url) {
     return this.finalizeNameFromUri(this.url, this.statusCode)
   }
 
-  this._partialName = this.forceName || name || this._partialName
-  if (!this._partialName) {
+  // this may seem out of place but certain API methods
+  // set the _partialName directly so use that as a fallback
+  this._partialName = name || this._partialName
+
+  name = this.getFullName()
+
+  if (!name) {
     logger.debug('No name for transaction %s, not finalizing.', this.id)
     return
   }
 
-  const fullName = TYPE_METRICS[this.type] + '/' + this._partialName
-
-  // Transaction normalizers run on the full metric name, not the user facing
-  // transaction name.
-  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
-  if (normalized.ignore) {
-    this.ignore = true
-  }
-  this.name = normalized.value
+  this.name = name
 
   if (this.forceIgnore !== null) {
     this.ignore = this.forceIgnore
@@ -582,17 +562,25 @@ Transaction.prototype.finalizeName = function finalizeName(name) {
  */
 Transaction.prototype.getName = function getName() {
   if (this.isWeb() && this.url) {
-    return this._partialNameFromUri(this.url, this.statusCode).value
+    const finalName = this._partialNameFromUri(this.url, this.statusCode)
+    if (finalName.ignore) {
+      this.ignore = true
+    }
+    return finalName.value
   }
   return this._partialName
 }
 
 Transaction.prototype.getFullName = function getFullName() {
   let name = null
+  // use value from `api.setTransaction`
   if (this.forceName) {
     name = this.forceName
+    // use value from previously finalized named
   } else if (this.name) {
     return this.name
+    // derive name from uri in web case
+    // or just use whatever was this._partialName
   } else {
     name = this.getName()
   }
@@ -600,8 +588,23 @@ Transaction.prototype.getFullName = function getFullName() {
   if (!name) {
     return null
   }
-  const fullName = TYPE_METRICS[this.type] + '/' + name
-  return this.agent.transactionNameNormalizer.normalize(fullName).value
+
+  this._partialName = name
+  let fullName = TYPE_METRICS[this.type] + '/' + name
+  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
+  if (normalized.ignore) {
+    this.ignore = true
+  }
+
+  fullName = normalized.value
+
+  // apply transaction segment term normalizer
+  // only to web transactions
+  if (this.isWeb() && this.url) {
+    fullName = this.agent.txSegmentNormalizer.normalize(fullName).value
+  }
+
+  return fullName
 }
 
 /**

package/package.json

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