V4.8.0 proposal

.eslintignore

@@ -6,3 +6,4 @@ node_modules
 versions
 acmeair-nodejs
 vendor
+integration-tests/esbuild/out.js

.eslintrc.json

@@ -33,6 +33,7 @@
     "mocha/no-global-tests": 0,
     "mocha/no-exports": 0,
     "mocha/no-skipped-tests": 0,
-    "n/no-restricted-require": [2, ["diagnostics_channel"]]
+    "n/no-restricted-require": [2, ["diagnostics_channel"]],
+    "object-curly-newline": ["error", {"multiline": true, "consistent": true }]
   }
 }

.github/workflows/plugins.yml

@@ -182,24 +182,25 @@ jobs:
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v2
 
-  # couchbase:
-  #   runs-on: ubuntu-latest
-  #   services:
-  #     couchbase:
-  #       image: sabrenner/couchbase-server-sandbox:latest
-  #       ports:
-  #         - 8091-8095:8091-8095
-  #         - 11210:11210
-  #   env:
-  #     PLUGINS: couchbase
-  #     SERVICES: couchbase
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: ./.github/actions/node/setup
-  #     - run: yarn install
-  #     - uses: ./.github/actions/node/oldest
-  #     - run: yarn test:plugins:ci
-  #     - uses: codecov/codecov-action@v2
+  couchbase:
+    runs-on: ubuntu-latest
+    services:
+      couchbase:
+        image: ghcr.io/datadog/couchbase-server-sandbox:latest
+        ports:
+          - 8091-8095:8091-8095
+          - 11210:11210
+    env:
+      PLUGINS: couchbase
+      SERVICES: couchbase
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/testagent/start
+      - uses: ./.github/actions/node/setup
+      - run: yarn install
+      - uses: ./.github/actions/node/oldest
+      - run: yarn test:plugins:ci
+      - uses: codecov/codecov-action@v2
 
   connect:
     runs-on: ubuntu-latest
@@ -778,6 +779,23 @@ jobs:
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v2
 
+  openai:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: openai
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/testagent/start
+      - uses: ./.github/actions/node/setup
+      - run: yarn install
+      - uses: ./.github/actions/node/oldest
+      - run: yarn test:plugins:ci
+      - uses: ./.github/actions/node/latest
+      - run: yarn test:plugins:ci
+      - if: always()
+        uses: ./.github/actions/testagent/logs
+      - uses: codecov/codecov-action@v2
+
   opensearch:
     runs-on: ubuntu-latest
     services:

README.md

@@ -143,8 +143,8 @@ $ yarn leak:plugins
 
 ### Linting
 
