Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #7 from Superbalist/master
Browse files Browse the repository at this point in the history
Update our fork of laravel-prometheus-exporter
  • Loading branch information
ThomasJamesCrawford authored Jan 12, 2022
2 parents 1467cd5 + a581a2b commit 3ffae95
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
13 changes: 13 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## 1.0.5 - 2020-03-16

* Update call to array_get helper to use the Illuminate\Support\Arr class
* Enable Laravel 7 compatability

## 1.0.4 - 2019-10-17

* Enable Laravel 6.0 compatability

## 1.0.3 - 2019-02-11

* Enable package discovery for laravel 5.5+

## 1.0.2 - 2019-01-16

* Add compatability with Laravel Lumen (make named route configurable)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
],
"require": {
"php": ">=5.6.0",
"illuminate/support": "^5.3",
"illuminate/routing": "^5.3",
"illuminate/support": "^5.3 || ^6.0 || ^7.0 || ^8.0",
"illuminate/routing": "^5.3 || ^6.0 || ^7.0 || ^8.0",
"jimdo/prometheus_client_php": "^0.9.0"
},
"autoload": {
Expand Down
3 changes: 2 additions & 1 deletion src/PrometheusServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Superbalist\LaravelPrometheusExporter;

use Illuminate\Support\Arr;
use Illuminate\Support\ServiceProvider;
use Prometheus\CollectorRegistry;
use Prometheus\Storage\Adapter;
Expand Down Expand Up @@ -50,7 +51,7 @@ public function register()
$factory = $app['prometheus.storage_adapter_factory']; /** @var StorageAdapterFactory $factory */
$driver = config('prometheus.storage_adapter');
$configs = config('prometheus.storage_adapters');
$config = array_get($configs, $driver, []);
$config = Arr::get($configs, $driver, []);
return $factory->make($driver, $config);
});
$this->app->alias(Adapter::class, 'prometheus.storage_adapter');
Expand Down

0 comments on commit 3ffae95

Please sign in to comment.