Skip to content

Commit b83fcda

Browse files
committed
Place OpenTelemetry middleware explicitly on web and API routes only
1 parent deca877 commit b83fcda

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

app/Http/Kernel.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class Kernel extends HttpKernel
4242
* @var array<int, class-string|string>
4343
*/
4444
protected $middleware = [
45-
MeasureRequest::class,
4645
MetricsCollector::class,
4746
// \App\Http\Middleware\TrustHosts::class,
4847
TrustProxies::class,
@@ -60,6 +59,7 @@ class Kernel extends HttpKernel
6059
*/
6160
protected $middlewareGroups = [
6261
'web' => [
62+
MeasureRequest::class,
6363
EncryptCookies::class,
6464
AddQueuedCookiesToResponse::class,
6565
StartSession::class,
@@ -69,6 +69,7 @@ class Kernel extends HttpKernel
6969
],
7070

7171
'api' => [
72+
MeasureRequest::class,
7273
EnsureFrontendRequestsAreStateful::class,
7374
ThrottleRequests::class . ':api',
7475
SubstituteBindings::class,

app/Http/Middleware/MeasureRequest.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,6 @@ public function handle(Request $request, Closure $next): Response
2727
$name = $request->getRequestUri();
2828
}
2929

30-
$blacklist = config('open-telemetry.traces.disabledroutes', []);
31-
if (in_array($name, $blacklist)) {
32-
return $next($request);
33-
}
34-
35-
$blacklist = config('open-telemetry.traces.disabledpaths', []);
36-
if (in_array($request->getRequestUri(), $blacklist)) {
37-
return $next($request);
38-
}
39-
4030
$trace = $request->header('traceparent');
4131
$state = $request->header('tracestate');
4232
$span = OpenTelemetry::startSpan(name: "{$request->getMethod()} {$name}", parentTrace: $trace, parentState: $state);

config/open-telemetry.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,4 @@
1313
'version' => env('OPENTELEMETRY_SERVICE_VERSION', '1.0.0'),
1414
],
1515
'environment' => env('OPENTELEMETRY_ENVIRONMENT', config('app.env')),
16-
'traces' => [
17-
'disabledroutes' => [
18-
],
19-
'disabledpaths' => [
20-
env('PROMETHEUS_PATH', '/prometheus'),
21-
]
22-
],
2316
];

0 commit comments

Comments
 (0)