diff --git a/src/Prometheus/Storage/RedisTxn.php b/src/Prometheus/Storage/RedisTxn.php index 35cf8bc5..d8c42660 100644 --- a/src/Prometheus/Storage/RedisTxn.php +++ b/src/Prometheus/Storage/RedisTxn.php @@ -31,7 +31,6 @@ * This adapter refactors the {@see \Prometheus\Storage\RedisNg} adapter to generally try and execute the "update" and * "collect" operations of each metric type within a single Redis transaction. * - * @todo Only summary metrics have been refactored so far. Complete refactor for counter, gauge, and histogram metrics. * @todo Reimplement wipeStorage() to account for reorganized keys in Redis. * @todo Reimplement all Redis scripts with redis.pcall() to trap runtime errors that are ignored by redis.call(). */ diff --git a/tests/Test/Benchmark/BenchmarkTest.php b/tests/Test/Benchmark/BenchmarkTest.php index a8768bb2..b9bba8d9 100644 --- a/tests/Test/Benchmark/BenchmarkTest.php +++ b/tests/Test/Benchmark/BenchmarkTest.php @@ -32,34 +32,34 @@ public static function setUpBeforeClass(): void public function benchmarkProvider(): array { return [ -// [AdapterType::REDISNG, MetricType::COUNTER, 1000, 10], -// [AdapterType::REDISNG, MetricType::COUNTER, 2000, 10], -// [AdapterType::REDISNG, MetricType::COUNTER, 5000, 10], -// [AdapterType::REDISNG, MetricType::COUNTER, 10000, 10], -// [AdapterType::REDISNG, MetricType::GAUGE, 1000, 10], -// [AdapterType::REDISNG, MetricType::GAUGE, 2000, 10], -// [AdapterType::REDISNG, MetricType::GAUGE, 5000, 10], -// [AdapterType::REDISNG, MetricType::GAUGE, 10000, 10], -// [AdapterType::REDISNG, MetricType::HISTOGRAM, 1000, 10], -// [AdapterType::REDISNG, MetricType::HISTOGRAM, 2000, 10], -// [AdapterType::REDISNG, MetricType::HISTOGRAM, 5000, 10], -// [AdapterType::REDISNG, MetricType::HISTOGRAM, 10000, 10], -// [AdapterType::REDISNG, MetricType::SUMMARY, 1000, 10], -// [AdapterType::REDISNG, MetricType::SUMMARY, 2000, 10], -// [AdapterType::REDISNG, MetricType::SUMMARY, 5000, 10], -// [AdapterType::REDISNG, MetricType::SUMMARY, 10000, 10], -// [AdapterType::REDISTXN, MetricType::COUNTER, 1000, 10], -// [AdapterType::REDISTXN, MetricType::COUNTER, 2000, 10], -// [AdapterType::REDISTXN, MetricType::COUNTER, 5000, 10], -// [AdapterType::REDISTXN, MetricType::COUNTER, 10000, 10], -// [AdapterType::REDISTXN, MetricType::GAUGE, 1000, 10], -// [AdapterType::REDISTXN, MetricType::GAUGE, 2000, 10], -// [AdapterType::REDISTXN, MetricType::GAUGE, 5000, 10], -// [AdapterType::REDISTXN, MetricType::GAUGE, 10000, 10], -// [AdapterType::REDISTXN, MetricType::HISTOGRAM, 1000, 10], -// [AdapterType::REDISTXN, MetricType::HISTOGRAM, 2000, 10], -// [AdapterType::REDISTXN, MetricType::HISTOGRAM, 5000, 10], -// [AdapterType::REDISTXN, MetricType::HISTOGRAM, 10000, 10], + [AdapterType::REDISNG, MetricType::COUNTER, 1000, 10], + [AdapterType::REDISNG, MetricType::COUNTER, 2000, 10], + [AdapterType::REDISNG, MetricType::COUNTER, 5000, 10], + [AdapterType::REDISNG, MetricType::COUNTER, 10000, 10], + [AdapterType::REDISNG, MetricType::GAUGE, 1000, 10], + [AdapterType::REDISNG, MetricType::GAUGE, 2000, 10], + [AdapterType::REDISNG, MetricType::GAUGE, 5000, 10], + [AdapterType::REDISNG, MetricType::GAUGE, 10000, 10], + [AdapterType::REDISNG, MetricType::HISTOGRAM, 1000, 10], + [AdapterType::REDISNG, MetricType::HISTOGRAM, 2000, 10], + [AdapterType::REDISNG, MetricType::HISTOGRAM, 5000, 10], + [AdapterType::REDISNG, MetricType::HISTOGRAM, 10000, 10], + [AdapterType::REDISNG, MetricType::SUMMARY, 1000, 10], + [AdapterType::REDISNG, MetricType::SUMMARY, 2000, 10], + [AdapterType::REDISNG, MetricType::SUMMARY, 5000, 10], + [AdapterType::REDISNG, MetricType::SUMMARY, 10000, 10], + [AdapterType::REDISTXN, MetricType::COUNTER, 1000, 10], + [AdapterType::REDISTXN, MetricType::COUNTER, 2000, 10], + [AdapterType::REDISTXN, MetricType::COUNTER, 5000, 10], + [AdapterType::REDISTXN, MetricType::COUNTER, 10000, 10], + [AdapterType::REDISTXN, MetricType::GAUGE, 1000, 10], + [AdapterType::REDISTXN, MetricType::GAUGE, 2000, 10], + [AdapterType::REDISTXN, MetricType::GAUGE, 5000, 10], + [AdapterType::REDISTXN, MetricType::GAUGE, 10000, 10], + [AdapterType::REDISTXN, MetricType::HISTOGRAM, 1000, 10], + [AdapterType::REDISTXN, MetricType::HISTOGRAM, 2000, 10], + [AdapterType::REDISTXN, MetricType::HISTOGRAM, 5000, 10], + [AdapterType::REDISTXN, MetricType::HISTOGRAM, 10000, 10], [AdapterType::REDISTXN, MetricType::SUMMARY, 1000, 10], [AdapterType::REDISTXN, MetricType::SUMMARY, 2000, 10], [AdapterType::REDISTXN, MetricType::SUMMARY, 5000, 10],