Merge branch 'develop'

# Conflicts:
#	composer.json [SOLVED]

Author: martinatcode

README.md

@@ -40,6 +40,12 @@ $context['stackdriver'] = [
 
 If you need to, you can override this key name by setting `$entryOptionsWrapper` to your own value (string) when using `StackdriverHandler::__construct`.
 
+It is also possible to set path to credentials and project id via the global constant.
+```php
+define('GOOGLE_APPLICATION_CREDENTIALS', '/path/to/service-account-key-file.json'); 
+define('GOOGLE_CLOUD_PROJECT', 'eg-my-project-id-148223');
+```
+
 ## Pick your framework for some specific setup
 
 * [Laravel/Laravel v5.5](docs/laravel_laravel_v5_5.md)

composer.json

@@ -20,7 +20,7 @@
     "require": {
         "php": "^7.2",
         "monolog/monolog": "^2.0",
-        "google/cloud": "^0.50"
+        "google/cloud-logging": "^1.18"
     },
     "autoload": {
         "psr-4": {

docs/laravel_laravel_v5_6.md

@@ -13,9 +13,9 @@ Add the following entry to the `channels` section in the array below the existin
         'driver' => 'custom',
         'via' => CodeInternetApplications\MonologStackdriver\Laravel\CreateStackdriverLogger::class,
         'logName' => 'my-project-log',
-        'loggingClientOptions' => [
-            'keyFilePath' => '/path/to/service-account-key-file.json',
-        ],
+        // 'loggingClientOptions' => [
+        //     'keyFilePath' => '/path/to/service-account-key-file.json',
+        // ],
         // 'loggerOptions' => [],
         // 'lineFormat' => '%message%',
         // 'entryOptionsWrapper' => 'stackdriver',
@@ -26,6 +26,7 @@ Add the following entry to the `channels` section in the array below the existin
 ## .env
 
 Edit `.env` to update `LOG_CHANNEL` to `stackdriver`.
+And finally add `GOOGLE_APPLICATION_CREDENTIALS` and `GOOGLE_CLOUD_PROJECT` or use loggingClientOptions to set path to key file and project id.
 
 ```
 LOG_CHANNEL=stackdriver

docs/laravel_laravel_v5_7.md

@@ -13,9 +13,9 @@ Add the following entry to the `channels` section in the array below the existin
         'driver' => 'custom',
         'via' => CodeInternetApplications\MonologStackdriver\Laravel\CreateStackdriverLogger::class,
         'logName' => 'my-project-log',
-        'loggingClientOptions' => [
-            'keyFilePath' => '/path/to/service-account-key-file.json',
-        ],
+        // 'loggingClientOptions' => [
+        //     'keyFilePath' => '/path/to/service-account-key-file.json',
+        // ],
         // 'loggerOptions' => [],
         // 'lineFormat' => '%message%',
         // 'entryOptionsWrapper' => 'stackdriver',
@@ -26,6 +26,7 @@ Add the following entry to the `channels` section in the array below the existin
 ## .env
 
 Edit `.env` to update `LOG_CHANNEL` to `stackdriver`.
+And finally add `GOOGLE_APPLICATION_CREDENTIALS` and `GOOGLE_CLOUD_PROJECT` or use loggingClientOptions to set path to key file and project id.
 
 ```
 LOG_CHANNEL=stackdriver

docs/laravel_lumen_v5_6.md

@@ -17,9 +17,9 @@ Make sure to have a [copy of config/logging.php from the Laravel/Lumen-framework
         'driver' => 'custom',
         'via' => CodeInternetApplications\MonologStackdriver\Laravel\CreateStackdriverLogger::class,
         'logName' => 'my-project-log',
-        'loggingClientOptions' => [
-            'keyFilePath' => '/path/to/service-account-key-file.json',
-        ],
+        // 'loggingClientOptions' => [
+        //     'keyFilePath' => '/path/to/service-account-key-file.json',
+        // ],
         // 'loggerOptions' => [],
         // 'lineFormat' => '%message%',
         // 'entryOptionsWrapper' => 'stackdriver',
@@ -29,7 +29,8 @@ Make sure to have a [copy of config/logging.php from the Laravel/Lumen-framework
 
 ## .env
 
-Finally, edit `.env` to update `LOG_CHANNEL` to `stackdriver`.
+Edit `.env` to update `LOG_CHANNEL` to `stackdriver`.
+And finally add `GOOGLE_APPLICATION_CREDENTIALS` and `GOOGLE_CLOUD_PROJECT` or use loggingClientOptions to set path to key file and project id.
 
 ```
 LOG_CHANNEL=stackdriver

docs/laravel_lumen_v5_7.md

@@ -17,9 +17,9 @@ Make sure to have a [copy of config/logging.php from the Laravel/Lumen-framework
         'driver' => 'custom',
         'via' => CodeInternetApplications\MonologStackdriver\Laravel\CreateStackdriverLogger::class,
         'logName' => 'my-project-log',
-        'loggingClientOptions' => [
-            'keyFilePath' => '/path/to/service-account-key-file.json',
-        ],
+        // 'loggingClientOptions' => [
+        //     'keyFilePath' => '/path/to/service-account-key-file.json',
+        // ],
         // 'loggerOptions' => [],
         // 'lineFormat' => '%message%',
         // 'entryOptionsWrapper' => 'stackdriver',
@@ -29,7 +29,8 @@ Make sure to have a [copy of config/logging.php from the Laravel/Lumen-framework
 
 ## .env
 
-Finally, edit `.env` to update `LOG_CHANNEL` to `stackdriver`.
+Edit `.env` to update `LOG_CHANNEL` to `stackdriver`.
+And finally add `GOOGLE_APPLICATION_CREDENTIALS` and `GOOGLE_CLOUD_PROJECT` or use loggingClientOptions to set path to key file and project id.
 
 ```
 LOG_CHANNEL=stackdriver

src/Laravel/CreateStackdriverLogger.php

@@ -15,15 +15,15 @@ class CreateStackdriverLogger
      */
     public function __invoke(array $config)
     {
-        $projectId            = $config['logName']              ?? '';
+        $logName              = $config['logName']              ?? '';
         $loggingClientOptions = $config['loggingClientOptions'] ?? [];
         $loggerOptions        = $config['loggerOptions']        ?? [];
         $entryOptionsWrapper  = $config['entryOptionsWrapper']  ?? 'stackdriver';
         $lineFormat           = $config['lineFormat']           ?? '%message%';
         $level                = $config['level']                ?? Logger::DEBUG;
         $bubble               = $config['bubble']               ?? true;
 
-        $stackdriverHandler = new StackdriverHandler($projectId, $loggingClientOptions, $loggerOptions, $entryOptionsWrapper, $lineFormat, $level, $bubble);
+        $stackdriverHandler = new StackdriverHandler($logName, $loggingClientOptions, $loggerOptions, $entryOptionsWrapper, $lineFormat, $level, $bubble);
 
         $logger = new Logger('stackdriver', [$stackdriverHandler]);
 

src/StackdriverHandler.php

@@ -49,7 +49,7 @@ class StackdriverHandler extends AbstractProcessingHandler
      * @param int     $level                The minimum logging level at which this handler will be triggered
      * @param Boolean $bubble               Whether the messages that are handled can bubble up the stack or not
      */
-    public function __construct($logName, $loggingClientOptions, $loggerOptions = [], $entryOptionsWrapper = 'stackdriver', $lineFormat = '%message%', $level = Logger::DEBUG, $bubble = true)
+    public function __construct($logName, $loggingClientOptions = [], $loggerOptions = [], $entryOptionsWrapper = 'stackdriver', $lineFormat = '%message%', $level = Logger::DEBUG, $bubble = true)
     {
         parent::__construct($level, $bubble);