Skip to content

Commit 414a7b0

Browse files
Mte90Adrian MörchenC-Duv
authored
Update master (#17)
Co-authored-by: Adrian Mörchen <[email protected]> Co-authored-by: Duvergier Claude <[email protected]>
1 parent a2eade0 commit 414a7b0

23 files changed

+778
-554
lines changed

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"require": {
3-
"symfony/polyfill-php80": "^v1.23.1"
3+
"symfony/polyfill-php80": "^v1.24.0",
4+
"promphp/prometheus_client_php": "^2.6"
45
},
56
"autoload": {
67
"psr-4": {

composer.lock

+78-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

includes/_legacy.prometheus_custom_metrics.php

-28
This file was deleted.

includes/classes/Default_Metrics_Loader.php

+34-29
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
namespace WP_Prometheus_Metrics;
44

55
use WP_Prometheus_Metrics\metrics\Database_Size_Metric;
6+
use WP_Prometheus_Metrics\metrics\Info_Metric;
67
use WP_Prometheus_Metrics\metrics\Options_Autoloaded_Count_Metric;
78
use WP_Prometheus_Metrics\metrics\Options_Autoloaded_Size_Metric;
89
use WP_Prometheus_Metrics\metrics\Pending_Updates_Metric;
910
use WP_Prometheus_Metrics\metrics\Performance_Count_Posts_Metric;
11+
use WP_Prometheus_Metrics\metrics\Performance_Write_File_To_WP_Upload_Dir_Metric;
1012
use WP_Prometheus_Metrics\metrics\Performance_Write_Temp_File_Metric;
1113
use WP_Prometheus_Metrics\metrics\Post_Types_Count_Metric;
1214
use WP_Prometheus_Metrics\metrics\Posts_Without_Content_Metric;
@@ -15,33 +17,36 @@
1517
use WP_Prometheus_Metrics\metrics\Users_Count_Metric;
1618
use WP_Prometheus_Metrics\metrics\Users_Sessions_Metric;
1719

18-
class Default_Metrics_Loader {
19-
private $metrics_loaded = false;
20-
21-
public function __construct() {
22-
add_filter( 'prometheus_get_metrics', [ $this, 'load_default_metrics' ], 0 );
23-
}
24-
25-
26-
function load_default_metrics( $metrics = [] ) {
27-
if ( ! $this->metrics_loaded ) {
28-
29-
new Database_Size_Metric();
30-
new Users_Count_Metric();
31-
new Users_Sessions_Metric();
32-
new Options_Autoloaded_Count_Metric();
33-
new Options_Autoloaded_Size_Metric();
34-
new Posts_Without_Content_Metric();
35-
new Posts_Without_Title_Metric();
36-
new Post_Types_Count_Metric();
37-
new Pending_Updates_Metric();
38-
new Transients_Autoloaded_Count_Metric();
39-
new Performance_Count_Posts_Metric();
40-
new Performance_Write_Temp_File_Metric();
41-
42-
$this->metrics_loaded = true;
43-
}
44-
45-
return $metrics;
46-
}
20+
class Default_Metrics_Loader
21+
{
22+
private $metrics_loaded = false;
23+
24+
public function __construct()
25+
{
26+
add_filter('prometheus-metrics-for-wp/get_metrics', [$this, 'load_default_metrics'], 0, 2);
27+
}
28+
29+
function load_default_metrics($metrics = [])
30+
{
31+
if (!$this->metrics_loaded) {
32+
new Database_Size_Metric();
33+
new Info_Metric();
34+
new Options_Autoloaded_Count_Metric();
35+
new Options_Autoloaded_Size_Metric();
36+
new Pending_Updates_Metric();
37+
new Performance_Count_Posts_Metric();
38+
new Performance_Write_File_To_WP_Upload_Dir_Metric();
39+
new Performance_Write_Temp_File_Metric();
40+
new Post_Types_Count_Metric();
41+
new Posts_Without_Content_Metric();
42+
new Posts_Without_Title_Metric();
43+
new Transients_Autoloaded_Count_Metric();
44+
new Users_Count_Metric();
45+
new Users_Sessions_Metric();
46+
47+
$this->metrics_loaded = true;
48+
}
49+
50+
return $metrics;
51+
}
4752
}

0 commit comments

Comments
 (0)