Skip to content

CodeIgniter: Fix span name to include {http.method} {http.route} #422

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 6 commits into from
Aug 6, 2025
Merged

CodeIgniter: Fix span name to include {http.method} {http.route} #422

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c69a8d
chore: update dependabot configuration [skip ci]
github-actions[bot] Jul 30, 2025
5a54d90
Merge branch 'open-telemetry:main' into main
HeenaBansal20 Aug 5, 2025
8adab85
Merge branch 'open-telemetry:main' into main
HeenaBansal20 Aug 6, 2025
b16366f
Fix CodeIgniter spanName as per Otel spec
HeenaBansal20 Aug 6, 2025
e5326d8
Reverted yaml changes
HeenaBansal20 Aug 6, 2025
92672dd
Update src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation…
HeenaBansal20 Aug 6, 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
12 changes: 9 additions & 3 deletions src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
class CodeIgniterInstrumentation
{
public const NAME = 'codeigniter';


// Store the HTTP method for use in the post hook
private static $httpMethod = 'unknown';

/** @psalm-api */
public static function register(): void
{
Expand Down Expand Up @@ -58,12 +61,14 @@ public static function register(): void
) use ($instrumentation, $requestProperty): void {
$extractedRequest = $requestProperty->getValue($igniter);
$request = ($extractedRequest instanceof RequestInterface) ? $extractedRequest : null;


// Get the HTTP method from the request and store it for later use
self::$httpMethod = $request ? $request->getMethod() : 'unknown';
/** @psalm-suppress ArgumentTypeCoercion,DeprecatedMethod */
$spanBuilder = $instrumentation
->tracer()
/** @phan-suppress-next-line PhanDeprecatedFunction */
->spanBuilder(\sprintf('%s', $request?->getMethod() ?? 'unknown'))
->spanBuilder(\sprintf('%s', self::$httpMethod))
->setSpanKind(SpanKind::KIND_SERVER)
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
Expand Down Expand Up @@ -147,6 +152,7 @@ public static function register(): void
if ($controllerClassName !== null && is_string($controllerMethod)) {
$routeName = CodeIgniterInstrumentation::normalizeRouteName($controllerClassName, $controllerMethod);
$span->setAttribute(TraceAttributes::HTTP_ROUTE, $routeName);
$span->updateName(sprintf('%s %s', self::$httpMethod, $routeName));
}

if ($exception) {
Expand Down
4 changes: 2 additions & 2 deletions src/Instrumentation/CodeIgniter/tests/Integration/CodeIgniterInstrumentationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function test_success()

$attributes = $this->storage[0]->getAttributes();
$this->assertCount(1, $this->storage);
$this->assertEqualsIgnoringCase('GET', $this->storage[0]->getName());
$this->assertEqualsIgnoringCase('GET Home.index', $this->storage[0]->getName());
$this->assertStringMatchesFormat('http://%s/home', $attributes->get(TraceAttributes::URL_FULL));
$this->assertEqualsIgnoringCase('GET', $attributes->get(TraceAttributes::HTTP_REQUEST_METHOD));
$this->assertEquals('http', $attributes->get(TraceAttributes::URL_SCHEME));
Expand Down Expand Up @@ -55,7 +55,7 @@ public function test_exception()

$attributes = $this->storage[0]->getAttributes();
$this->assertCount(1, $this->storage);
$this->assertEqualsIgnoringCase('GET', $this->storage[0]->getName());
$this->assertEqualsIgnoringCase('GET Closure.index', $this->storage[0]->getName());
$this->assertStringMatchesFormat('http://%s/exception', $attributes->get(TraceAttributes::URL_FULL));
$this->assertEqualsIgnoringCase('GET', $attributes->get(TraceAttributes::HTTP_REQUEST_METHOD));
$this->assertEquals('http', $attributes->get(TraceAttributes::URL_SCHEME));
Expand Down
Loading