Skip to content

update slim instrumentation to semconv 1.36.0 #424

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 1 commit into from
Aug 7, 2025
Merged

update slim instrumentation to semconv 1.36.0 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/Instrumentation/Slim/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ext-opentelemetry": "*",
"ext-reflection": "*",
"open-telemetry/api": "^1.0",
"open-telemetry/sem-conv": "^1.32",
"open-telemetry/sem-conv": "^1.36",
"slim/slim": "^4"
},
"require-dev": {
Expand Down
40 changes: 23 additions & 17 deletions src/Instrumentation/Slim/src/SlimInstrumentation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
use OpenTelemetry\API\Trace\StatusCode;
use OpenTelemetry\Context\Context;
use function OpenTelemetry\Instrumentation\hook;
use OpenTelemetry\SemConv\Attributes\CodeAttributes;
use OpenTelemetry\SemConv\Attributes\HttpAttributes;
use OpenTelemetry\SemConv\Attributes\ServerAttributes;
use OpenTelemetry\SemConv\Attributes\UrlAttributes;
use OpenTelemetry\SemConv\Attributes\UserAgentAttributes;
use OpenTelemetry\SemConv\Incubating\Attributes\HttpIncubatingAttributes;
use OpenTelemetry\SemConv\TraceAttributes;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
Expand Down Expand Up @@ -53,22 +59,22 @@ public static function register(): void
$builder = $instrumentation->tracer()
->spanBuilder(sprintf('%s', $request?->getMethod() ?? 'unknown'))
->setSpanKind(SpanKind::KIND_SERVER)
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
->setAttribute(CodeAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
->setAttribute(CodeAttributes::CODE_FILE_PATH, $filename)
->setAttribute(CodeAttributes::CODE_LINE_NUMBER, $lineno);
$parent = Context::getCurrent();
if ($request) {
$parent = Globals::propagator()->extract($request->getHeaders());
$span = $builder
->setParent($parent)
->setAttribute(TraceAttributes::URL_FULL, $request->getUri()->__toString())
->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $request->getMethod())
->setAttribute(TraceAttributes::HTTP_REQUEST_BODY_SIZE, $request->getHeaderLine('Content-Length'))
->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $request->getHeaderLine('User-Agent'))
->setAttribute(TraceAttributes::SERVER_ADDRESS, $request->getUri()->getHost())
->setAttribute(TraceAttributes::SERVER_PORT, $request->getUri()->getPort())
->setAttribute(TraceAttributes::URL_SCHEME, $request->getUri()->getScheme())
->setAttribute(TraceAttributes::URL_PATH, $request->getUri()->getPath())
->setAttribute(UrlAttributes::URL_FULL, $request->getUri()->__toString())
->setAttribute(HttpAttributes::HTTP_REQUEST_METHOD, $request->getMethod())
->setAttribute(HttpIncubatingAttributes::HTTP_REQUEST_BODY_SIZE, $request->getHeaderLine('Content-Length'))
->setAttribute(UserAgentAttributes::USER_AGENT_ORIGINAL, $request->getHeaderLine('User-Agent'))
->setAttribute(ServerAttributes::SERVER_ADDRESS, $request->getUri()->getHost())
->setAttribute(ServerAttributes::SERVER_PORT, $request->getUri()->getPort())
->setAttribute(UrlAttributes::URL_SCHEME, $request->getUri()->getScheme())
->setAttribute(UrlAttributes::URL_PATH, $request->getUri()->getPath())
->startSpan();
$request = $request->withAttribute(SpanInterface::class, $span);
} else {
Expand All @@ -93,9 +99,9 @@ public static function register(): void
if ($response->getStatusCode() >= 400) {
$span->setStatus(StatusCode::STATUS_ERROR);
}
$span->setAttribute(TraceAttributes::HTTP_RESPONSE_STATUS_CODE, $response->getStatusCode());
$span->setAttribute(HttpAttributes::HTTP_RESPONSE_STATUS_CODE, $response->getStatusCode());
$span->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $response->getProtocolVersion());
$span->setAttribute(TraceAttributes::HTTP_RESPONSE_BODY_SIZE, $response->getHeaderLine('Content-Length'));
$span->setAttribute(HttpIncubatingAttributes::HTTP_RESPONSE_BODY_SIZE, $response->getHeaderLine('Content-Length'));

if (self::$supportsResponsePropagation) {
// Propagate server-timing header to response, if ServerTimingPropagator is present
Expand Down Expand Up @@ -144,7 +150,7 @@ public static function register(): void
if (!$route instanceof RouteInterface) {
return;
}
$span->setAttribute(TraceAttributes::HTTP_ROUTE, $route->getName() ?? $route->getPattern());
$span->setAttribute(HttpAttributes::HTTP_ROUTE, $route->getName() ?? $route->getPattern());
$span->updateName(sprintf('%s %s', $request->getMethod(), $route->getName() ?? $route->getPattern()));
}
);
Expand All @@ -162,9 +168,9 @@ public static function register(): void
$callable = $params[0];
$name = CallableFormatter::format($callable);
$builder = $instrumentation->tracer()->spanBuilder($name)
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
->setAttribute(CodeAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
->setAttribute(CodeAttributes::CODE_FILE_PATH, $filename)
->setAttribute(CodeAttributes::CODE_LINE_NUMBER, $lineno);
$span = $builder->startSpan();
Context::storage()->attach($span->storeInContext(Context::getCurrent()));
},
Expand Down
Loading