Skip to content

Commit 15749bd

Browse files
committed
xMerge remote-tracking branch 'origin/metrics' into doc-moniotoring
2 parents dec922e + d5d0a98 commit 15749bd

23 files changed

Lines changed: 1415 additions & 11 deletions

‎composer.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"richardfullmer/rabbitmq-management-api": "^2.0",
3333
"predis/predis": "^1.1",
3434
"thruway/pawl-transport": "^0.5.0",
35-
"voryx/thruway": "^0.5.3"
35+
"voryx/thruway": "^0.5.3",
36+
"influxdb/influxdb-php": "^1.14"
3637
},
3738
"require-dev": {
3839
"phpunit/phpunit": "^5.5",
@@ -78,6 +79,7 @@
7879
"Enqueue\\Test\\": "pkg/test/",
7980
"Enqueue\\Dsn\\": "pkg/dsn/",
8081
"Enqueue\\Wamp\\": "pkg/wamp/",
82+
"Enqueue\\Monitoring\\": "pkg/monitoring/",
8183
"Enqueue\\": "pkg/enqueue/"
8284
},
8385
"exclude-from-classmap": [

‎docker-compose.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,16 @@ services:
125125
HOSTNAME_EXTERNAL: 'localstack'
126126
SERVICES: 'sqs'
127127

128+
influxdb:
129+
image: 'influxdb:latest'
130+
131+
chronograf:
132+
image: 'chronograf:latest'
133+
entrypoint: 'chronograf --influxdb-url=http://influxdb:8086'
134+
ports:
135+
- '8888:8888'
136+
137+
grafana:
138+
image: 'grafana/grafana:latest'
139+
ports:
140+
- '3000:3000'

‎pkg/enqueue/Consumption/Context/MessageResult.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Enqueue\Consumption\Context;
44

55
use Enqueue\Consumption\Result;
6+
use Interop\Queue\Consumer;
67
use Interop\Queue\Context;
78
use Interop\Queue\Message;
89
use Psr\Log\LoggerInterface;
@@ -14,6 +15,11 @@ final class MessageResult
1415
*/
1516
private $context;
1617

18+
/**
19+
* @var Consumer
20+
*/
21+
private $consumer;
22+
1723
/**
1824
* @var Message
1925
*/
@@ -34,9 +40,10 @@ final class MessageResult
3440
*/
3541
private $logger;
3642

37-
public function __construct(Context $context, Message $message, $result, int $receivedAt, LoggerInterface $logger)
43+
public function __construct(Context $context, Consumer $consumer, Message $message, $result, int $receivedAt, LoggerInterface $logger)
3844
{
3945
$this->context = $context;
46+
$this->consumer = $consumer;
4047
$this->message = $message;
4148
$this->logger = $logger;
4249
$this->result = $result;
@@ -48,6 +55,11 @@ public function getContext(): Context
4855
return $this->context;
4956
}
5057

58+
public function getConsumer(): Consumer
59+
{
60+
return $this->consumer;
61+
}
62+
5163
public function getMessage(): Message
5264
{
5365
return $this->message;

‎pkg/enqueue/Consumption/Context/ProcessorException.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Enqueue\Consumption\Context;
44

55
use Enqueue\Consumption\Result;
6+
use Interop\Queue\Consumer;
67
use Interop\Queue\Context;
78
use Interop\Queue\Message;
89
use Psr\Log\LoggerInterface;
@@ -14,6 +15,11 @@ final class ProcessorException
1415
*/
1516
private $context;
1617

18+
/**
19+
* @var Consumer
20+
*/
21+
private $consumer;
22+
1723
/**
1824
* @var Message
1925
*/
@@ -38,9 +44,10 @@ final class ProcessorException
3844
*/
3945
private $logger;
4046

41-
public function __construct(Context $context, Message $message, \Exception $exception, int $receivedAt, LoggerInterface $logger)
47+
public function __construct(Context $context, Consumer $consumer, Message $message, \Exception $exception, int $receivedAt, LoggerInterface $logger)
4248
{
4349
$this->context = $context;
50+
$this->consumer = $consumer;
4451
$this->message = $message;
4552
$this->exception = $exception;
4653
$this->logger = $logger;
@@ -52,6 +59,11 @@ public function getContext(): Context
5259
return $this->context;
5360
}
5461

62+
public function getConsumer(): Consumer
63+
{
64+
return $this->consumer;
65+
}
66+
5567
public function getMessage(): Message
5668
{
5769
return $this->message;

‎pkg/enqueue/Consumption/QueueConsumer.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,11 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
196196
try {
197197
$result = $processor->process($message, $this->interopContext);
198198
} catch (\Exception $e) {
199-
$result = $this->onProcessorException($extension, $message, $e, $receivedAt);
199+
$result = $this->onProcessorException($extension, $consumer, $message, $e, $receivedAt);
200200
}
201201
}
202202

203-
$messageResult = new MessageResult($this->interopContext, $message, $result, $receivedAt, $this->logger);
203+
$messageResult = new MessageResult($this->interopContext, $consumer, $message, $result, $receivedAt, $this->logger);
204204
$extension->onResult($messageResult);
205205
$result = $messageResult->getResult();
206206

@@ -274,8 +274,6 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
274274

275275
++$cycle;
276276
}
277-
278-
$this->enableSubscriptionConsumer = $enableSubscriptionConsumer;
279277
}
280278

