Merge branch 'master' into feature/fix-ncc

Author: vitramir

.ci/Jenkinsfile

@@ -53,6 +53,9 @@ pipeline {
               "^test/instrumentation/modules/"
             ]
             env.TAV_UPDATED = isGitRegionMatch(patterns: regexps)
+
+            // Skip all the stages except docs for PR's with asciidoc or md changes only
+            env.ONLY_DOCS = isGitRegionMatch(patterns: [ '.*\\.(asciidoc|md)' ], shouldMatchAll: true)
           }
         }
       }
@@ -67,7 +70,10 @@ pipeline {
       }
       when {
         beforeAgent true
-        expression { return params.tests_ci }
+        allOf {
+          expression { return env.ONLY_DOCS == "false" }
+          expression { return params.tests_ci }
+        }
       }
       steps {
         withGithubNotify(context: 'Test', tab: 'tests') {
@@ -120,6 +126,7 @@ pipeline {
             expression { return env.TAV_UPDATED != "false" }
           }
           expression { return params.tav_ci }
+          expression { return env.ONLY_DOCS == "false" }
         }
       }
       steps {
@@ -157,6 +164,7 @@ pipeline {
             triggeredBy 'TimerTrigger'
           }
           expression { return params.test_edge_ci }
+          expression { return env.ONLY_DOCS == "false" }
         }
       }
       parallel {
@@ -254,9 +262,12 @@ pipeline {
       agent none
       when {
         beforeAgent true
-        anyOf {
-          changeRequest()
-          expression { return !params.Run_As_Master_Branch }
+        allOf {
+          expression { return env.ONLY_DOCS == "false" }
+          anyOf {
+            changeRequest()
+            expression { return !params.Run_As_Master_Branch }
+          }
         }
       }
       steps {
@@ -471,7 +482,7 @@ def generateStepForWindows(Map params = [:]){
           deleteDir()
           unstash 'source'
           dir(BASE_DIR) {
-            installTools([ [tool: 'nodejs', version: "${version}" ] ])
+            installTools([ [tool: 'nodejs-lts', version: "${version}" ] ])
             bat label: 'Tool versions', script: '''
               npm --version
               node --version

CHANGELOG.asciidoc

@@ -24,8 +24,8 @@ endif::[]
 [[release-notes-3.5.0]]
 ==== 3.5.0 - 2020/3/9
 
-* feat(error): get stack trace from Error-like objects {pull}1613)[#1613)]
-* fix: add logUncaughtExceptions conf option to TypeScript typings {pull}1668)[#1668)]
+* feat(error): get stack trace from Error-like objects {pull}1613[#1613]
+* fix: add logUncaughtExceptions conf option to TypeScript typings {pull}1668[#1668]
 
 [[release-notes-3.4.0]]
 ==== 3.4.0 - 2020/2/21

README.md

@@ -56,7 +56,7 @@ Contributions are welcome,
 but we recommend that you take a moment and read our [contribution guide](CONTRIBUTING.md) first.
 
 To see what data is being sent to the APM Server,
-use the environment variable `ELASTIC_APM_PAYLOAD_LOG_FILE` (or the config option `payloadLogFile`) to speicfy a log file,
+use the environment variable `ELASTIC_APM_PAYLOAD_LOG_FILE` (or the config option `payloadLogFile`) to specify a log file,
 e.g:
 
 ```

TESTING.md

@@ -130,3 +130,29 @@ Run the benchmarks:
 ```
 npm run bench
 ```
+
+## Jenkins
+
+Below are some useful GitHub PR comments that will trigger Jenkins
+builds for the current PR (you need to be a project member for these to
+have any effect).
+
+Run the regular test suite:
+
+```
+jenkins run the tests please
+```
+
+Run the lint tests only:
+
+```
+jenkins run lint please
+```
+
+Run TAV tests for one or more modules, where `<modules>` can be either a
+comma separated list of modules (e.g.  `memcached,redis`) or the
+string literal `ALL` to test _all_ modules:
+
+```
+jenkins run the module tests for <modules>
+```

docs/intro.asciidoc

@@ -30,7 +30,6 @@ You can then use the APM app in Kibana to gain insight into latency issues and e
 [[additional-components]]
 === Additional Components
 
-APM Agents work in conjunction with the {apm-server-ref-v}/index.html[APM Server],
-{ref}/index.html[Elasticsearch],
-and {kibana-ref}/index.html[Kibana].
-Please view the {apm-overview-ref-v}/index.html[APM Overview] for details on how these components work together. 
+APM Agents work in conjunction with the {apm-server-ref-v}/index.html[APM Server], {ref}/index.html[Elasticsearch], and {kibana-ref}/index.html[Kibana].
+The {apm-overview-ref-v}/index.html[APM Overview] provides details on how these components work together,
+and provides a matrix outlining {apm-overview-ref-v}/agent-server-compatibility.html[Agent and Server compatibility].

package.json

@@ -103,11 +103,12 @@
     "set-cookie-serde": "^1.0.0",
     "shallow-clone-shim": "^2.0.0",
     "sql-summary": "^1.0.1",
-    "stackman": "^4.0.0",
+    "stackman": "^4.0.1",
     "traceparent": "^1.0.0",
     "unicode-byte-truncate": "^1.0.0"
   },
   "devDependencies": {
+    "@apidevtools/json-schema-ref-parser": "^8.0.0",
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.8.4",
     "@babel/preset-env": "^7.8.4",
@@ -119,7 +120,7 @@
     "@types/node": "^13.7.4",
     "apollo-server-express": "^2.10.1",
     "aws-sdk": "^2.622.0",
-    "backport": "^4.9.0",
+    "backport": "^5.1.2",
     "benchmark": "^2.1.4",
     "bluebird": "^3.7.2",
     "cassandra-driver": "^4.4.0",
@@ -145,7 +146,6 @@
     "ioredis": "^4.16.0",
     "is-my-json-valid": "^2.20.0",
     "jade": "^1.11.0",
-    "json-schema-ref-parser": "^7.1.3",
     "knex": "^0.20.10",
     "koa": "^2.11.0",
     "koa-router": "^8.0.8",
@@ -170,7 +170,7 @@
     "restify-clients": "^2.6.9",
     "rimraf": "^3.0.2",
     "send": "^0.17.1",
-    "standard": "^14.3.1",
+    "standard": "^14.3.3",
     "tape": "^4.13.0",
     "tedious": "^8.0.1",
     "test-all-versions": "^4.1.1",

test/integration/api-schema/_utils.js

@@ -6,7 +6,7 @@ const tmpdir = require('os').tmpdir
 const join = require('path').join
 
 const validator = require('is-my-json-valid')
-const refParser = require('json-schema-ref-parser')
+const refParser = require('@apidevtools/json-schema-ref-parser')
 const rimraf = require('rimraf')
 const thunky = require('thunky')