Merge branch 'master' into sabrenner/couchbasesegfaultfix

Author: sabrenner

.circleci/config.yml

@@ -99,7 +99,7 @@ node-upstream-base: &node-upstream-base
   parameters:
     node-version:
       type: string
-      default: "12"
+      default: "14"
   docker:
     - image: node:<< parameters.node-version >>
   working_directory: ~/dd-trace-js
@@ -219,7 +219,7 @@ workflows:
       - node-bench-sirun-startup: &matrix-exact-supported-node-versions
           matrix:
             parameters:
-              node-version: ["12", "14", "16"]
+              node-version: ["14", "16", "18"]
       - node-bench-sirun-spans: *matrix-exact-supported-node-versions
       - node-bench-sirun-async_hooks: *matrix-exact-supported-node-versions
       - node-bench-sirun-log: *matrix-exact-supported-node-versions

.github/actions/node/17/action.yml

@@ -1,7 +1,7 @@
-name: Node 12
+name: Node 18
 runs:
   using: composite
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: '12'
+        node-version: '18'

.github/actions/node/12/action.yml renamed to .github/actions/node/18/action.yml

@@ -1,7 +1,7 @@
-name: Node 17
+name: Node 18
 runs:
   using: composite
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: '17'
+        node-version: '18'

.github/actions/node/latest/action.yml

@@ -1,7 +1,7 @@
-name: Node 12
+name: Node 14
 runs:
   using: composite
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: '12'
+        node-version: '14'

.github/actions/node/oldest/action.yml

@@ -5,3 +5,4 @@ runs:
     - uses: actions/setup-node@v3
       with:
         cache: yarn
+        node-version: '14'

.github/actions/node/setup/action.yml

@@ -1,7 +1,9 @@
 name: Core
 
 on:
+  pull_request:
   push:
+    branches: [master]
   schedule:
     - cron: '0 4 * * *'
 

.github/workflows/core.yml

@@ -0,0 +1,25 @@
+name: Package Size
+
+on:
+  pull_request:
+  schedule:
+    - cron: '0 4 * * *'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  package-size-report:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: yarn
+      - name: Compute module size tree and report
+        uses: qard/heaviest-objects-in-the-universe@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package-size.yml

@@ -1,7 +1,9 @@
 name: Plugins
 
 on:
+  pull_request:
   push:
+    branches: [master]
   schedule:
     - cron: '0 4 * * *'
 
@@ -260,8 +262,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/12
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/14
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/16
@@ -370,7 +370,7 @@ jobs:
       - run: yarn test:plugins:upstream
       - uses: codecov/codecov-action@v2
 
-  # The grpc version ranges we support only support up to Node 12.
+  # The grpc version ranges we support only support up to Node 14.
   grpc:
     runs-on: ubuntu-latest
     env:
@@ -383,7 +383,7 @@ jobs:
       - run: yarn test:plugins:ci
       - uses: codecov/codecov-action@v2
 
-  # The hapi version ranges we support only support up to Node 12.
+  # The hapi version ranges we support only support up to Node 14.
   hapi:
     runs-on: ubuntu-latest
     env:
@@ -404,8 +404,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/12
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/14
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/16
@@ -422,8 +420,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/12
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/14
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/16
@@ -659,8 +655,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/12
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/14
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/16
@@ -699,7 +693,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
-      - run: yarn install
+      - run: yarn install --ignore-engine
       - run: yarn test:plugins:ci
       - uses: codecov/codecov-action@v2
 
@@ -711,8 +705,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/12
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/14
       - run: yarn test:plugins:ci
       - uses: codecov/codecov-action@v2
@@ -731,7 +723,7 @@ jobs:
       # - run: yarn test:plugins:upstream
       - uses: codecov/codecov-action@v2
 
-  # The pg version range we support doesn't work beyond Node 12.
+  # The pg version range we support doesn't work beyond Node 14.
   postgres:
     runs-on: ubuntu-latest
     services:
@@ -827,7 +819,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/16
       - run: yarn test:plugins:ci
       - uses: codecov/codecov-action@v2
 

.github/workflows/plugins.yml

@@ -1,7 +1,9 @@
 name: Profiling
 
 on:
+  pull_request:
   push:
+    branches: [master]
   schedule:
     - cron: '0 4 * * *'
 
@@ -25,8 +27,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/12
-      - run: yarn test:profiler:ci
       - uses: ./.github/actions/node/14
       - run: yarn test:profiler:ci
       - uses: ./.github/actions/node/16