-
Notifications
You must be signed in to change notification settings - Fork 118
Auto instrumentation hooks for PHP Session #433
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.
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
brettmc
merged 19 commits into
open-telemetry:main
from
HeenaBansal20:instrument-php-session-function
Sep 9, 2025
Merged
Changes from 10 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
4c69a8d
chore: update dependabot configuration [skip ci]
github-actions[bot] 5a54d90
Merge branch 'open-telemetry:main' into main
HeenaBansal20 8adab85
Merge branch 'open-telemetry:main' into main
HeenaBansal20 2221d62
chore: update dependabot configuration [skip ci]
github-actions[bot] fec51f9
Merge branch 'open-telemetry:main' into main
HeenaBansal20 11cf30a
Add PHp Session extension auto instrumentation hooks
HeenaBansal20 b44eecd
Run Session testcase in CI
HeenaBansal20 9c78be3
Run Session testcase in CI
HeenaBansal20 b4185d1
Fix 8.4 CI
HeenaBansal20 57c5616
Add empty Unit test folder
HeenaBansal20 418dfb1
Add more session functions to the list
HeenaBansal20 f2c03c7
Addressed review comments
HeenaBansal20 f1833ea
redacted cookie value from span
HeenaBansal20 e4b7335
Refactored code to use switch statement
HeenaBansal20 a80ab76
Updated session-destroy instrumention to ad sessionid and name
HeenaBansal20 a9b9f0e
Using return value to set the span status
HeenaBansal20 409efae
removed exception handler since session function doesnt throw excepti…
HeenaBansal20 9620c91
Storing cookie keys in array and setting only error status
HeenaBansal20 66efcf7
Removed unneceesary checkaround cookie value
HeenaBansal20 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
* text=auto | ||
|
||
*.md diff=markdown | ||
*.php diff=php | ||
|
||
/.gitattributes export-ignore | ||
/.gitignore export-ignore | ||
/.php-cs-fixer.php export-ignore | ||
/phpstan.neon.dist export-ignore | ||
/phpunit.xml.dist export-ignore | ||
/psalm.xml.dist export-ignore | ||
/tests export-ignore |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/vendor/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<?php | ||
$finder = PhpCsFixer\Finder::create() | ||
->exclude('vendor') | ||
->exclude('var/cache') | ||
->in(__DIR__); | ||
|
||
$config = new PhpCsFixer\Config(); | ||
return $config->setRules([ | ||
'concat_space' => ['spacing' => 'one'], | ||
'declare_equal_normalize' => ['space' => 'none'], | ||
'is_null' => true, | ||
'modernize_types_casting' => true, | ||
'ordered_imports' => true, | ||
'php_unit_construct' => true, | ||
'single_line_comment_style' => true, | ||
'yoda_style' => false, | ||
'@PSR2' => true, | ||
'array_syntax' => ['syntax' => 'short'], | ||
'blank_line_after_opening_tag' => true, | ||
'blank_line_before_statement' => true, | ||
'cast_spaces' => true, | ||
'declare_strict_types' => true, | ||
'type_declaration_spaces' => true, | ||
'include' => true, | ||
'lowercase_cast' => true, | ||
'new_with_parentheses' => true, | ||
'no_extra_blank_lines' => true, | ||
'no_leading_import_slash' => true, | ||
'echo_tag_syntax' => true, | ||
'no_unused_imports' => true, | ||
'no_useless_else' => true, | ||
'no_useless_return' => true, | ||
'phpdoc_order' => true, | ||
'phpdoc_scalar' => true, | ||
'phpdoc_types' => true, | ||
'short_scalar_cast' => true, | ||
'blank_lines_before_namespace' => true, | ||
'single_quote' => true, | ||
'trailing_comma_in_multiline' => true, | ||
]) | ||
->setRiskyAllowed(true) | ||
->setFinder($finder); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
# PHP Session Auto-instrumentation for OpenTelemetry | ||
|
||
This package provides auto-instrumentation for PHP's native session functions. | ||
|
||
## Installation | ||
|
||
```bash | ||
composer require open-telemetry/opentelemetry-auto-php-session | ||
``` | ||
|
||
## Usage | ||
|
||
The instrumentation hooks into PHP's native session functions to provide tracing capabilities. It automatically creates spans for session operations like `session_start()` and `session_destroy()`. | ||
|
||
```php | ||
<?php | ||
// Make sure to initialize the OpenTelemetry SDK before using sessions | ||
// ... | ||
|
||
// Register the PHP Session instrumentation | ||
\OpenTelemetry\Contrib\Instrumentation\PhpSession\PhpSessionInstrumentation::register(); | ||
|
||
// Now any session operations will be automatically traced | ||
session_start(); | ||
// ... your code ... | ||
session_destroy(); | ||
``` | ||
|
||
## Spans and Attributes | ||
|
||
### session.start | ||
|
||
When `session_start()` is called, a span named `session.start` is created with the following attributes: | ||
|
||
- `code.function_name`: The function name (`session_start`) | ||
- `code.file_path`: The file path where the function was called | ||
- `code.line_number`: The line number where the function was called | ||
HeenaBansal20 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
- `session.options.*`: Any options passed to `session_start()` | ||
- `session.id`: The session ID (if session was successfully started) | ||
- `session.name`: The session name (if session was successfully started) | ||
- `session.status`: Either "active" or "inactive" | ||
- `session.cookie.*`: Session cookie parameters | ||
HeenaBansal20 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
||
### session.destroy | ||
|
||
When `session_destroy()` is called, a span named `session.destroy` is created with the following attributes: | ||
|
||
- `code.function_name`: The function name (`session_destroy`) | ||
- `code.file_path`: The file path where the function was called | ||
- `code.line_number`: The line number where the function was called | ||
- `session.id`: The session ID (if available) | ||
- `session.name`: The session name (if available) | ||
- `session.destroy.success`: Boolean indicating if the session was successfully destroyed | ||
|
||
## License | ||
|
||
Apache 2.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
use OpenTelemetry\Contrib\Instrumentation\Session\PhpSessionInstrumentation; | ||
use OpenTelemetry\SDK\Sdk; | ||
|
||
if (class_exists(Sdk::class) && Sdk::isInstrumentationDisabled(PhpSessionInstrumentation::NAME) === true) { | ||
return; | ||
} | ||
|
||
if (extension_loaded('opentelemetry') === false) { | ||
trigger_error('The opentelemetry extension must be loaded in order to autoload the OpenTelemetry IO auto-instrumentation', E_USER_WARNING); | ||
HeenaBansal20 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
||
return; | ||
} | ||
|
||
PhpSessionInstrumentation::register(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"name": "open-telemetry/opentelemetry-auto-php-session", | ||
"description": "OpenTelemetry auto-instrumentation for PHP Session functions", | ||
"keywords": ["opentelemetry", "otel", "open-telemetry", "tracing", "php", "session"], | ||
"type": "library", | ||
"homepage": "https://opentelemetry.io/docs/php", | ||
"readme": "./README.md", | ||
"license": "Apache-2.0", | ||
"require": { | ||
"php": "^8.2", | ||
"ext-opentelemetry": "*", | ||
"ext-session": "*", | ||
"open-telemetry/api": "^1.0", | ||
"open-telemetry/sem-conv": "^1.0" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
"OpenTelemetry\\Contrib\\Instrumentation\\PhpSession\\": "src/" | ||
} | ||
}, | ||
"require-dev": { | ||
"friendsofphp/php-cs-fixer": "^3", | ||
"phan/phan": "^5.0", | ||
"php-http/mock-client": "*", | ||
"phpstan/phpstan": "^1.1", | ||
"phpstan/phpstan-phpunit": "^1.0", | ||
"psalm/plugin-phpunit": "^0.19.2", | ||
"open-telemetry/sdk": "^1.0", | ||
"phpunit/phpunit": "^9.5", | ||
"vimeo/psalm": "6.4.0" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
includes: | ||
- vendor/phpstan/phpstan-phpunit/extension.neon | ||
|
||
parameters: | ||
tmpDir: var/cache/phpstan | ||
level: 5 | ||
paths: | ||
- src | ||
- tests |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<phpunit | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd" | ||
backupGlobals="false" | ||
backupStaticAttributes="false" | ||
cacheResult="false" | ||
colors="false" | ||
convertErrorsToExceptions="true" | ||
convertNoticesToExceptions="true" | ||
convertWarningsToExceptions="true" | ||
forceCoversAnnotation="false" | ||
processIsolation="false" | ||
stopOnError="false" | ||
stopOnFailure="false" | ||
stopOnIncomplete="false" | ||
stopOnSkipped="false" | ||
stopOnRisky="false" | ||
timeoutForSmallTests="1" | ||
timeoutForMediumTests="10" | ||
timeoutForLargeTests="60" | ||
verbose="true"> | ||
|
||
<coverage processUncoveredFiles="true" disableCodeCoverageIgnore="false"> | ||
<include> | ||
<directory>src</directory> | ||
</include> | ||
</coverage> | ||
|
||
<php> | ||
<ini name="date.timezone" value="UTC" /> | ||
<ini name="display_errors" value="On" /> | ||
<ini name="display_startup_errors" value="On" /> | ||
<ini name="error_reporting" value="E_ALL" /> | ||
</php> | ||
|
||
<testsuites> | ||
<testsuite name="unit"> | ||
<directory>tests/Unit</directory> | ||
</testsuite> | ||
<testsuite name="integration"> | ||
<directory>tests/Integration</directory> | ||
</testsuite> | ||
</testsuites> | ||
|
||
</phpunit> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?xml version="1.0"?> | ||
<psalm | ||
errorLevel="3" | ||
cacheDirectory="var/cache/psalm" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns="https://getpsalm.org/schema/config" | ||
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"> | ||
<projectFiles> | ||
<directory name="src"/> | ||
<directory name="tests"/> | ||
</projectFiles> | ||
<plugins> | ||
<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/> | ||
</plugins> | ||
</psalm> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.