Skip to content

Commit e859517

Browse files
authored
Merge pull request #2 from reactphp-parallel/add-metrics
Add metrics
2 parents 3f73062 + 22cc502 commit e859517

18 files changed

+3069
-1320
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
var
12
vendor

.php_cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

.phpunit.result.cache

Lines changed: 0 additions & 1 deletion
This file was deleted.

.scrutinizer.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

Makefile

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,68 @@ SHELL=bash
33

44
.PHONY: *
55

6+
DOCKER_CGROUP:=$(shell cat /proc/1/cgroup | grep docker | wc -l)
7+
COMPOSER_CACHE_DIR:=$(shell composer config --global cache-dir -q || echo ${HOME}/.composer/cache)
8+
69
ifneq ("$(wildcard /.dockerenv)","")
7-
DOCKER_RUN=
10+
IN_DOCKER:=TRUE
11+
else ifneq ("$(DOCKER_CGROUP)","0")
12+
IN_DOCKER:=TRUE
813
else
9-
DOCKER_RUN=docker run --rm -it \
10-
-v `pwd`:`pwd` \
11-
-w `pwd` \
12-
"wyrihaximusnet/php:7.4-zts-alpine3.11-dev"
14+
IN_DOCKER:=FALSE
1315
endif
1416

15-
all: lint cs-fix cs stan psalm unit infection composer-require-checker composer-unused
17+
ifeq ("$(IN_DOCKER)","TRUE")
18+
DOCKER_RUN:=
19+
else
20+
PHP_VERSION:=$(shell docker run --rm -v "`pwd`:`pwd`" jess/jq jq -r -c '.config.platform.php' "`pwd`/composer.json" | php -r "echo str_replace('|', '.', explode('.', implode('|', explode('.', stream_get_contents(STDIN), 2)), 2)[0]);")
21+
DOCKER_RUN:=docker run --rm -it \
22+
-v "`pwd`:`pwd`" \
23+
-v "${COMPOSER_CACHE_DIR}:/home/app/.composer/cache" \
24+
-w "`pwd`" \
25+
"ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-zts-alpine3.12-dev"
26+
endif
1627

17-
lint:
18-
$(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
28+
all: ## Runs everything ###
29+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs --open-tty $(MAKE)
1930

20-
cs:
21-
$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(nproc)
31+
syntax-php: ## Lint PHP syntax
32+
$(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
2233

23-
cs-fix:
24-
$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(nproc)
34+
cs-fix: ## Fix any automatically fixable code style issues
35+
$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(shell nproc) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml || $(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(shell nproc) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml || $(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(shell nproc) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml -vvvv
2536

26-
stan:
27-
$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c phpstan.neon
37+
cs: ## Check the code for code style issues
38+
$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(shell nproc) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml
2839

29-
psalm:
30-
$(DOCKER_RUN) vendor/bin/psalm --threads=$(nproc) --shepherd --stats
40+
stan: ## Run static analysis (PHPStan)
41+
$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c ./etc/qa/phpstan.neon
3142

32-
unit:
33-
$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml
43+
psalm: ## Run static analysis (Psalm)
44+
$(DOCKER_RUN) vendor/bin/psalm --threads=$(shell nproc) --shepherd --stats --config=./psalm.xml
3445

35-
unit-ci: unit
36-
if [ -f ./build/logs/clover.xml ]; then sleep 3; fi
46+
unit-testing: ## Run tests
47+
$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c ./etc/qa/phpunit.xml --coverage-text --coverage-html ./var/tests-unit-coverage-html --coverage-clover ./var/tests-unit-clover-coverage.xml
48+
$(DOCKER_RUN) test -n "$(COVERALLS_REPO_TOKEN)" && test -n "$(COVERALLS_RUN_LOCALLY)" && test -f ./var/tests-unit-clover-coverage.xml && vendor/bin/php-coveralls -v --coverage_clover ./build/logs/clover.xml --json_path ./var/tests-unit-clover-coverage-upload.json || true
3749

38-
infection:
39-
$(DOCKER_RUN) vendor/bin/infection --ansi --min-msi=100 --min-covered-msi=100 --threads=$(nproc)
50+
mutation-testing: ## Run mutation testing
51+
$(DOCKER_RUN) vendor/bin/roave-infection-static-analysis-plugin --ansi --min-msi=100 --min-covered-msi=100 --threads=$(shell nproc) --ignore-msi-with-no-mutations
4052

41-
composer-require-checker:
42-
$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv --config-file=composer-require-checker.json
53+
composer-require-checker: ## Ensure we require every package used in this package directly
54+
$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv --config-file=./etc/qa/composer-require-checker.json
4355

44-
composer-unused:
56+
composer-unused: ## Ensure we don't require any package we don't use in this package directly
4557
$(DOCKER_RUN) composer unused --ansi
58+
59+
backward-compatibility-check: ## Check code for backwards incompatible changes
60+
$(DOCKER_RUN) vendor/bin/roave-backward-compatibility-check || true
61+
62+
shell: ## Provides Shell access in the expected environment ###
63+
$(DOCKER_RUN) ash
64+
65+
task-list-ci: ## CI: Generate a JSON array of jobs to run, matches the commands run when running `make (|all)` ###
66+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]'
67+
68+
help: ## Show this help ###
69+
@printf "\033[33mUsage:\033[0m\n make [target]\n\n\033[33mTargets:\033[0m\n"
70+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-32s\033[0m %s\n", $$1, $$2}' | tr -d '#'

README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,21 @@ $eventLoopBridge->await($future)->then(function (string $message) {
8585
$loop->run();
8686
```
8787

88+
## Metrics
89+
90+
This package supports metrics through [`wyrihaximus/metrics`](https://github.com/wyrihaximus/php-metrics):
91+
92+
```php
93+
use React\EventLoop\Factory;
94+
use ReactParallel\EventLoop\EventLoopBridge;
95+
use ReactParallel\EventLoop\Metrics;
96+
use WyriHaximus\Metrics\Configuration;
97+
use WyriHaximus\Metrics\InMemory\Registry;
98+
99+
$loop = Factory::create();
100+
$eventLoopBridge = (new EventLoopBridge($loop))->withMetrics(Metrics::create(new Registry(Configuration::create())));
101+
```
102+
88103
## Contributing ##
89104

90105
Please see [CONTRIBUTING](CONTRIBUTING.md) for details.

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
"react/event-loop": "^1.1",
1616
"react/promise": "^2.7",
1717
"reactivex/rxphp": "^2.0",
18-
"wyrihaximus/constants": "^1.4.3"
18+
"wyrihaximus/constants": "^1.4.3",
19+
"wyrihaximus/metrics": "^1.0"
1920
},
2021
"require-dev": {
21-
"wyrihaximus/async-test-utilities": "^2.2"
22+
"wyrihaximus/async-test-utilities": "^3.2"
2223
},
2324
"config": {
2425
"platform": {

0 commit comments

Comments
 (0)