From 0eb7ef7754090b6a6017bed568b75ba07c1b3708 Mon Sep 17 00:00:00 2001 From: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:39:57 -0800 Subject: [PATCH] VACMS-17339: build and deploy breakdown revert monolog update (#17386) * Revert "Bump drupal/monolog from 2.2.0 to 3.0.2 (#17235)" This reverts commit 0b8858ad8375789f6a4a59bf456b72f8305a6af8. * VACMS-17338: updated composer.lock --- composer.json | 2 +- composer.lock | 97 +++++++++---------- .../Logger/Processor/DatadogApmProcessor.php | 3 +- 3 files changed, 49 insertions(+), 53 deletions(-) diff --git a/composer.json b/composer.json index 7ad0b66409..71aaf820d0 100644 --- a/composer.json +++ b/composer.json @@ -134,7 +134,7 @@ "drupal/migrate_tools": "^6.0", "drupal/migration_tools": "^2.8", "drupal/mimemail": "^1.0@alpha", - "drupal/monolog": "^3.0", + "drupal/monolog": "^2.0", "drupal/next": "^1.1", "drupal/no_table_drag": "^2.0@alpha", "drupal/node_link_report": "^1.14", diff --git a/composer.lock b/composer.lock index 8d9bf980a7..f3b677b188 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1e32b5360969879f1042e9e041b0142b", + "content-hash": "5519bf62017d8599ccdfed6913db3979", "packages": [ { "name": "asm89/stack-cors", @@ -2989,6 +2989,10 @@ { "name": "boromino", "homepage": "https://www.drupal.org/user/859722" + }, + { + "name": "mparker17", + "homepage": "https://www.drupal.org/user/536298" } ], "description": "Adds CKEditor abbreviation button.", @@ -9439,8 +9443,8 @@ "version": "1.0.1", "datestamp": "1696824307", "security-coverage": { - "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -10139,36 +10143,28 @@ }, { "name": "drupal/monolog", - "version": "3.0.2", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/monolog.git", - "reference": "3.0.2" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/monolog-3.0.2.zip", - "reference": "3.0.2", - "shasum": "a88e8249028e56a21c4472891381412b9733f768" + "url": "https://ftp.drupal.org/files/projects/monolog-2.2.0.zip", + "reference": "2.2.0", + "shasum": "3f243ccfb19cb30c75637882e24b1d8acfdb2f9a" }, "require": { - "drupal/core": "^10", - "monolog/monolog": "^3.2.0", - "php": "^8.1.0" - }, - "require-dev": { - "mglaman/phpstan-drupal": "^1.1", - "phpstan/extension-installer": "^1.3", - "phpstan/phpstan": "^1.11", - "phpstan/phpstan-deprecation-rules": "*", - "phpstan/phpstan-strict-rules": "^1.5", - "previousnext/coding-standard": "^1.0" + "drupal/core": "^8.8 || ^9 || ^10", + "monolog/monolog": "^2.8.0", + "php": "^7.4|^8" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.2", - "datestamp": "1707845433", + "version": "2.2.0", + "datestamp": "1662121628", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10186,14 +10182,14 @@ ], "authors": [ { - "name": "Luca Lusso", + "name": "Chris Pliakas", "homepage": "https://www.drupal.org/user/266779", - "email": "lussoluca@gmail.com", + "email": "opensource@chrispliakas.com", "role": "Project Lead" }, { "name": "See contributors", - "homepage": "https://drupal.org/node/1937716/committers", + "homepage": "http://drupal.org/node/1937716/committers", "role": "Developer" }, { @@ -10202,10 +10198,10 @@ } ], "description": "A Framework for integrating with the Monolog library.", - "homepage": "https://drupal.org/project/monolog", + "homepage": "http://drupal.org/project/monolog", "support": { "source": "https://git.drupalcode.org/project/monolog", - "issues": "https://drupal.org/project/issues/monolog" + "issues": "http://drupal.org/project/issues/monolog" } }, { @@ -17099,41 +17095,42 @@ }, { "name": "monolog/monolog", - "version": "3.5.0", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448", - "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { - "php": ">=8.1", - "psr/log": "^2.0 || ^3.0" + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "3.0.0" + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^3.0", + "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2 || ^2.0", - "guzzlehttp/guzzle": "^7.4.5", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", + "guzzlehttp/guzzle": "^7.4", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "^10.1", - "predis/predis": "^1.1 || ^2", + "phpspec/prophecy": "^1.15", + "phpstan/phpstan": "^0.12.91", + "phpunit/phpunit": "^8.5.14", + "predis/predis": "^1.1 || ^2.0", + "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -17156,7 +17153,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -17184,7 +17181,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.5.0" + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" }, "funding": [ { @@ -17196,7 +17193,7 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:32:31+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "mtownsend/xml-to-array", @@ -18726,16 +18723,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.1", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353" + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", - "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "shasum": "" }, "require": { @@ -18778,9 +18775,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" }, - "time": "2024-01-18T19:15:27+00:00" + "time": "2024-01-11T11:49:22+00:00" }, { "name": "phpmailer/phpmailer", diff --git a/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php b/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php index db7e37d58b..6aa119fc7b 100644 --- a/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php +++ b/docroot/modules/custom/va_gov_backend/src/Logger/Processor/DatadogApmProcessor.php @@ -3,7 +3,6 @@ namespace Drupal\va_gov_backend\Logger\Processor; use Drupal\va_gov_backend\Service\DatadogContextProviderInterface; -use Monolog\LogRecord; use Monolog\Processor\ProcessorInterface; /** @@ -101,7 +100,7 @@ public function shouldAlterRecord(array $record): bool { /** * {@inheritdoc} */ - public function __invoke(LogRecord $record): array { + public function __invoke(array $record): array { if (!$this->shouldAlterRecord($record)) { return $record; }