-We use [ESLint](https://eslint.org) to make sure that new code is
-conform to our coding standards.
+We use [ESLint](https://eslint.org) to make sure that new code
+conforms to our coding standards.
 
 To run the linter, use:
 

benchmark/sirun/get-results.js

@@ -22,10 +22,12 @@ const artifactsUrl = num =>
 
 function get (url, headers) {
   return new Promise((resolve, reject) => {
-    https.get(url, { headers: Object.assign({
-      'user-agent': 'dd-results-retriever',
-      accept: 'application/json'
-    }, headers) }, async res => {
+    https.get(url, {
+      headers: Object.assign({
+        'user-agent': 'dd-results-retriever',
+        accept: 'application/json'
+      }, headers)
+    }, async res => {
       if (res.statusCode >= 300 && res.statusCode < 400) {
         resolve(get(res.headers.location))
         return

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "2"
 services:
   couchbase:
-    image: sabrenner/couchbase-server-sandbox:latest
+    image: ghcr.io/datadog/couchbase-server-sandbox:latest
     ports:
       - "127.0.0.1:8091-8095:8091-8095"
       - "127.0.0.1:11210:11210"

integration-tests/ci-visibility.spec.js

@@ -230,6 +230,28 @@ testFrameworks.forEach(({
             }).catch(done)
         })
       })
+      it('reports timeout error message', (done) => {
+        childProcess = fork('ci-visibility/run-jest.js', {
+          cwd,
+          env: {
+            ...getCiVisAgentlessConfig(receiver.port),
+            NODE_OPTIONS: '-r dd-trace/ci/init',
+            RUN_IN_PARALLEL: true,
+            TEST_REGEX: 'timeout-test/timeout-test.js'
+          },
+          stdio: 'pipe'
+        })
+        childProcess.stdout.on('data', (chunk) => {
+          testOutput += chunk.toString()
+        })
+        childProcess.stderr.on('data', (chunk) => {
+          testOutput += chunk.toString()
+        })
+        childProcess.on('message', () => {
+          assert.include(testOutput, 'Exceeded timeout of 100 ms for a test')
+          done()
+        })
+      })
     }
 
     it('can run tests and report spans', (done) => {

integration-tests/ci-visibility/run-jest.js

@@ -4,7 +4,7 @@ const options = {
   projects: [__dirname],
   testPathIgnorePatterns: ['/node_modules/'],
   cache: false,
-  testRegex: /test\/ci-visibility-test/,
+  testRegex: process.env.TEST_REGEX ? new RegExp(process.env.TEST_REGEX) : /test\/ci-visibility-test/,
   coverage: true,
   runInBand: true
 }

integration-tests/ci-visibility/timeout-test/timeout-test.js

@@ -0,0 +1,9 @@
+/* eslint-disable */
+jest.setTimeout(100)
+describe('ci visibility', () => {
+  it('will timeout', (done) => {
+    setTimeout(() => {
+      done()
+    }, 200)
+  })
+})

integration-tests/serverless/test-gcloud-function.sh

@@ -11,30 +11,33 @@ ls "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/"
 STAGE=$(xxd -l 4 -c 4 -p </dev/random)
 
 function cleanup {
-    gcloud functions delete dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --quiet 
+    gcloud functions delete dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --quiet --project datadog-sandbox 
 }
 trap cleanup EXIT
 
 echo "Deploying integration test cloud function"
 
-gcloud functions deploy dd-trace-js-sls-mini-agent-integration-test-${STAGE} \
+DEPLOY_OUTPUT=$(gcloud functions deploy dd-trace-js-sls-mini-agent-integration-test-${STAGE} \
     --gen2 \
     --runtime=nodejs18 \
     --region=us-east1 \
+    --project=datadog-sandbox \
     --source "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/" \
     --entry-point=helloGET \
     --trigger-http \
     --allow-unauthenticated \
-    --env-vars-file "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/.env.yaml"
+    --env-vars-file "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/.env.yaml")
+
+INVOKE_URL=$(echo "$DEPLOY_OUTPUT" | awk 'END {print $NF}')
 
 echo "Calling deployed cloud function"
 
-curl -s "https://us-east1-datadog-sandbox.cloudfunctions.net/dd-trace-js-sls-mini-agent-integration-test-${STAGE}"
+curl -s "${INVOKE_URL}"
 
-echo "Waiting 1 minute before tailing logs"
+echo "Waiting 60 seconds before tailing logs"
 sleep 60
 
-LOGS=$(gcloud functions logs read dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --limit 1000)
+LOGS=$(gcloud functions logs read dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --limit 1000 --project datadog-sandbox)
 
 echo "$LOGS"
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -68,9 +68,9 @@
   "dependencies": {
     "@datadog/native-appsec": "^3.2.0",
     "@datadog/native-iast-rewriter": "2.0.1",
-    "@datadog/native-iast-taint-tracking": "^1.5.0",
+    "@datadog/native-iast-taint-tracking": "1.5.0",
     "@datadog/native-metrics": "^2.0.0",
-    "@datadog/pprof": "3.0.0",
+    "@datadog/pprof": "3.1.0",
     "@datadog/sketches-js": "^2.1.0",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^1.14.0",

packages/datadog-core/src/storage/async_resource.js

@@ -5,6 +5,7 @@ const { channel } = require('../../../diagnostics_channel')
 
 const beforeCh = channel('dd-trace:storage:before')
 const afterCh = channel('dd-trace:storage:after')
+const enterCh = channel('dd-trace:storage:enter')
 
 let PrivateSymbol = Symbol
 function makePrivateSymbol () {
@@ -52,6 +53,7 @@ class AsyncResourceStorage {
     const resource = this._executionAsyncResource()
 
     resource[this._ddResourceStore] = store
+    enterCh.publish()
   }
 
   run (store, callback, ...args) {
@@ -61,11 +63,13 @@ class AsyncResourceStorage {
     const oldStore = resource[this._ddResourceStore]
 
     resource[this._ddResourceStore] = store
+    enterCh.publish()
 
     try {
       return callback(...args)
     } finally {
       resource[this._ddResourceStore] = oldStore
+      enterCh.publish()
     }
   }
 

packages/datadog-instrumentations/src/couchbase.js

@@ -160,7 +160,7 @@ function wrapV3Query (query) {
 }
 
 // semver >=2 <3
-addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.5'] }, Bucket => {
+addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.12'] }, Bucket => {
   const startCh = channel('apm:couchbase:query:start')
   const finishCh = channel('apm:couchbase:query:finish')
   const errorCh = channel('apm:couchbase:query:error')
@@ -208,7 +208,7 @@ addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.5'] }, Buck
   return Bucket
 })
 
-addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^2.6.5'] }, Cluster => {
+addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^2.6.12'] }, Cluster => {
   Cluster.prototype._maybeInvoke = wrapMaybeInvoke(Cluster.prototype._maybeInvoke)
   Cluster.prototype.query = wrapQuery(Cluster.prototype.query)
 
@@ -217,15 +217,15 @@ addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^2.6.5'] }, Clu
 
 // semver >=3 <3.2.0
 
-addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['>=3.0.0 <3.2.0'] }, Collection => {
+addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['^3.0.7', '^3.1.3'] }, Collection => {
   wrapAllNames(['upsert', 'insert', 'replace'], name => {
     shimmer.wrap(Collection.prototype, name, wrapWithName(name))
   })
 
   return Collection
 })
 
-addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['>=3.0.0 <3.2.0'] }, Cluster => {
+addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^3.0.7', '^3.1.3'] }, Cluster => {
   shimmer.wrap(Cluster.prototype, 'query', wrapV3Query)
   return Cluster
 })

packages/datadog-instrumentations/src/jest.js

@@ -129,8 +129,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             suite: this.testSuite,
             runner: 'jest-circus',
             testParameters,
-            frameworkVersion: jestVersion,
-            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
+            frameworkVersion: jestVersion
           })
           originalTestFns.set(event.test, event.test.fn)
           event.test.fn = asyncResource.bind(event.test.fn)
@@ -145,7 +144,10 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             const formattedError = formatJestError(event.test.errors[0])
             testErrCh.publish(formattedError)
           }
-          testRunFinishCh.publish(status)
+          testRunFinishCh.publish({
+            status,
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
+          })
           // restore in case it is retried
           event.test.fn = originalTestFns.get(event.test)
         })
