Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PromPHP/prometheus_client_php
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 35d5a68
Choose a base ref
...
head repository: PromPHP/prometheus_client_php
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93b023f
Choose a head ref
  • 18 commits
  • 19 files changed
  • 18 contributors

Commits on Oct 18, 2024

  1. - Add PostgreSQL support in Storage/PDO.php (#162) 

    - Add PostgreSQL tests in github workflow
 - Fix type hints and types in doc blocks
 - Add phpstan ignoreErrors for Redis: phpstan/phpstan#11728

Signed-off-by: Alex <2646298@mail.ru>
    @2646298
    2646298 authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    600f6df View commit details
    Browse the repository at this point in the history

  2. Ensure that label values are strings in APCNg adapter (#159) 

    * Ensure that label values are strings in APCNg adapter

APCNg is crashing if the label value provided wasn't a string, but something that can be coerced to string (such as int).

The problem occurs in two different places:
- when a metric is emitted, the `storeLabelKeys()` calls into `addItemToKey()` which has its second parameter type hinted as a `string` and throws a type error if anything else is passed. This results in partially stored state;
- when trying to scrape metrics with partially stored state, the `APCng::collect()` will try to build all the permutations and expect all the key-value pairs for labels to exist, but numeric label values aren't persisted and so it will cause the `Undefined array key` error as reported in #154;

This change ensures that label values are cast to the string type before encoding them and using as APC keys.

Signed-off-by: Garry Filakhtov <garry.filakhtov@bigcommerce.com>

* Fix PHPStan issues
Signed-off-by: Garry Filakhtov <garry.filakhtov@bigcommerce.com>

---------

Signed-off-by: Garry Filakhtov <garry.filakhtov@bigcommerce.com>
    @software-artificer
    software-artificer authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    50b70a6 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2024

  1. Ignore phpstan argument.type lint in test (#169) 

    Signed-off-by: Matias Ylipelto <129368437+lianatech-matias-ylipelto@users.noreply.github.com>
    @lianatech-matias-ylipelto
    lianatech-matias-ylipelto authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    12af805 View commit details
    Browse the repository at this point in the history

  2. Use explicit nullable type parameters (#168) 

    Signed-off-by: Matias Ylipelto <129368437+lianatech-matias-ylipelto@users.noreply.github.com>
Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @lianatech-matias-ylipelto @LKaemmerling
    lianatech-matias-ylipelto and LKaemmerling authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    6d7328e View commit details
    Browse the repository at this point in the history

  3. Redis - Metrics collection should not write anything (#165) 

    Signed-off-by: Jakub Pastuszek <jakub.pastuszek@invia.cz>
Co-authored-by: Jakub Pastuszek <jakub.pastuszek@invia.cz>
    @iKsSs @iksss-invia
    iKsSs and iksss-invia authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    d6233cc View commit details
    Browse the repository at this point in the history

  4. Redis ACL AUTH two argument supporting. (#167) 

    * Redis ACL AUTH two argument supporting.
Signed-off-by: Gennadii Chernykh <ragnarek45@gmail.com>

Signed-off-by: Gennadii Chernykh <gennadii.chernykh@eglobal-group.com>

* Redis ACL AUTH two argument supporting.
Signed-off-by: Gennadii Chernykh <ragnarek45@gmail.com>

Signed-off-by: Gennadii Chernykh <gennadii.chernykh@eglobal-group.com>

* Fix not using empty in Redis Adapter

* Fix not using empty in RedisNg Adapter

---------

Signed-off-by: Gennadii Chernykh <gennadii.chernykh@eglobal-group.com>
Co-authored-by: Gennadii Chernykh <gennadii.chernykh@eglobal-group.com>
Co-authored-by: Lukas Kämmerling <github@lukas-kaemmerling.de>
    @Ragaga @LKaemmerling
    3 people authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    abe6bbb View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2024

  1. Correctly handle empty username for Redis/RedisNg AUTH (#170) 

    Signed-off-by: Reda <reda.bouchaala@printify.com>
    @breda
    breda authored Dec 10, 2024
    Configuration menu
    Copy the full SHA
    3f8e4ff View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2025

  1. Use PHP 8.4 for tests and fix phpstan issue (#176) 

    * Use PHP 8.4 for tests and fix phpstan issue

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>

* Update actions

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>

* Migrate phpunit configuration

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>

---------

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @LKaemmerling
    LKaemmerling authored Mar 3, 2025
    Configuration menu
    Copy the full SHA
    f191801 View commit details
    Browse the repository at this point in the history

  2. Catch invalid JSON from Redis and throw an error (#174) 

    * Catch invalid JSON from Redis and throw an error

Signed-off-by: Vsevolod <vmalygin@adsterra.com>

* was added a custom json exception for metrics

Signed-off-by: Vsevolod <vmalygin@adsterra.com>

* refactoring

Signed-off-by: Vsevolod <vmalygin@adsterra.com>

* Update src/Prometheus/Exception/MetricJsonException.php

---------

Signed-off-by: Vsevolod <vmalygin@adsterra.com>
Co-authored-by: Vsevolod <vmalygin@adsterra.com>
Co-authored-by: Lukas Kämmerling <github@lukas-kaemmerling.de>
Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @SevaWeb011 @LKaemmerling
    4 people authored Mar 3, 2025
    Configuration menu
    Copy the full SHA
    4f71eb1 View commit details
    Browse the repository at this point in the history

  3. Bump min php Version to 7.4, fix PHPstan issues 

    Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @LKaemmerling
    LKaemmerling committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    7912087 View commit details
    Browse the repository at this point in the history

  4. feat: add metric name to MetricsRegistrationException (#163) 

    Signed-off-by: Simon Podlipsky <simon@podlipsky.net>
Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @simPod @LKaemmerling
    simPod and LKaemmerling authored Mar 3, 2025
    Configuration menu
    Copy the full SHA
    1d8b02b View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2025

  1. Prevent php error when data was removed from redis (#149) 

    This code was already in redis storage but not in redisNg

Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @pluk77 @LKaemmerling
    pluk77 and LKaemmerling authored Mar 5, 2025
    Configuration menu
    Copy the full SHA
    381753d View commit details
    Browse the repository at this point in the history

  2. APCng storage - avoid worst-case memory usage in buildPermutationTree (… 

    …#123)

* APCng storage - avoid worst-case memory usage in buildPermutationTree

Signed-off-by: Josh Hoffer <jhoffer@datava.com>

* Fix PHPstan errors

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>

---------

Signed-off-by: Josh Hoffer <jhoffer@datava.com>
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @Princemachiavelli @LKaemmerling
    Princemachiavelli and LKaemmerling authored Mar 5, 2025
    Configuration menu
    Copy the full SHA
    3e4811f View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2025

  1. Changed the parent class for MetricNotFoundException to improve the e… 

    …xception hierarchy (#181)

Signed-off-by: Vsevolod <vmalygin@adsterra.com>
Co-authored-by: Vsevolod <vmalygin@adsterra.com>
Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @SevaWeb011 @LKaemmerling
    3 people authored Apr 14, 2025
    Configuration menu
    Copy the full SHA
    5fed794 View commit details
    Browse the repository at this point in the history

  2. create index if not exist to prevent duplicate error (#180) 

    Signed-off-by: Sergio Acevedo <SergioAcevedo05@Protonmail.com>
Co-authored-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @Sergio-Acevedo @LKaemmerling
    Sergio-Acevedo and LKaemmerling authored Apr 14, 2025
    Configuration menu
    Copy the full SHA
    f242784 View commit details
    Browse the repository at this point in the history

  3. Login into DockerHub to avoid rate limits 

    Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @LKaemmerling
    LKaemmerling committed Apr 14, 2025
    Configuration menu
    Copy the full SHA
    e7e1720 View commit details
    Browse the repository at this point in the history

  4. Storage/Redis & RedisNG: Remove usage of str_replace to get metrics a… 

    …s it might lead to unexpected results (#185)

More details in #182

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
    @LKaemmerling
    LKaemmerling authored Apr 14, 2025
    Configuration menu
    Copy the full SHA
    a283aea View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2025

  1. CI: Test against Redis 8 (#188) 

    Signed-off-by: simonhammes <simonhammes@users.noreply.github.com>
Co-authored-by: simonhammes <simonhammes@users.noreply.github.com>
    @simonhammes
    simonhammes and simonhammes authored Jul 2, 2025
    Configuration menu
    Copy the full SHA
    93b023f View commit details
    Browse the repository at this point in the history
Loading