V3.51.0 proposal

.github/workflows/plugins.yml

@@ -11,11 +11,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  SLACK_REPORT_ENABLE: ${{ github.event.schedule }} # value is empty for non-nightly jobs
-  SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-  SLACK_MOREINFO: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
 # TODO: upstream jobs
 
 

.gitlab-ci.yml

@@ -62,6 +62,7 @@ deploy_to_reliability_env:
 
 deploy_to_docker_registries:
   stage: deploy
+  needs: []
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v.*/ || $CI_COMMIT_TAG == "dev"'
       when: on_success
@@ -80,6 +81,7 @@ deploy_to_docker_registries:
 
 deploy_latest_to_docker_registries:
   stage: deploy
+  needs: []
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
       when: on_success

.npmignore

@@ -15,6 +15,7 @@
 !esbuild.js
 !init.js
 !loader-hook.mjs
+!register.js
 !package.json
 !cypress/**/*
 !ci/**/*

README.md

@@ -80,10 +80,17 @@ but code loaded using `import` might not always work.
 
 Use the following command to enable experimental ESM support with your application:
 
+Node.js < v20.6
+
 ```sh
 node --loader dd-trace/loader-hook.mjs entrypoint.js
 ```
 
+Node.js >= v20.6
+
+```sh
+node --import dd-trace/register.js entrypoint.js
+```
 
 ## Serverless / Lambda
 

ci/cypress/after-spec.js

@@ -0,0 +1 @@
+module.exports = require('../../packages/datadog-plugin-cypress/src/after-spec')

docs/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "typedoc.js",
   "scripts": {
-    "build": "typedoc",
+    "build": "typedoc ../index.d.ts",
     "pretest": "tsc -p . && tsc test",
     "test": "node test"
   },

docs/test.ts

@@ -1,5 +1,6 @@
 import { performance } from 'perf_hooks'
 import ddTrace, { tracer, Tracer, TracerOptions, Span, SpanContext, SpanOptions, Scope, User } from '..';
+import type { plugins } from '..';
 import { opentelemetry } from '..';
 import { formats, kinds, priority, tags, types } from '../ext';
 import { BINARY, HTTP_HEADERS, LOG, TEXT_MAP } from '../ext/formats';
@@ -157,64 +158,64 @@ const httpOptions = {
   middleware: true
 };
 
