Skip to content

Fix WithSpanHandler: remove hardcode, add constants instead #1927

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

Open
mdomansky wants to merge 5 commits into
base: main
Choose a base branch
from
+7 −9
Open

Fix WithSpanHandler: remove hardcode, add constants instead #1927

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
aeb9734
Remove hardcode, add constants
mdomansky Mar 25, 2026
4fea690
update otel schema to 1.40 and update span attributes within the schema
mdomansky Apr 9, 2026
7400f5f
Update src/API/Instrumentation/WithSpanHandler.php
mdomansky Apr 9, 2026
9efbcfb
update otel schema to 1.40 and update span attributes within the schema
mdomansky Apr 13, 2026
b665a5a
update tests
mdomansky Apr 22, 2026
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
9 changes: 4 additions & 5 deletions src/API/Instrumentation/WithSpanHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class WithSpanHandler
public static function pre(mixed $target, array $params, ?string $class, string $function, ?string $filename, ?int $lineno, ?array $span_args = [], ?array $attributes = []): void
{
static $instrumentation;
$instrumentation ??= new CachedInstrumentation(name: 'io.opentelemetry.php.with-span', schemaUrl: 'https://opentelemetry.io/schemas/1.25.0');
$instrumentation ??= new CachedInstrumentation(name: 'io.opentelemetry.php.with-span', schemaUrl: 'https://opentelemetry.io/schemas/1.40.0');

$name = $span_args['name'] ?? null;
if ($name === null) {
Expand All @@ -36,10 +36,9 @@ public static function pre(mixed $target, array $params, ?string $class, string
->tracer()
->spanBuilder($name)
->setSpanKind($kind)
->setAttribute('code.function', $function)
->setAttribute('code.namespace', $class)
->setAttribute('code.filepath', $filename)
->setAttribute('code.lineno', $lineno)
->setAttribute('code.function.name', $class !== null ? $class . '::' . $function : $function)
Copy link
Copy Markdown
Contributor

@Nevay Nevay Apr 22, 2026

Choose a reason for hiding this comment

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

Could unify this with the span $name logic above:

$functionName = $class !== null ? $class . '::' . $function : $function;
$name = $span_args['name'] ?? $functionName;

->setAttribute('code.file.path', $filename)
->setAttribute('code.line.number', $lineno)
->setAttributes($attributes ?? [])
->startSpan();
$context = $span->storeInContext(Context::getCurrent());
Expand Down
7 changes: 3 additions & 4 deletions tests/Unit/API/Instrumentation/WithSpanHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ public function test_creates_span_with_all_values(): void
$this->assertSame($name, $span->getName());
$this->assertSame($kind, $span->getKind());
$this->assertSame([
'code.function' => 'some_function',
'code.namespace' => 'My\Class',
'code.filepath' => 'a_file.php',
'code.lineno' => 99,
'code.function.name' => 'My\Class::some_function',
'code.file.path' => 'a_file.php',
'code.line.number' => 99,
'foo' => 'bar',
], $span->getAttributes()->toArray());
}
Expand Down