Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit f0bf9b6

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #65 from reactphp-parallel/use-helper-method-for-metrics-output-testing
Use helper method for metrics output testing
2 parents b549a6a + c4c0fee commit f0bf9b6

File tree

4 files changed

+47
-27
lines changed

4 files changed

+47
-27
lines changed

‎infection.json.dist‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"InstanceOf_": {
5353
"ignore": [
5454
"ReactParallel\\ObjectProxy\\Proxy::create",
55+
"ReactParallel\\ObjectProxy\\Proxy::thread",
5556
"ReactParallel\\ObjectProxy\\Proxy\\Handler::create",
5657
"ReactParallel\\ObjectProxy\\Proxy\\Handler::setUpHandlers",
5758
"ReactParallel\\ObjectProxy\\Proxy\\Handler::handleNotify",
@@ -113,6 +114,11 @@
113114
"ReactParallel\\ObjectProxy\\Proxy\\Registry::dropByHash"
114115
]
115116
},
117+
"Ternary": {
118+
"ignore": [
119+
"ReactParallel\\ObjectProxy\\Proxy::thread"
120+
]
121+
},
116122
"Throw_": {
117123
"ignore": [
118124
"ReactParallel\\ObjectProxy\\Proxy\\Handler::create",

‎src/Proxy.php‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use ReactParallel\ObjectProxy\Proxy\Registry;
1717
use ReactParallel\Streams\Factory as StreamsFactory;
1818
use WyriHaximus\Metrics\Label;
19+
use WyriHaximus\Metrics\Registry as MetricsRegistry;
1920
use WyriHaximus\Metrics\Registry\Counters;
2021

2122
use function array_key_exists;
@@ -123,14 +124,21 @@ public function thread(object $object, string $interface): object
123124
$this->destruct[] = $destruct;
124125
$instance = $this->registry->thread($object, $interface, $in);
125126

127+
/**
128+
* @psalm-suppress ArgumentTypeCoercion
129+
* @phpstan-ignore-next-line
130+
*/
131+
$metrics = $object instanceof MetricsRegistry ? null : ($this->registry->hasByInterface(MetricsRegistry::class) ? Metrics::create($this->registry->getByInterface(MetricsRegistry::class)->create()) : null);
132+
126133
$this->factory->call(
127-
static function (string $object, string $interface, string $hash, Channel $in, Channel $destruct): void {
134+
/** @phpstan-ignore-next-line */
135+
static function (string $object, string $interface, string $hash, Channel $in, Channel $destruct, ?Metrics $metrics = null): void {
128136
$object = unserialize($object);
129137
$instance = new Instance($object, $interface, TRUE_, $in, $hash);
130138
$eventLoop = new StreamSelectLoop();
131139
$streamFactory = new StreamsFactory(new EventLoopBridge($eventLoop));
132140
$registry = new Registry($in, $instance);
133-
new Handler($in, $eventLoop, $streamFactory, $registry);
141+
new Handler($in, $eventLoop, $streamFactory, $registry, $object instanceof MetricsRegistry ? Metrics::create($object) : $metrics);
134142

135143
$stop = static function () use ($eventLoop): void {
136144
$eventLoop->stop();
@@ -139,7 +147,14 @@ static function (string $object, string $interface, string $hash, Channel $in, C
139147

140148
$eventLoop->run();
141149
},
142-
[serialize($object), $interface, $instance->hash(), $in, $destruct]
150+
[
151+
serialize($object),
152+
$interface,
153+
$instance->hash(),
154+
$in,
155+
$destruct,
156+
$metrics,
157+
]
143158
);
144159

145160
if ($this->counterCreate instanceof Counters) {

‎src/Proxy/Handler.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
use function is_object;
3030
use function WyriHaximus\iteratorOrArrayToArray;
3131

32-
use const PHP_EOL;
3332
use const WyriHaximus\Constants\Boolean\FALSE_;
3433
use const WyriHaximus\Constants\Numeric\ZERO;
3534

@@ -89,7 +88,6 @@ private function create(object $object, string $interface): object
8988
}
9089

9190
if ($this->counterCreate instanceof Counters) {
92-
echo PHP_EOL, __METHOD__, PHP_EOL;
9391
$this->counterCreate->counter(new Label('class', $instance->class()), new Label('interface', $interface))->incr();
9492
}
9593

‎tests/ProxyTest.php‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
use function range;
3333
use function React\Promise\all;
3434
use function Safe\sleep;
35+
use function strpos;
3536
use function time;
3637

3738
use const WyriHaximus\Constants\Boolean\FALSE_;
@@ -182,19 +183,7 @@ public function metricsDestructionTesting(): void
182183
// @ignoreException
183184
}
184185

185-
$txt = $registry->print(new Prometheus());
186-
self::assertStringContainsString('counter_total{name="value"} 128', $txt);
187-
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 1', $txt);
188-
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
189-
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
190-
191-
self::assertStringContainsString('react_parallel_object_proxy_notify_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
192-
193-
self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 128', $txt);
194-
self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
195-
196-
self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
197-
self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
186+
$this->assertPrometheusOutput($registry->print(new Prometheus()));
198187
}
199188

200189
/**
@@ -245,17 +234,29 @@ public function metricsDestructionTestingInThread(): void
245234
// @ignoreException
246235
}
247236

248-
$txt = $registry->print(new Prometheus());
237+
$this->assertPrometheusOutput($registry->print(new Prometheus()));
238+
}
239+
240+
private function assertPrometheusOutput(string $txt): void
241+
{
249242
self::assertStringContainsString('counter_total{name="value"} 128', $txt);
250243
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 1', $txt);
251-
// self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
252-
// self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
253-
// self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 128', $txt);
254-
// self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
255-
// self::assertStringContainsString('react_parallel_object_proxy_notify_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
256-
// self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
257-
// self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
258-
// self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 128', $txt);
244+
if (strpos($txt, 'react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128') !== false) {
245+
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
246+
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
247+
self::assertStringContainsString('react_parallel_object_proxy_notify_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
248+
self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 128', $txt);
249+
self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
250+
} else {
251+
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 132', $txt);
252+
self::assertStringContainsString('react_parallel_object_proxy_create_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 129', $txt);
253+
self::assertStringContainsString('react_parallel_object_proxy_notify_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 129', $txt);
254+
self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry",interface="WyriHaximus\\\\Metrics\\\\Registry"} 133', $txt);
255+
self::assertStringContainsString('react_parallel_object_proxy_call_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 129', $txt);
256+
}
257+
258+
self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Registry\\\\Counters",interface="WyriHaximus\\\\Metrics\\\\Registry\\\\Counters"} 128', $txt);
259+
self::assertStringContainsString('react_parallel_object_proxy_destruct_total{class="WyriHaximus\\\\Metrics\\\\InMemory\\\\Counter",interface="WyriHaximus\\\\Metrics\\\\Counter"} 128', $txt);
259260
}
260261

261262
/**

0 commit comments

Comments
 (0)