newrelic 7.1.0 → 7.1.1

package/NEWS.md

@@ -1,3 +1,12 @@
+### v7.1.1 (2021-02-01)
+
+* Upgrade @grpc/grpc-js to v1.2.5 to fix non-propagation of internal http2 errors
+  Now allows minor and patch auto-updates.
+
+* Added workflow for publishing to npm when a v* tag is pushed to the repo.
+
+* Fixes resolveMx test by using example.com for a valid exchange.
+
 ### 7.1.0 (2021-01-05):
 
 * Fixed SQL traces being generated with invalid ID.

package/THIRD_PARTY_NOTICES.md

@@ -35,6 +35,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 * [@newrelic/proxy](#newrelicproxy)
 * [@newrelic/test-utilities](#newrelictest-utilities)
+* [@octokit/rest](#octokitrest)
 * [JSV](#JSV)
 * [architect](#architect)
 * [benchmark](#benchmark)
@@ -73,7 +74,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.2.2](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.2)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.2/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.2.5](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.5/LICENSE):
 
 ```
                                  Apache License
@@ -1752,23 +1753,41 @@ This product includes source derived from [@newrelic/test-utilities](https://git
 
 ```
 
-### JSV
+### @octokit/rest
 
-This product includes source derived from [JSV](https://github.com/garycourt/JSV) ([v4.0.2](https://github.com/garycourt/JSV/tree/v4.0.2)), distributed under the [FreeBSD License](https://github.com/garycourt/JSV/tree/v4.0.2#license):
+This product includes source derived from [@octokit/rest](https://github.com/octokit/rest.js) ([v18.0.15](https://github.com/octokit/rest.js/tree/v18.0.15)), distributed under the [MIT License](https://github.com/octokit/rest.js/blob/v18.0.15/LICENSE):
 
 ```
-Copyright 2010 Gary Court. All rights reserved.
+The MIT License
+
+Copyright (c) 2012 Cloud9 IDE, Inc. (Mike de Boer)
+Copyright (c) 2017-2018 Octokit contributors
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
+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.
+
+```
 
-   1. Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
+### JSV
 
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-      of conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
+This product includes source derived from [JSV](https://github.com/garycourt/JSV) ([v4.0.2](https://github.com/garycourt/JSV/tree/v4.0.2)), distributed under the [FreeBSD License](https://github.com/garycourt/JSV/tree/v4.0.2#license):
 
+```
 THIS SOFTWARE IS PROVIDED BY GARY COURT ``AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GARY COURT OR

package/bin/generate-release-notes.js

@@ -0,0 +1,96 @@
+'use strict'
+
+const fs = require('fs')
+const github = require('./github')
+
+const FILE_NAME = 'NEWS.md'
+const PROPOSED_NOTES_HEADER = 'Proposed Release Notes'
+const NEXT_VERSION_HEADER = '### vNext (TBD):'
+
+async function generateReleaseNotes() {
+  try {
+    const latestRelease = await github.getLatestRelease()
+    console.log(`The latest release is: ${latestRelease.name} published: ${latestRelease.published_at}`)
+    console.log(`Tag: ${latestRelease.tag_name}, Target: ${latestRelease.target_commitish}`)
+
+    const tag = await github.getTagByName(latestRelease.tag_name)
+    console.log('The tag commit sha is: ', tag.commit.sha)
+
+    const commit = await github.getCommit(tag.commit.sha)
+    const commitDate = commit.commit.committer.date
+
+    console.log(`Finding merged pull requests since: ${commitDate}`)
+
+    const mergedPullRequests = await github.getMergedPullRequestsSince(commitDate)
+    console.log(`Found ${mergedPullRequests.length}`)
+
+    const releaseNoteData = mergedPullRequests.map((pr) => {
+      const parts = pr.body.split(/(?:^|\n)##\s*/g)
+      const {1: proposedReleaseNotes} = parts
+
+      const titleRemoved = proposedReleaseNotes.replace(PROPOSED_NOTES_HEADER, '')
+      return {
+        notes: titleRemoved,
+        url: pr.html_url
+      }
+    })
+
+    const finalData = releaseNoteData.reduce((result, currentValue) => {
+      result.notes += '\n\n' + currentValue.notes.trim()
+      result.links += `\n\n* PR: ${currentValue.url}\n`
+      return result
+    }, {
+      notes: '',
+      links: ''
+    })
+
+    console.log('Final data: ', JSON.stringify(finalData))
+
+    await updateReleaseNotes(FILE_NAME, finalData.notes)
+
+    console.log('*** [SUCCESS] ***')
+  } catch(err) {
+    console.log('! [FAILURE] !')
+    console.error(err)
+  }
+}
+
+function updateReleaseNotes(file, newNotes) {
+  const promise = new Promise((resolve, reject) => {
+    fs.readFile(file, 'utf8', function (err, data) {
+      if (err) {
+        return reject(err)
+      }
+
+      if (data.startsWith(NEXT_VERSION_HEADER)) {
+        const errMessage = [
+          `${file} already contains '${NEXT_VERSION_HEADER}'`,
+          'Delete existing vNext release notes (if desired) and run again'
+        ].join('\n')
+
+        return reject(new Error(errMessage))
+      }
+
+      const newContent = [
+        NEXT_VERSION_HEADER,
+        newNotes,
+        '\n\n',
+        data
+      ].join('')
+
+      fs.writeFile(file, newContent, 'utf8', function (err) {
+        if (err) {
+          return reject(err)
+        }
+
+        console.log(`Added new release notes to ${file} under the ${NEXT_VERSION_HEADER}`)
+
+        resolve()
+      })
+    })
+  })
+
+  return promise
+}
+
+generateReleaseNotes()

package/bin/github.js

@@ -0,0 +1,106 @@
+'use strict'
+
+const { Octokit } = require("@octokit/rest")
+
+const repoOwner = 'newrelic'
+const repository = 'node-newrelic'
+
+if (!process.env.GITHUB_TOKEN) {
+  console.log('GITHUB_TOKEN recommended to be set in ENV')
+}
+
+const octokit = new Octokit({
+  auth: process.env.GITHUB_TOKEN,
+})
+
+async function getLatestRelease() {
+  const result = await octokit.repos.getLatestRelease({
+    owner: repoOwner,
+    repo: repository
+  })
+
+  return result.data
+}
+
+async function getTagByName(name) {
+  const perPage = 100
+
+  let pageNum = 1
+
+  let result = null
+  do {
+    result = await octokit.repos.listTags({
+      owner: repoOwner,
+      repo: repository,
+      per_page: perPage,
+      page: pageNum
+    })
+
+    const found = result.data.find((tag) => {
+      return tag.name === name
+    })
+
+    if (found) {
+      return found
+    }
+
+    pageNum++
+  } while (result.data.length === perPage) // there *might* be more data
+
+  return null
+}
+
+async function getCommit(sha) {
+  const result = await octokit.repos.getCommit({
+    owner: repoOwner,
+    repo: repository,
+    ref: sha
+  })
+
+  return result.data
+}
+
+async function getMergedPullRequestsSince(date) {
+  const perPage = 50
+
+  const comparisonDate = new Date(date)
+
+  let pageNum = 1
+  const mergedPullRequests = []
+  let result = null
+  let hadData = false
+
+  do {
+    result = await octokit.pulls.list({
+      owner: repoOwner,
+      repo: repository,
+      state: 'closed',
+      sort: 'updated',
+      direction: 'desc',
+      per_page: perPage,
+      page: pageNum
+    })
+
+    const mergedPrs = result.data.filter((pr) => {
+      return pr.merged_at && new Date(pr.merged_at) > comparisonDate
+    })
+
+    mergedPullRequests.push(...mergedPrs)
+    // Since we are going by 'updated' on query but merged on filter,
+    // there's a chance some boundaries are off. While in super extreme
+    // cases we could still miss some it is unlikely given we are grabbing
+    // large pages.
+    hadData = mergedPrs.length > 0
+
+    pageNum++
+  } while (result.data.length === perPage && hadData) // might be more in next batch
+
+  return mergedPullRequests
+}
+
+module.exports = {
+  getLatestRelease,
+  getTagByName,
+  getCommit,
+  getMergedPullRequestsSince
+}

package/bin/update-changelog-version.js

@@ -0,0 +1,66 @@
+'use strict'
+
+/**
+ * Executed as a part of the "version" step of npm version.
+ * Updates the placeholder release note header with the incremented version
+ * from running npm version
+ */
+
+const fs = require('fs')
+const packageInfo = require('../package.json')
+
+const FILE_NAME = 'NEWS.md'
+const NEXT_VERSION_HEADER = '### vNext (TBD):'
+
+const SUCCESS_MSG = '*** [SUCCESS] ***'
+const FAIL_MSG = '! [FAILURE] !'
+
+updateChangelogVersion()
+
+async function updateChangelogVersion() {
+  try {
+    await updateHeader(FILE_NAME)
+
+    console.log(SUCCESS_MSG)
+  } catch (err) {
+    console.log(FAIL_MSG)
+    console.error(err)
+  }
+}
+
+function updateHeader(file) {
+  const promise = new Promise((resolve, reject) => {
+    fs.readFile(file, 'utf8', (err, data) => {
+      if (err) {
+        return reject(err)
+      }
+
+      // toISOString() will always return UTC time
+      const todayFormatted = new Date().toISOString().split('T')[0]
+      const version = `v${packageInfo.version}`
+      const newChangelogHeader = `### ${version} (${todayFormatted})`
+
+      console.log('Updating vNext header to: ', newChangelogHeader)
+
+      if (!data.startsWith(NEXT_VERSION_HEADER)) {
+        const err = new Error(`Failed to find next version header in form: '${NEXT_VERSION_HEADER}'`)
+        return reject(err)
+      }
+
+      const modified = data.replace(
+        NEXT_VERSION_HEADER,
+        newChangelogHeader
+      )
+
+      fs.writeFile(file, modified, 'utf8', (err) => {
+        if (err) {
+          return reject (err)
+        }
+
+        console.log(SUCCESS_MSG)
+      })
+    })
+  })
+
+  return promise
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -136,13 +136,15 @@
     "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=180 --no-coverage",
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
-    "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh"
+    "update-changelog-version": "node ./bin/update-changelog-version",
+    "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh",
+    "version": "npm run update-changelog-version && git add ./NEWS.md"
   },
   "bin": {
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.2.2",
+    "@grpc/grpc-js": "^1.2.5",
     "@grpc/proto-loader": "^0.5.5",
     "@newrelic/aws-sdk": "^3.0.0",
     "@newrelic/koa": "^5.0.0",
@@ -161,6 +163,8 @@
   "devDependencies": {
     "@newrelic/proxy": "^2.0.0",
     "@newrelic/test-utilities": "^5.0.0",
+    "@octokit/rest": "^18.0.15",
+    "JSV": "~4.0.2",
     "architect": "*",
     "benchmark": "^2.1.4",
     "bluebird": "^3.4.7",
@@ -173,7 +177,6 @@
     "got": "^8.0.1",
     "http-errors": "^1.7.3",
     "jsdoc": "^3.6.3",
-    "JSV": "~4.0.2",
     "memcached": ">=0.2.8",
     "minami": "^1.1.1",
     "mongodb": "^3.3.3",

package/third_party_manifest.json

@@ -1,18 +1,18 @@
 {
-  "lastUpdated": "Tue Jan 05 2021 10:10:23 GMT-0800 (Pacific Standard Time)",
+  "lastUpdated": "Mon Feb 01 2021 09:58:16 GMT-0800 (Pacific Standard Time)",
   "projectName": "New Relic Node Agent",
   "projectUrl": "https://github.com/newrelic/node-newrelic",
   "includeDev": true,
   "dependencies": {
-    "@grpc/grpc-js@1.2.2": {
+    "@grpc/grpc-js@1.2.5": {
       "name": "@grpc/grpc-js",
-      "version": "1.2.2",
-      "range": "1.2.2",
+      "version": "1.2.5",
+      "range": "^1.2.5",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
-      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.2",
+      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.5",
       "licenseFile": "node_modules/@grpc/grpc-js/LICENSE",
-      "licenseUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.2/LICENSE",
+      "licenseUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.5/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Google Inc."
     },
@@ -184,6 +184,17 @@
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
     },
+    "@octokit/rest@18.0.15": {
+      "name": "@octokit/rest",
+      "version": "18.0.15",
+      "range": "^18.0.15",
+      "licenses": "MIT",
+      "repoUrl": "https://github.com/octokit/rest.js",
+      "versionedRepoUrl": "https://github.com/octokit/rest.js/tree/v18.0.15",
+      "licenseFile": "node_modules/@octokit/rest/LICENSE",
+      "licenseUrl": "https://github.com/octokit/rest.js/blob/v18.0.15/LICENSE",
+      "licenseTextSource": "file"
+    },
     "JSV@4.0.2": {
       "name": "JSV",
       "version": "4.0.2",