-const httpServerOptions = {
+const httpServerOptions: plugins.HttpServer = {
   ...httpOptions,
   hooks: {
-    request: (span: Span, req, res) => {}
+    request: (span?: Span, req?, res?) => {}
   }
 };
 
-const httpClientOptions = {
+const httpClientOptions: plugins.HttpClient = {
   ...httpOptions,
   splitByDomain: true,
   propagationBlocklist: ['url', /url/, url => true],
   hooks: {
-    request: (span: Span, req, res) => {}
+    request: (span?: Span, req?, res?) => { }
   }
 };
 
-const http2ServerOptions = {
+const http2ServerOptions: plugins.Http2Server = {
   ...httpOptions
 };
 
-const http2ClientOptions = {
+const http2ClientOptions: plugins.Http2Client = {
   ...httpOptions,
   splitByDomain: true
 };
 
-const nextOptions = {
+const nextOptions: plugins.next = {
   service: 'test',
   hooks: {
-    request: (span: Span, params) => { },
+    request: (span?: Span, params?) => { },
   },
 };
 
-const graphqlOptions = {
+const graphqlOptions: plugins.graphql = {
   service: 'test',
   depth: 2,
   source: true,
   variables: ({ foo, baz }) => ({ foo }),
   collapse: false,
   signature: false,
   hooks: {
-    execute: (span: Span, args, res) => {},
-    validate: (span: Span, document, errors) => {},
-    parse: (span: Span, source, document) => {}
+    execute: (span?: Span, args?, res?) => {},
+    validate: (span?: Span, document?, errors?) => {},
+    parse: (span?: Span, source?, document?) => {}
   }
 };
 
-const elasticsearchOptions = {
+const elasticsearchOptions: plugins.elasticsearch = {
   service: 'test',
   hooks: {
-    query: (span: Span, params) => {},
+    query: (span?: Span, params?) => {},
   },
 };
 
-const awsSdkOptions = {
+const awsSdkOptions: plugins.aws_sdk = {
   service: 'test',
   splitByAwsService: false,
   hooks: {
-    request: (span: Span, response) => {},
+    request: (span?: Span, response?) => {},
   },
   s3: false,
   sqs: {
@@ -223,33 +224,32 @@ const awsSdkOptions = {
   }
 };
 
-const redisOptions = {
+const redisOptions: plugins.redis = {
   service: 'test',
   allowlist: ['info', /auth/i, command => true],
   blocklist: ['info', /auth/i, command => true],
 };
 
-const sharedbOptions = {
+const sharedbOptions: plugins.sharedb = {
   service: 'test',
   hooks: {
-    receive: (span: Span, request) => {},
-    reply: (span: Span, request, reply) => {},
+    receive: (span?: Span, request?) => {},
+    reply: (span?: Span, request?, reply?) => {},
   },
 };
 
-const moleculerOptions = {
+const moleculerOptions: plugins.moleculer = {
   service: 'test',
   client: false,
-  params: true,
   server: {
     meta: true
   }
 };
 
-const openSearchOptions = {
+const openSearchOptions: plugins.opensearch = {
   service: 'test',
   hooks: {
-    query: (span: Span, params) => {},
+    query: (span?: Span, params?) => {},
   },
 };
 
@@ -356,8 +356,9 @@ tracer.use('express', { measured: true });
 
 span = tracer.startSpan('test');
 span = tracer.startSpan('test', {});
+span = tracer.startSpan('test', { childOf: span });
 span = tracer.startSpan('test', {
-  childOf: span || span.context(),
+  childOf: span.context(),
   references: [],
   startTime: 123456789.1234,
   tags: {
@@ -371,7 +372,7 @@ tracer.trace('test', { service: 'foo', resource: 'bar', type: 'baz' }, () => {})
 tracer.trace('test', { measured: true }, () => {})
 tracer.trace('test', (span: Span) => {})
 tracer.trace('test', (span: Span, fn: () => void) => {})
-tracer.trace('test', (span: Span, fn: (err: Error) => string) => {})
+tracer.trace('test', (span: Span, fn: (err: Error) => void) => {})
 
 promise = tracer.trace('test', () => Promise.resolve())
 
@@ -382,16 +383,17 @@ promise = tracer.wrap('test', () => Promise.resolve())()
 
 const carrier = {}
 
-tracer.inject(span || span.context(), HTTP_HEADERS, carrier);
-context = tracer.extract(HTTP_HEADERS, carrier);
+tracer.inject(span, HTTP_HEADERS, carrier);
+tracer.inject(span.context(), HTTP_HEADERS, carrier);
+context = tracer.extract(HTTP_HEADERS, carrier)!;
 
 traceId = context.toTraceId();
 spanId = context.toSpanId();
 traceparent = context.toTraceparent();
 
 const scope = tracer.scope()
 
-span = scope.active();
+span = scope.active()!;
 
 const activateStringType: string = scope.activate(span, () => 'test');
 const activateVoidType: void = scope.activate(span, () => {});

docs/typedoc.js

@@ -4,8 +4,8 @@ module.exports = {
   excludeExternals: true,
   excludePrivate: true,
   excludeProtected: true,
-  includeDeclarations: true,
-  mode: 'file',
+  // includeDeclarations: true,
+  // mode: 'file',
   name: 'dd-trace',
   out: 'out',
   readme: 'API.md'

docs/yarn.lock

@@ -69,9 +69,9 @@ handlebars@^4.7.6:
     uglify-js "^3.1.4"
 
 hasown@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
-  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa"
+  integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==
   dependencies:
     function-bind "^1.1.2"