v3.22.0 proposal

.github/workflows/appsec.yml

@@ -109,7 +109,7 @@ jobs:
         ports:
           - 3306:3306
     env:
-      PLUGINS: mysql|mysql2
+      PLUGINS: mysql|mysql2|sequelize
       SERVICES: mysql
     steps:
       - uses: actions/checkout@v2

.github/workflows/system-tests.yml

@@ -42,7 +42,7 @@ jobs:
         run: ./build.sh
 
       - name: Run
-        run: ./run.sh
+        run: ./run.sh TRACER_ESSENTIAL_SCENARIOS
 
       - name: Compress artifact
         if: ${{ always() }}

benchmark/sirun/log/index.js

@@ -4,7 +4,6 @@ const log = require('../../../packages/dd-trace/src/log')
 
 const {
   DD_TRACE_DEBUG = 'true',
-  ITERATIONS = 1000,
   WITH_LEVEL = 'debug'
 } = process.env
 
@@ -19,6 +18,6 @@ log.use({
   error () {}
 })
 
-for (let i = 0; i < ITERATIONS; i++) {
+for (let i = 0; i < 1000000; i++) {
   log[WITH_LEVEL](() => 'message')
 }

benchmark/sirun/log/meta.json

@@ -3,7 +3,7 @@
   "run": "node index.js",
   "run_with_affinity": "bash -c \"taskset -c $CPU_AFFINITY node index.js\"",
   "cachegrind": false,
-  "iterations": 190,
+  "iterations": 40,
   "instructions": true,
   "variants": {
     "without-log": { "env": { "DD_TRACE_DEBUG": "false" } },

integration-tests/ci-visibility-intake.js

@@ -161,12 +161,13 @@ class FakeCiVisIntake extends FakeAgent {
     })
   }
 
