Skip to content

Enable docker_ssi/test_instrumentation_source_ssi test for PHP #4797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 29, 2025
Merged

Enable docker_ssi/test_instrumentation_source_ssi test for PHP #4797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa367a1
Enable docker_ssi/test_instrumentation_source_ssi test for PHP
iamluc Jun 18, 2025
753efac
Merge branch 'main' into luc/php_docker_ssi_instrumentation_source
iamluc Jul 25, 2025
5e238e3
Lint
iamluc Jul 25, 2025
c5398a9
Merge branch 'main' into luc/php_docker_ssi_instrumentation_source
iamluc Aug 28, 2025
79021b9
Force telemetry to be sent
iamluc Aug 29, 2025
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
2 changes: 1 addition & 1 deletion docs/scenarios/docker_ssi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE}
WORKDIR /app

RUN printf "<?php\necho 'hi';\n" > index.php
RUN printf "<?php\necho 'hi'; if (function_exists('dd_trace_internal_fn')) dd_trace_internal_fn(\"finalize_telemetry\");\n" > index.php

# Without the sleep, the docker network has issues
CMD ["sh", "-c", "sleep 2; php -S 0.0.0.0:18080"]
Expand Down
2 changes: 1 addition & 1 deletion manifests/php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ tests/:
Test_Stable_Configuration_Origin: v1.9.0
Test_TelemetryInstallSignature: missing_feature
Test_TelemetrySCAEnvVar: missing_feature # should be: v0.99.0
Test_TelemetrySSIConfigs: missing_feature
Test_TelemetrySSIConfigs: missing_feature # Implemented in v1.11.0, but parametric tests don't use a real SSI environment
test_trace_sampling.py:
Test_Trace_Sampling_Basic: v0.68.3 # TODO what is the earliest version?
Test_Trace_Sampling_Globs: v0.96.0
Expand Down
3 changes: 2 additions & 1 deletion tests/docker_ssi/test_docker_ssi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,10 @@ def setup_instrumentation_source_ssi(self):
self._setup_all()

@features.ssi_service_tracking
@missing_feature(context.library in ("nodejs", "dotnet", "java", "php", "ruby"), reason="Not implemented yet")
@missing_feature(context.library in ("nodejs", "dotnet", "java", "ruby"), reason="Not implemented yet")
@missing_feature(context.library < "[email protected]", reason="Not implemented")
@irrelevant(context.library == "python" and context.installed_language_runtime < "3.8.0")
@irrelevant(context.library == "php" and context.installed_language_runtime < "7.0")
def test_instrumentation_source_ssi(self):
logger.info("Testing Docker SSI service tracking")
# There are traces related with the request
Expand Down
2 changes: 1 addition & 1 deletion utils/build/ssi/php/php-app.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE}
WORKDIR /app

RUN printf "<?php\necho 'hi';\n" > index.php
RUN printf "<?php\necho 'hi'; if (function_exists('dd_trace_internal_fn')) dd_trace_internal_fn(\"finalize_telemetry\");\n" > index.php

# Without the sleep, the docker network has issues
CMD ["sh", "-c", "sleep 2; php -S 0.0.0.0:18080"]