Skip to content

Allow return integer type when resolving attributes #349

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 18 commits into from
Apr 14, 2025
Merged

Allow return integer type when resolving attributes #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5feb61d
feat(#1393): implement integration test and suppress phpstan and psal…
DominicDetta Oct 3, 2024
42e52c4
feat(#1393): add split readonly repo and github workflows
DominicDetta Oct 3, 2024
2e6c142
ci: drop workflows PHP 7.4 version
DominicDetta Oct 4, 2024
011365e
ci: exclude pre-8.2 versions from github workflows
DominicDetta Oct 4, 2024
046e810
Update src/Instrumentation/Doctrine/src/DoctrineInstrumentation.php
DominicDetta Oct 7, 2024
32d028b
Update src/Instrumentation/Doctrine/src/DoctrineInstrumentation.php
DominicDetta Oct 7, 2024
8229200
fix: apply semantic conventions on db attributes
DominicDetta Mar 6, 2025
ff6dd7f
fix: resolve conflict github workflows
DominicDetta Mar 6, 2025
fb18a17
Merge branch 'main' into doctrine
DominicDetta Mar 6, 2025
8ce859c
fix: apply insights from test integrations
DominicDetta Mar 6, 2025
099b86a
fix: regexp
DominicDetta Mar 6, 2025
829157c
chore: reorder lines of instrumentation Doctrine and add newline EOF
DominicDetta Mar 10, 2025
f532335
fix: allow attribute server.port as a return type integer
DominicDetta Apr 10, 2025
416e095
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
DominicDetta Apr 10, 2025
e59f0db
Merge branch 'main' into fix-type
DominicDetta Apr 10, 2025
8a4208d
chore: disable tbachert/spi
DominicDetta Apr 10, 2025
4b63e9c
fix: add return type to get method and format code
DominicDetta Apr 11, 2025
c1cf46a
fix: check correctly port when null value
DominicDetta Apr 14, 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
4 changes: 2 additions & 2 deletions src/Instrumentation/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"config": {
"allow-plugins": {
"php-http/discovery": false,
"tbachert/spi": true
"tbachert/spi": false
}
}
}
}
11 changes: 8 additions & 3 deletions src/Instrumentation/Doctrine/src/AttributesResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ final class AttributesResolver
'trino',
];

public static function get(string $attributeName, array $params): string
public static function get(string $attributeName, array $params): string|int|null
{
$method = 'get' . str_replace('.', '', ucwords($attributeName, '.'));

Expand All @@ -63,9 +63,14 @@ private static function getServerAddress(array $params): string
/**
* Resolve attribute `server.port`
*/
private static function getServerPort(array $params): string
private static function getServerPort(array $params): ?int
{
return $params[1][0]['port'] ?? 'unknown';
$port = $params[1][0]['port'] ?? null;
if ($port) {
$port = (int) $port;
}

return $port;
}

/**
Expand Down
Loading