-  async stop () {
-    await super.stop()
+  stop () {
     settings = DEFAULT_SETTINGS
     suitesToSkip = DEFAULT_SUITES_TO_SKIP
     gitUploadStatus = DEFAULT_GIT_UPLOAD_STATUS
     infoResponse = DEFAULT_INFO_RESPONSE
+    this.removeAllListeners()
+    return super.stop()
   }
 
   // Similar to gatherPayloads but resolves if enough payloads have been gathered
@@ -230,7 +231,7 @@ class FakeCiVisIntake extends FakeAgent {
       }, timeout || 15000)
       const messageHandler = (message) => {
         if (!payloadMatch || payloadMatch(message)) {
-          clearInterval(timeoutId)
+          clearTimeout(timeoutId)
           resolve(message)
           this.off('message', messageHandler)
         }

integration-tests/ci-visibility.spec.js

@@ -455,7 +455,7 @@ testFrameworks.forEach(({
         receiver.assertPayloadReceived(() => {
           const error = new Error('it should not report code coverage')
           done(error)
-        }, ({ url }) => url === '/api/v2/citestcov')
+        }, ({ url }) => url === '/api/v2/citestcov').catch(() => {})
 
         receiver.assertPayloadReceived(({ headers, payload }) => {
           assert.propertyVal(headers, 'dd-api-key', '1')
@@ -774,7 +774,7 @@ testFrameworks.forEach(({
         receiver.assertPayloadReceived(() => {
           const error = new Error('it should not report code coverage')
           done(error)
-        }, ({ url }) => url === '/evp_proxy/v2/api/v2/citestcov')
+        }, ({ url }) => url === '/evp_proxy/v2/api/v2/citestcov').catch(() => {})
 
         receiver.assertPayloadReceived(({ headers, payload }) => {
           assert.notProperty(headers, 'dd-api-key')
@@ -817,7 +817,7 @@ testFrameworks.forEach(({
 
           const [coveragePayload] = coverageRequest.payload
           assert.notProperty(coverageRequest.headers, 'dd-api-key')
-          assert.propertyVal(coverageRequest.headers, 'x-datadog-evp-subdomain', 'event-platform-intake')
+          assert.propertyVal(coverageRequest.headers, 'x-datadog-evp-subdomain', 'citestcov-intake')
           assert.propertyVal(coveragePayload, 'name', 'coverage1')
           assert.propertyVal(coveragePayload, 'filename', 'coverage1.msgpack')
           assert.propertyVal(coveragePayload, 'type', 'application/msgpack')

integration-tests/ci-visibility/fixtures/coverage.json

@@ -0,0 +1,263 @@
+{
+  "src/utils.tsx": {
+    "path": "src/utils.tsx",
+    "statementMap": {
+      "0": {
+        "start": {
+          "line": 1,
+          "column": 19
+        },
+        "end": {
+          "line": 1,
+          "column": 48
+        }
+      },
+      "1": {
+        "start": {
+          "line": 1,
+          "column": 43
+        },
+        "end": {
+          "line": 1,
+          "column": 48
+        }
+      },
+      "2": {
+        "start": {
+          "line": 3,
+          "column": 23
+        },
+        "end": {
+          "line": 9,
+          "column": 1
+        }
+      },
+      "3": {
+        "start": {
+          "line": 4,
+          "column": 2
+        },
+        "end": {
+          "line": 8,
+          "column": 3
+        }
+      },
+      "4": {
+        "start": {
+          "line": 5,
+          "column": 4
+        },
+        "end": {
+          "line": 5,
+          "column": 17
+        }
+      },
+      "5": {
+        "start": {
+          "line": 7,
+          "column": 4
+        },
+        "end": {
+          "line": 7,
+          "column": 41
+        }
+      }
+    },
+    "fnMap": {
+      "0": {
+        "name": "(anonymous_0)",
+        "decl": {
+          "start": {
+            "line": 1,
+            "column": 19
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 43
+          },
+          "end": {
+            "line": 1,
+            "column": 48
+          }
+        },
+        "line": 1
+      },
+      "1": {
+        "name": "(anonymous_1)",
+        "decl": {
+          "start": {
+            "line": 3,
+            "column": 23
+          },
+          "end": {
+            "line": 3,
+            "column": 24
+          }
+        },
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 42
+          },
+          "end": {
+            "line": 9,
+            "column": 1
+          }
+        },
+        "line": 3
+      }
+    },
+    "branchMap": {
+      "0": {
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 2
+          },
+          "end": {
+            "line": 8,
+            "column": 3
+          }
+        },
+        "type": "if",
+        "locations": [
+          {
+            "start": {
+              "line": 4,
+              "column": 2
+            },
+            "end": {
+              "line": 8,
+              "column": 3
+            }
+          },
+          {
+            "start": {
+              "line": 4,
+              "column": 2
+            },
+            "end": {
+              "line": 8,
+              "column": 3
+            }
+          }
+        ],
+        "line": 4
+      }
+    },
+    "s": {
+      "0": 1,
+      "1": 0,
+      "2": 1,
+      "3": 1,
+      "4": 0,
+      "5": 1
+    },
+    "f": {
+      "0": 0,
+      "1": 1
+    },
+    "b": {
+      "0": [0, 1]
+    }
+  },
+  "src/App.tsx": {
+    "path": "src/App.tsx",
+    "statementMap": {
+      "0": {
+        "start": {
+          "line": 6,
+          "column": 12
+        },
+        "end": {
+          "line": 25,
+          "column": 1
+        }
+      },
+      "1": {
+        "start": {
+          "line": 7,
+          "column": 2
+        },
+        "end": {
+          "line": 24,
+          "column": 4
+        }
+      }
+    },
+    "fnMap": {
+      "0": {
+        "name": "(anonymous_0)",
+        "decl": {
+          "start": {
+            "line": 6,
+            "column": 12
+          },
+          "end": {
+            "line": 6,
+            "column": 13
+          }
+        },
+        "loc": {
+          "start": {
+            "line": 6,
+            "column": 18
+          },
+          "end": {
+            "line": 25,
+            "column": 1
+          }
+        },
+        "line": 6
+      }
+    },
+    "branchMap": {},
+    "s": {
+      "0": 1,
+      "1": 1
+    },
+    "f": {
+      "0": 1
+    },
+    "b": {}
+  },
+  "src/index.tsx": {
+    "path": "src/index.tsx",
+    "statementMap": {
+      "0": {
+        "start": {
+          "line": 7,
+          "column": 0
+        },
+        "end": {
+          "line": 7,
+          "column": 58
+        }
+      },
+      "1": {
+        "start": {
+          "line": 12,
+          "column": 0
+        },
+        "end": {
+          "line": 12,
+          "column": 27
+        }
+      }
+    },
+    "fnMap": {},
+    "branchMap": {},
+    "s": {
+      "0": 1,
+      "1": 1
+    },
+    "f": {},
+    "b": {}
+  }
+}

integration-tests/ci-visibility/web-app-server.js

@@ -1,5 +1,6 @@
 // File to spin an HTTP server that returns an HTML for playwright to visit
 const http = require('http')
+const coverage = require('../ci-visibility/fixtures/coverage.json')
 
 module.exports = http.createServer((req, res) => {
   res.setHeader('Content-Type', 'text/html')
@@ -10,6 +11,9 @@ module.exports = http.createServer((req, res) => {
       <body>
         <div class="hello-world">Hello World</div>
       </body>
+      <script>
+        window.__coverage__ = ${JSON.stringify(coverage)}
+      </script>
     </html>
   `)
 })