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
65 changes: 11 additions & 54 deletions manifests/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2636,15 +2636,7 @@ manifest:
tests/parametric/test_otel_span_methods.py::Test_Otel_Span_Methods::test_otel_start_span: missing_feature (New operation name mapping not yet implemented)
tests/parametric/test_otel_span_with_baggage.py::Test_Otel_Span_With_Baggage: *ref_5_32_0
tests/parametric/test_otel_tracer.py::Test_Otel_Tracer::test_otel_force_flush: missing_feature (Not implemented)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.16.0
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling::test_emits_probability_sampling_vectors: missing_feature (APMAPI-2171)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling::test_force_keep_clears_inherited_th: missing_feature (APMAPI-2171)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling::test_force_keep_forwards_inherited_rv: missing_feature (APMAPI-2171)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling::test_malformed_th_preserves_rv: missing_feature (APMAPI-2171)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling::test_precision_boundary_decisions: missing_feature (APMAPI-2171)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling::test_sanitizes_malformed_inbound_ot: missing_feature (APMAPI-2171)
tests/parametric/test_otel_tracestate_sampling.py::Test_OtelTracestateSampling: v6.20.0-dev
Comment thread
vpellan marked this conversation as resolved.
tests/parametric/test_otlp_trace_metrics.py: v6.11.0
tests/parametric/test_otlp_trace_metrics.py::Test_FR01_Enablement_Configuration::test_fr01_6_disabled_when_apm_tracing_disabled: missing_feature (OTLP trace metrics are still emitted when DD_APM_TRACING_ENABLED=false)
tests/parametric/test_otlp_trace_metrics.py::Test_FR06_Otel_Resource_Attributes::test_fr06_10_hostname: irrelevant (DD_HOSTNAME is only supported in Python)
Expand Down Expand Up @@ -3091,51 +3083,16 @@ manifest:
express5: *ref_6_0_0
tests/test_otel_http_semantics.py::Test_OtelSemantics_Spans_Http_Server::test_http_endpoint_retained_from_appsec: irrelevant (The AppSec endpoint retention request is specific to .NET)
tests/test_otel_http_semantics.py::Test_OtelSemantics_Spans_Http_Server::test_http_endpoint_retained_from_resource_renaming: missing_feature (http.endpoint is not retained under OTel semantics)
tests/test_otel_tracestate_sampling.py::Test_EmitOtOnProbabilityDecision_Rate0_5: missing_feature (APMAPI-2171)
tests/test_otel_tracestate_sampling.py::Test_ForceKeepClearsTh: missing_feature (APMAPI-2171)
tests/test_otel_tracestate_sampling.py::Test_ForwardInboundOtUnchanged: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_ForwardInboundOtUnchangedWhenDropped: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_MalformedOtHandling: missing_feature (APMAPI-2171)
tests/test_otel_tracestate_sampling.py::Test_PreserveDdAndOtherVendors: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_PreserveTracestateMemberOrder: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_SampledWithoutOtNotFabricated: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_ThOnlyDoesNotFabricateRv: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_ThOnlyDoesNotFabricateRvWhenDropped: # TODO: a lower version might be supported
- declaration: missing_feature (APMAPI-2171)
component_version: <6.8.0
weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
- declaration: missing_feature (APMAPI-2171)
excluded_weblog: [express4-typescript, uds-express4, express4, express5, fastify, nextjs]
tests/test_otel_tracestate_sampling.py::Test_EmitOtOnProbabilityDecision_Rate0_5: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_ForceKeepClearsTh: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_ForwardInboundOtUnchanged: v6.20.0-dev
Comment thread
vpellan marked this conversation as resolved.
tests/test_otel_tracestate_sampling.py::Test_ForwardInboundOtUnchangedWhenDropped: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_MalformedOtHandling: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_PreserveDdAndOtherVendors: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_PreserveTracestateMemberOrder: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_SampledWithoutOtNotFabricated: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_ThOnlyDoesNotFabricateRv: v6.20.0-dev
tests/test_otel_tracestate_sampling.py::Test_ThOnlyDoesNotFabricateRvWhenDropped: v6.20.0-dev
tests/test_otlp_runtime_metrics.py::Test_OtlpRuntimeMetrics: v5.107.0-pre
tests/test_profiling.py::Test_Profile: *ref_5_16_0
tests/test_profiling.py::Test_Profile::test_process_tags: # TODO: a lower version might be supported
Expand Down
8 changes: 8 additions & 0 deletions mirror_images.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,18 @@ images:
digest: sha256:06f818aebeadbcaf9614e5f9b75f388b98afe0903b458be96ee1aa7c47aae9b3
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express4.base-cb2b80abf6d1
tag: express4.base-cb2b80abf6d1
datadog/system-tests:express4.base-fca783fc392c:
digest: sha256:03b029b4111f8d710307cfeddb4c025595825b5437d920d1ad4e1c78384faf29
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express4.base-fca783fc392c
tag: express4.base-fca783fc392c
datadog/system-tests:express5.base-3ef9e2c68c47:
digest: sha256:89561e1d8fa4a4effbb68f840847454c11249f3d0b4e4f4fb1e7f954dc7a095f
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express5.base-3ef9e2c68c47
tag: express5.base-3ef9e2c68c47
datadog/system-tests:express5.base-6eecdb28aed2:
digest: sha256:bdb975b8d63efe446a17d77a67e0c3d4c5ce1f11b55264e9ae49dae31b6c7c85
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express5.base-6eecdb28aed2
tag: express5.base-6eecdb28aed2
datadog/system-tests:fastapi.base-1795d4d88178:
digest: sha256:bf65195d25f6e0d663c0f414590471fba7f18b1a0e3d284dda0cbd1896bea9a0
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:fastapi.base-1795d4d88178
Expand Down
2 changes: 2 additions & 0 deletions mirror_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
- "datadog/system-tests:django-py3.13.base-d8262a2c816c"
- "datadog/system-tests:express4-typescript.base-eb800c09d602"
- "datadog/system-tests:express4.base-cb2b80abf6d1"
- "datadog/system-tests:express4.base-fca783fc392c"
- "datadog/system-tests:express5.base-3ef9e2c68c47"
- "datadog/system-tests:express5.base-6eecdb28aed2"
- "datadog/system-tests:fastapi.base-1795d4d88178"
- "datadog/system-tests:fastapi.base-2917769b3665"
- "datadog/system-tests:fastify.base-bce27c61b3f5"
Expand Down
4 changes: 2 additions & 2 deletions utils/build/docker/base-images.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"version": 1,
"images": {
"system_tests_base_java_lambda_java_lambda_runtime": "datadog/system-tests:java-lambda-runtime.base-e849230b09df",
"system_tests_base_nodejs_express4": "datadog/system-tests:express4.base-cb2b80abf6d1",
"system_tests_base_nodejs_express4": "datadog/system-tests:express4.base-fca783fc392c",
"system_tests_base_nodejs_express4_typescript": "datadog/system-tests:express4-typescript.base-eb800c09d602",
"system_tests_base_nodejs_express5": "datadog/system-tests:express5.base-3ef9e2c68c47",
"system_tests_base_nodejs_express5": "datadog/system-tests:express5.base-6eecdb28aed2",
"system_tests_base_nodejs_fastify": "datadog/system-tests:fastify.base-bce27c61b3f5",
"system_tests_base_nodejs_nextjs": "datadog/system-tests:nextjs.base-95582a903467",
"system_tests_base_php_apache_mod_7_0": "datadog/system-tests:apache-mod-7.0.base-d171f9d9cd49",
Expand Down
5 changes: 3 additions & 2 deletions utils/build/docker/nodejs/express/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,9 @@ app.get('/trace/manual_keep_drop', (req, res) => {
tracer.scope().active().setTag(decision === 'keep' ? MANUAL_KEEP : MANUAL_DROP, true)

// Call downstream so that tests can assert on the sampling decision that gets propagated
const url = 'http://localhost:7777/'
const request = http.request({ hostname: 'localhost', port: 7777, path: '/', method: 'GET' }, (response) => {
// The weblog listens on IPv4; localhost may resolve to IPv6 instead.
const url = 'http://127.0.0.1:7777/'
const request = http.request({ hostname: '127.0.0.1', port: 7777, path: '/', method: 'GET' }, (response) => {
response.on('data', () => {})

response.on('end', () => {
Expand Down
Loading