281279
/**
@@ -304,9 +302,9 @@ private function onEnd(ExtensionInterface $extension, int $startTime, Subscripti
304302
*
305303
* https://github.com/symfony/symfony/blob/cbe289517470eeea27162fd2d523eb29c95f775f/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php#L77
306304
*/
307-
private function onProcessorException(ExtensionInterface $extension, Message $message, \Exception $exception, int $receivedAt)
305+
private function onProcessorException(ExtensionInterface $extension, Consumer $consumer, Message $message, \Exception $exception, int $receivedAt)
308306
{
309-
$processorException = new ProcessorException($this->interopContext, $message, $exception, $receivedAt, $this->logger);
307+
$processorException = new ProcessorException($this->interopContext, $consumer, $message, $exception, $receivedAt, $this->logger);
310308

311309
try {
312310
$extension->onProcessorException($processorException);
@@ -331,7 +329,5 @@ private function onProcessorException(ExtensionInterface $extension, Message $me
331329

332330
throw $e;
333331
}
334-
335-
throw $exception;
336332
}
337333
}

‎pkg/enqueue/Tests/Consumption/ChainExtensionTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ public function testShouldProxyOnResultToAllInternalExtensions()
169169
{
170170
$context = new MessageResult(
171171
$this->createInteropContextMock(),
172+
$this->createInteropConsumerMock(),
172173
$this->createMock(Message::class),
173174
'aResult',
174175
1,

‎pkg/monitoring/.gitattributes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/Tests export-ignore
2+
.gitattributes export-ignore
3+
.gitignore export-ignore
4+
.travis.yml export-ignore
5+
phpunit.xml.dist export-ignore

‎pkg/monitoring/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*~
2+
/composer.lock
3+
/composer.phar
4+
/phpunit.xml
5+
/vendor/
6+
/.idea/

‎pkg/monitoring/.travis.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
sudo: false
2+
3+
git:
4+
depth: 10
5+
6+
language: php
7+
8+
php:
9+
- '7.1'
10+
- '7.2'
11+
12+
cache:
13+
directories:
14+
- $HOME/.composer/cache
15+
16+
install:
17+
- composer self-update
18+
- composer install
19+
20+
script:
21+
- vendor/bin/phpunit --exclude-group=functional
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Enqueue\Monitoring;
6+
7+
class ConsumedMessageStats implements Stats
8+
{
9+
const STATUS_ACK = 'acknowledged';
10+
const STATUS_REJECTED = 'rejected';
11+
const STATUS_REQUEUED = 'requeued';
12+
const STATUS_FAILED = 'failed';
13+
14+
/**
15+
* @var string
16+
*/
17+
protected $consumerId;
18+
19+
/**
20+
* @var int
21+
*/
22+
protected $timestampMs;
23+
24+
/**
25+
* @var int
26+
*/
27+
protected $receivedAtMs;
28+
29+
/**
30+
* @var string
31+
*/
32+
protected $queue;
33+
34+
/**
35+
* @var array
36+
*/
37+
protected $headers;
38+
39+
/**
40+
* @var array
41+
*/
42+
protected $properties;
43+
44+
/**
45+
* @var string
46+
*/
47+
protected $status;
48+
49+
public function __construct(
50+
string $consumerId,
51+
int $timestampMs,
52+
int $receivedAtMs,
53+
string $queue,
54+
array $headers,
55+
array $properties,
56+
string $status
57+
) {
58+
$this->consumerId = $consumerId;
59+
$this->timestampMs = $timestampMs;
60+
$this->receivedAtMs = $receivedAtMs;
61+
$this->queue = $queue;
62+
$this->headers = $headers;
63+
$this->properties = $properties;
64+
$this->status = $status;
65+
}
66+
67+
public function getConsumerId(): string
68+
{
69+
return $this->consumerId;
70+
}
71+
72+
public function getTimestampMs(): int
73+
{
74+
return $this->timestampMs;
75+
}
76+
77+
public function getReceivedAtMs(): int
78+
{
79+
return $this->receivedAtMs;
80+
}
81+
82+
public function getQueue(): string
83+
{
84+
return $this->queue;
85+
}
86+
87+
public function getHeaders(): array
88+
{
89+
return $this->headers;
90+
}
91+
92+
public function getProperties(): array
93+
{
94+
return $this->properties;
95+
}
96+
97+
public function getStatus(): string
98+
{
99+
return $this->status;
100+
}
101+
}

0 commit comments

Comments
 (0)