@@ -471,7 +473,7 @@ function jasmineAsyncInstallWraper (jasmineAsyncInstallExport, jestVersion) {
             const formattedError = formatJestError(spec.result.failedExpectations[0].error)
             testErrCh.publish(formattedError)
           }
-          testRunFinishCh.publish(specStatusToTestStatus[spec.result.status])
+          testRunFinishCh.publish({ status: specStatusToTestStatus[spec.result.status] })
           onComplete.apply(this, arguments)
         })
         arguments[0] = callback

packages/datadog-plugin-elasticsearch/test/index.spec.js

@@ -319,9 +319,11 @@ describe('Plugin', () => {
         before(() => {
           return agent.load('elasticsearch', {
             service: 'custom',
-            hooks: { query: (span, params) => {
-              span.addTags({ 'elasticsearch.params': 'foo', 'elasticsearch.method': params.method })
-            } }
+            hooks: {
+              query: (span, params) => {
+                span.addTags({ 'elasticsearch.params': 'foo', 'elasticsearch.method': params.method })
+              }
+            }
           })
         })
 

packages/datadog-plugin-graphql/src/execute.js

@@ -7,18 +7,20 @@ let tools
 class GraphQLExecutePlugin extends TracingPlugin {
   static get id () { return 'graphql' }
   static get operation () { return 'execute' }
+  static get type () { return 'graphql' }
+  static get kind () { return 'server' }
 
   start ({ operation, args, docSource }) {
     const type = operation && operation.operation
     const name = operation && operation.name && operation.name.value
     const document = args.document
     const source = this.config.source && document && docSource
 
-    const span = this.startSpan('graphql.execute', {
-      service: this.config.service,
+    const span = this.startSpan(this.operationName(), {
+      service: this.config.service || this.serviceName(),
       resource: getSignature(document, name, type, this.config.signature),
-      kind: 'server',
-      type: 'graphql',
+      kind: this.constructor.kind,
+      type: this.constructor.type,
       meta: {
         'graphql.operation.type': type,
         'graphql.operation.name': name,

packages/datadog-plugin-graphql/test/index.spec.js

@@ -4,6 +4,7 @@ const { expect } = require('chai')
 const semver = require('semver')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
+const namingSchema = require('./naming')
 
 describe('Plugin', () => {
   let tracer
@@ -175,6 +176,21 @@ describe('Plugin', () => {
           return agent.close({ ritmReset: false })
         })
 
+        withNamingSchema(
+          () => {
+            const source = `query MyQuery { hello(name: "world") }`
+            const variableValues = { who: 'world' }
+            graphql.graphql({ schema, source, variableValues })
+          },
+          () => namingSchema.server.opName,
+          () => namingSchema.server.serviceName,
+          'test',
+          (traces) => {
+            const spans = sort(traces[0])
+            return spans[0]
+          }
+        )
+
         it('should instrument parsing', done => {
           const source = `query MyQuery { hello(name: "world") }`
           const variableValues = { who: 'world' }