Skip to content

Commit e97a338

Browse files
committed
metrics
1 parent 0cb41ff commit e97a338

21 files changed

Lines changed: 1008 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\\Metric\\": "pkg/metric/",
8183
"Enqueue\\": "pkg/enqueue/"
8284
},
8385
"exclude-from-classmap": [

‎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/metric/.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/metric/.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/metric/.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

‎pkg/metric/ConsumerStarted.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Enqueue\Metric;
6+
7+
class ConsumerStarted extends Event
8+
{
9+
/**
10+
* @var string[]
11+
*/
12+
protected $queues;
13+
14+
public function __construct(
15+
string $consumerId,
16+
int $timestampMs,
17+
array $queues
18+
) {
19+
parent::__construct($consumerId, $timestampMs);
20+
21+
$this->queues = $queues;
22+
}
23+
}

‎pkg/metric/ConsumerStats.php‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Enqueue\Metric;
6+
7+
class ConsumerStats extends Event
8+
{
9+
/**
10+
* @var string[]
11+
*/
12+
protected $queues;
13+
14+
/**
15+
* @var int
16+
*/
17+
protected $startedAtMs;
18+
19+
/**
20+
* @var int
21+
*/
22+
protected $received;
23+
24+
/**
25+
* @var int
26+
*/
27+
protected $acknowledged;
28+
29+
/**
30+
* @var int
31+
*/
32+
protected $rejected;
33+
34+
/**
35+
* @var int
36+
*/
37+
protected $requeued;
38+
39+
/**
40+
* @var int
41+
*/
42+
protected $memoryUsage;
43+
44+
/**
45+
* @var float
46+
*/
47+
protected $systemLoad;
48+
49+
public function __construct(
50+
string $consumerId,
51+
int $timestampMs,
52+
array $queues,
53+
int $startedAtMs,
54+
int $received,
55+
int $acknowledged,
56+
int $rejected,
57+
int $requeued,
58+
int $memoryUsage,
59+
float $systemLoad
60+
) {
61+
parent::__construct($consumerId, $timestampMs);
62+
63+
$this->queues = $queues;
64+
$this->startedAtMs = $startedAtMs;
65+
$this->received = $received;
66+
$this->acknowledged = $acknowledged;
67+
$this->rejected = $rejected;
68+
$this->requeued = $requeued;
69+
70+
$this->memoryUsage = $memoryUsage;
71+
$this->systemLoad = $systemLoad;
72+
}
73+
74+
public function getQueues(): array
75+
{
76+
return $this->queues;
77+
}
78+
79+
public function getStartedAtMs(): int
80+
{
81+
return $this->startedAtMs;
82+
}
83+
84+
public function getReceived(): int
85+
{
86+
return $this->received;
87+
}
88+
89+
public function getAcknowledged(): int
90+
{
91+
return $this->acknowledged;
92+
}
93+
94+
public function getRejected(): int
95+
{
96+
return $this->rejected;
97+
}
98+
99+
public function getRequeued(): int
100+
{
101+
return $this->requeued;
102+
}
103+
104+
public function getMemoryUsage(): int
105+
{
106+
return $this->memoryUsage;
107+
}
108+
109+
public function getSystemLoad(): float
110+
{
111+
return $this->systemLoad;
112+
}
113+
}

0 commit comments

Comments
 (0)