Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,13 @@
/integration-tests/profiler/ @DataDog/profiling-js

/packages/dd-trace/*/profiling/ @DataDog/profiling-js
/packages/dd-trace/src/otel-thread-ctx.js @DataDog/profiling-js
/packages/dd-trace/src/profiler.js @DataDog/profiling-js
/packages/dd-trace/src/storage-channels.js @DataDog/profiling-js @DataDog/apm-sdk-capabilities-js
/packages/dd-trace/src/web-tags-cache.js @DataDog/profiling-js
/packages/dd-trace/test/exporters/common/form-data.spec.js @DataDog/profiling-js
/packages/dd-trace/test/otel-thread-ctx.spec.js @DataDog/profiling-js
/packages/dd-trace/test/web-tags-cache.spec.js @DataDog/profiling-js

# Language Platform
/* @DataDog/lang-platform-js
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/profiling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- uses: ./.github/actions/install
- run: npm run test:profiler:ci
- run: npm run test:integration:profiler:coverage
- run: npm run test:otel-thread-ctx
- uses: ./.github/actions/coverage
with:
flags: profiling-macos
Expand Down Expand Up @@ -60,6 +61,7 @@ jobs:
- uses: ./.github/actions/node/latest
- run: npm run test:profiler:ci
- run: npm run test:integration:profiler:coverage
- run: npm run test:otel-thread-ctx
- uses: ./.github/actions/coverage
with:
flags: profiling-ubuntu
Expand Down Expand Up @@ -118,6 +120,7 @@ jobs:
) | ForEach-Object { "$_=" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 }
- run: npm run test:profiler:ci
- run: npm run test:integration:profiler:coverage
- run: npm run test:otel-thread-ctx
- uses: ./.github/actions/node-crash-report
if: failure()
# Upload any WER minidumps that landed during this job, even on
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
"test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
"test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/profiling/**/*.spec.js\"",
"test:profiler:ci": "node scripts/c8-ci.js test:profiler",
"test:otel-thread-ctx": "mocha --timeout 60000 packages/dd-trace/test/otel-thread-ctx.spec.js",
"test:docker:otel-thread-ctx": "./scripts/docker/run-otel-thread-ctx-spec.sh",
Comment thread
szegedi marked this conversation as resolved.
"test:integration": "mocha --timeout 60000 \"integration-tests/*.spec.js\"",
"test:integration:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/*.spec.js\"",
"test:integration:aiguard": "mocha --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
Expand Down Expand Up @@ -180,7 +182,7 @@
"opentracing": ">=0.14.7"
},
"optionalDependencies": {
"@datadog/libdatadog": "0.9.4",
"@datadog/libdatadog": "0.12.1",
"@datadog/native-appsec": "11.0.1",
"@datadog/native-iast-taint-tracking": "4.2.0",
"@datadog/native-metrics": "3.1.2",
Expand Down
2 changes: 2 additions & 0 deletions packages/dd-trace/src/config/generated-config-types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ export interface GeneratedConfig {
DD_TRACE_OPENSEARCH_PROJECT_OPENSEARCH_ENABLED: boolean;
DD_TRACE_OPENTELEMETRY_SDK_TRACE_NODE_ENABLED: boolean;
DD_TRACE_ORACLEDB_ENABLED: boolean;
DD_TRACE_OTEL_CTX_ENABLED: boolean;
DD_TRACE_OTEL_ENABLED: boolean;
DD_TRACE_OTEL_SEMANTICS_ENABLED: boolean;
DD_TRACE_PASSPORT_ENABLED: boolean;
Expand Down Expand Up @@ -1040,6 +1041,7 @@ export interface GeneratedEnvVarConfig {
DD_TRACE_OPENSEARCH_PROJECT_OPENSEARCH_ENABLED: boolean;
DD_TRACE_OPENTELEMETRY_SDK_TRACE_NODE_ENABLED: boolean;
DD_TRACE_ORACLEDB_ENABLED: boolean;
DD_TRACE_OTEL_CTX_ENABLED: boolean;
DD_TRACE_OTEL_ENABLED: boolean;
DD_TRACE_OTEL_SEMANTICS_ENABLED: boolean;
DD_TRACE_PARTIAL_FLUSH_MIN_SPANS: number;
Expand Down
7 changes: 7 additions & 0 deletions packages/dd-trace/src/config/supported-configurations.json
Original file line number Diff line number Diff line change
Expand Up @@ -3518,6 +3518,13 @@
"default": "false"
}
],
"DD_TRACE_OTEL_CTX_ENABLED": [
{
"implementation": "A",
"type": "boolean",
"default": "false"
}
],
Comment on lines +3521 to +3527

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fingers crossed we can enable by default (on supported node.js versions) soon ;)

"DD_TRACE_PARTIAL_FLUSH_MIN_SPANS": [
{
"implementation": "B",
Expand Down
Loading
Loading