Skip to content

Commit 712805f

Browse files
authored
Merge pull request #3 from jobee/update
!!!TASK: Neos 7.x support
2 parents 8d81774 + f6c8064 commit 712805f

File tree

4 files changed

+40
-30
lines changed

4 files changed

+40
-30
lines changed

Classes/Http/CheckEnabledComponent.php

-24
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
namespace Flowpack\Fusion\Tracing\Http\Middleware;
3+
4+
use Flowpack\Fusion\Tracing\Aspect\RuntimeTracing;
5+
use Neos\Flow\Annotations as Flow;
6+
use Psr\Http\Message\ResponseInterface;
7+
use Psr\Http\Message\ServerRequestInterface;
8+
use Psr\Http\Server\MiddlewareInterface;
9+
use Psr\Http\Server\RequestHandlerInterface;
10+
11+
/**
12+
* Look for a "X-Fusion-Tracing" request header and start tracing
13+
*/
14+
class CheckEnabledMiddleware implements MiddlewareInterface
15+
{
16+
/**
17+
* @Flow\Inject
18+
* @var RuntimeTracing
19+
*/
20+
protected $runtimeTracing;
21+
22+
/**
23+
* @param ServerRequestInterface $request
24+
* @param RequestHandlerInterface $handler
25+
* @return ResponseInterface
26+
*/
27+
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
28+
{
29+
$traceNameHeader = $request->getHeaderLine('X-Fusion-Tracing');
30+
if (!empty($traceNameHeader)) {
31+
$this->runtimeTracing->enable($traceNameHeader);
32+
}
33+
return $handler->handle($request);
34+
}
35+
}

Configuration/Settings.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
Neos:
22
Flow:
33
http:
4-
chain:
5-
'preprocess':
6-
chain:
7-
'flowpackFusionTracingCheckEnabled':
8-
component: 'Flowpack\Fusion\Tracing\Http\CheckEnabledComponent'
4+
middlewares:
5+
flowpackFusionTracingCheckEnabled:
6+
position: 'start 999'
7+
middleware: 'Flowpack\Fusion\Tracing\Http\Middleware\CheckEnabledMiddleware'

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "neos-package",
55
"name": "flowpack/fusion-tracing",
66
"require": {
7-
"neos/fusion": "^4.3 || ^5.0 || dev-master"
7+
"neos/fusion": "^7.0 || dev-master"
88
},
99
"autoload": {
1010
"psr-4": {

0 commit comments

Comments
 (0)