From faef0c760dbe2a783f77c562fa6436a384f44141 Mon Sep 17 00:00:00 2001 From: Dave Long Date: Thu, 22 Jun 2023 11:34:44 +0100 Subject: [PATCH] Issue #3352389 by catch, smustgrave, xjm, heddn: Add open-telemetry/sdk and open-telemetry/exporter-otlp as dev dependencies --- composer.json | 6 +- composer.lock | 730 +++++++++++++++++- .../Metapackage/DevDependencies/composer.json | 3 + .../PinnedDevDependencies/composer.json | 12 + core/misc/cspell/dictionary.txt | 4 + 5 files changed, 752 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 20649054bdb1..831152d8460e 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,9 @@ "justinrainbow/json-schema": "^5.2", "mglaman/phpstan-drupal": "^1.1.34", "mikey179/vfsstream": "^1.6.11", + "open-telemetry/exporter-otlp": "@beta", + "open-telemetry/sdk": "@beta", + "php-http/guzzle7-adapter": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.10.1", @@ -60,7 +63,8 @@ "drupal/core-project-message": true, "drupal/core-vendor-hardening": true, "phpstan/extension-installer": true, - "dealerdirect/phpcodesniffer-composer-installer": true + "dealerdirect/phpcodesniffer-composer-installer": true, + "php-http/discovery": true } }, "extra": { diff --git a/composer.lock b/composer.lock index 67d53dd85e6e..9c689783b9f7 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": "9799dd30df5c95a15f9095b15a32b927", + "content-hash": "8b8e913d0a101af5369ea1982d76c5f5", "packages": [ { "name": "asm89/stack-cors", @@ -5238,6 +5238,50 @@ }, "time": "2023-04-18T12:07:59+00:00" }, + { + "name": "google/protobuf", + "version": "v3.23.3", + "source": { + "type": "git", + "url": "https://github.com/protocolbuffers/protobuf-php.git", + "reference": "e611e00ffc99123fcbddc77774f26c813ead9294" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/e611e00ffc99123fcbddc77774f26c813ead9294", + "reference": "e611e00ffc99123fcbddc77774f26c813ead9294", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": ">=5.0.0" + }, + "suggest": { + "ext-bcmath": "Need to support JSON deserialization" + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Protobuf\\": "src/Google/Protobuf", + "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "proto library for PHP", + "homepage": "https://developers.google.com/protocol-buffers/", + "keywords": [ + "proto" + ], + "support": { + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.23.3" + }, + "time": "2023-06-14T16:51:17+00:00" + }, { "name": "instaclick/php-webdriver", "version": "1.4.16", @@ -5641,6 +5685,353 @@ }, "time": "2023-05-19T20:20:00+00:00" }, + { + "name": "open-telemetry/api", + "version": "0.0.17", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/api.git", + "reference": "7bd74c2de62922496e979decf2a02eeed8870399" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/7bd74c2de62922496e979decf2a02eeed8870399", + "reference": "7bd74c2de62922496e979decf2a02eeed8870399", + "shasum": "" + }, + "require": { + "open-telemetry/context": "self.version", + "open-telemetry/sem-conv": "self.version", + "php": "^7.4 || ^8.0", + "psr/log": "^1.1|^2.0|^3.0", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" + }, + "type": "library", + "autoload": { + "files": [ + "Trace/functions.php" + ], + "psr-4": { + "OpenTelemetry\\API\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "API for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "api", + "apm", + "logging", + "opentelemetry", + "otel", + "tracing" + ], + "support": { + "source": "https://github.com/opentelemetry-php/api/tree/0.0.17" + }, + "time": "2022-11-29T03:33:40+00:00" + }, + { + "name": "open-telemetry/context", + "version": "0.0.17", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/context.git", + "reference": "31814464bb54e62e39e79729bbe6b1fd82324897" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/31814464bb54e62e39e79729bbe6b1fd82324897", + "reference": "31814464bb54e62e39e79729bbe6b1fd82324897", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" + }, + "suggest": { + "ext-ffi": "To allow context switching in Fibers" + }, + "type": "library", + "autoload": { + "files": [ + "fiber/initialize_fiber_handler.php" + ], + "psr-4": { + "OpenTelemetry\\Context\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "Context implementation for OpenTelemetry PHP.", + "keywords": [ + "Context", + "opentelemetry", + "otel" + ], + "support": { + "source": "https://github.com/opentelemetry-php/context/tree/0.0.17" + }, + "time": "2022-11-25T20:26:34+00:00" + }, + { + "name": "open-telemetry/exporter-otlp", + "version": "0.0.17", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/exporter-otlp.git", + "reference": "678827bf3de4f2422431d9bac941e722908f2d37" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/678827bf3de4f2422431d9bac941e722908f2d37", + "reference": "678827bf3de4f2422431d9bac941e722908f2d37", + "shasum": "" + }, + "require": { + "open-telemetry/api": "self.version", + "open-telemetry/gen-otlp-protobuf": "self.version", + "open-telemetry/sdk": "self.version", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.14" + }, + "suggest": { + "php-http/async-client-implementation": "For otlp/http exporting", + "php-http/discovery": "For otlp/http exporting", + "psr/http-factory-implementation": "For otlp/http exporting" + }, + "type": "library", + "autoload": { + "files": [ + "_register.php" + ], + "psr-4": { + "OpenTelemetry\\Contrib\\Otlp\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "OTLP exporter for OpenTelemetry.", + "keywords": [ + "Metrics", + "exporter", + "gRPC", + "http", + "opentelemetry", + "otel", + "otlp", + "tracing" + ], + "support": { + "issues": "https://github.com/opentelemetry-php/exporter-otlp/issues", + "source": "https://github.com/opentelemetry-php/exporter-otlp/tree/0.0.17" + }, + "time": "2022-11-29T22:54:23+00:00" + }, + { + "name": "open-telemetry/gen-otlp-protobuf", + "version": "0.0.17", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/gen-otlp-protobuf.git", + "reference": "69d803b0a88117697571080bade840a11441681f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/69d803b0a88117697571080bade840a11441681f", + "reference": "69d803b0a88117697571080bade840a11441681f", + "shasum": "" + }, + "require": { + "google/protobuf": "^v3.3.0", + "php": "^7.4 || ^8.0" + }, + "suggest": { + "ext-grpc": "To use the gRPC based exporters", + "ext-protobuf": "For better performance, when dealing with the protobuf format" + }, + "type": "library", + "autoload": { + "psr-4": { + "Opentelemetry\\Proto\\": "Opentelemetry/Proto/", + "GPBMetadata\\Opentelemetry\\": "GPBMetadata/Opentelemetry/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "PHP protobuf files for communication with OpenTelemetry OTLP collectors/servers.", + "keywords": [ + "Metrics", + "apm", + "gRPC", + "logging", + "opentelemetry", + "otel", + "otlp", + "protobuf", + "tracing" + ], + "support": { + "source": "https://github.com/opentelemetry-php/gen-otlp-protobuf/tree/0.0.17" + }, + "time": "2022-09-06T12:51:24+00:00" + }, + { + "name": "open-telemetry/sdk", + "version": "0.0.17", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/sdk.git", + "reference": "38e07a6031f63efe2e353ec766bcf727ee4a0419" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/38e07a6031f63efe2e353ec766bcf727ee4a0419", + "reference": "38e07a6031f63efe2e353ec766bcf727ee4a0419", + "shasum": "" + }, + "require": { + "ext-json": "*", + "open-telemetry/api": "self.version", + "open-telemetry/context": "self.version", + "open-telemetry/sem-conv": "self.version", + "php": "^7.4 || ^8.0", + "php-http/async-client-implementation": "^1.0", + "php-http/discovery": "^1.14", + "psr/http-factory-implementation": "^1.0", + "psr/log": "^1.1|^2.0|^3.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" + }, + "suggest": { + "ext-gmp": "To support unlimited number of synchronous metric readers", + "ext-mbstring": "To increase performance of string operations" + }, + "type": "library", + "autoload": { + "files": [ + "Common/Util/functions.php", + "Metrics/MetricExporter/_register.php", + "Trace/SpanExporter/_register.php", + "_autoload.php" + ], + "psr-4": { + "OpenTelemetry\\SDK\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "SDK for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "apm", + "logging", + "opentelemetry", + "otel", + "sdk", + "tracing" + ], + "support": { + "source": "https://github.com/opentelemetry-php/sdk/tree/0.0.17" + }, + "time": "2022-12-02T18:31:42+00:00" + }, + { + "name": "open-telemetry/sem-conv", + "version": "0.0.17", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/sem-conv.git", + "reference": "c9c81fe00b1c184961b72808b8a12c7ca0ce375a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/c9c81fe00b1c184961b72808b8a12c7ca0ce375a", + "reference": "c9c81fe00b1c184961b72808b8a12c7ca0ce375a", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "OpenTelemetry\\SemConv\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "Semantic conventions for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "apm", + "logging", + "opentelemetry", + "otel", + "semantic conventions", + "semconv", + "tracing" + ], + "support": { + "source": "https://github.com/opentelemetry-php/sem-conv/tree/0.0.17" + }, + "time": "2022-09-06T12:51:24+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.3", @@ -5752,6 +6143,260 @@ }, "time": "2022-02-21T01:04:05+00:00" }, + { + "name": "php-http/discovery", + "version": "1.18.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/discovery.git", + "reference": "f258b3a1d16acb7b21f3b42d7a2494a733365237" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/discovery/zipball/f258b3a1d16acb7b21f3b42d7a2494a733365237", + "reference": "f258b3a1d16acb7b21f3b42d7a2494a733365237", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0|^2.0", + "php": "^7.1 || ^8.0" + }, + "conflict": { + "nyholm/psr7": "<1.0", + "zendframework/zend-diactoros": "*" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "*", + "psr/http-factory-implementation": "*", + "psr/http-message-implementation": "*" + }, + "require-dev": { + "composer/composer": "^1.0.2|^2.0", + "graham-campbell/phpspec-skip-example-extension": "^5.0", + "php-http/httplug": "^1.0 || ^2.0", + "php-http/message-factory": "^1.0", + "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", + "symfony/phpunit-bridge": "^6.2" + }, + "type": "composer-plugin", + "extra": { + "class": "Http\\Discovery\\Composer\\Plugin", + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Http\\Discovery\\": "src/" + }, + "exclude-from-classmap": [ + "src/Composer/Plugin.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", + "homepage": "http://php-http.org", + "keywords": [ + "adapter", + "client", + "discovery", + "factory", + "http", + "message", + "psr17", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/discovery/issues", + "source": "https://github.com/php-http/discovery/tree/1.18.1" + }, + "time": "2023-05-17T08:53:10+00:00" + }, + { + "name": "php-http/guzzle7-adapter", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/guzzle7-adapter.git", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^7.0", + "php": "^7.2 | ^8.0", + "php-http/httplug": "^2.0", + "psr/http-client": "^1.0" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.0|^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Adapter\\Guzzle7\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + } + ], + "description": "Guzzle 7 HTTP Adapter", + "homepage": "http://httplug.io", + "keywords": [ + "Guzzle", + "http" + ], + "support": { + "issues": "https://github.com/php-http/guzzle7-adapter/issues", + "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" + }, + "time": "2021-03-09T07:35:15+00:00" + }, + { + "name": "php-http/httplug", + "version": "2.4.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/httplug.git", + "reference": "625ad742c360c8ac580fcc647a1541d29e257f67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67", + "reference": "625ad742c360c8ac580fcc647a1541d29e257f67", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/promise": "^1.1", + "psr/http-client": "^1.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eric GELOEN", + "email": "geloen.eric@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "HTTPlug, the HTTP client abstraction for PHP", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http" + ], + "support": { + "issues": "https://github.com/php-http/httplug/issues", + "source": "https://github.com/php-http/httplug/tree/2.4.0" + }, + "time": "2023-04-14T15:10:03+00:00" + }, + { + "name": "php-http/promise", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/promise.git", + "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2", + "phpspec/phpspec": "^5.1.2 || ^6.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joel Wurtz", + "email": "joel.wurtz@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Promise used for asynchronous HTTP requests", + "homepage": "http://httplug.io", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/php-http/promise/issues", + "source": "https://github.com/php-http/promise/tree/1.1.0" + }, + "time": "2020-07-07T09:29:14+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -8474,6 +9119,85 @@ ], "time": "2023-05-30T09:01:24+00:00" }, + { + "name": "symfony/polyfill-php82", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php82.git", + "reference": "80ddf7bfa17ef7b06db4e6d007a95bf584e07b44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/80ddf7bfa17ef7b06db4e6d007a95bf584e07b44", + "reference": "80ddf7bfa17ef7b06db4e6d007a95bf584e07b44", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php82\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php82/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-10T10:10:54+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", @@ -8632,7 +9356,9 @@ "stability-flags": { "drupal/core": 20, "drupal/core-project-message": 20, - "drupal/core-vendor-hardening": 20 + "drupal/core-vendor-hardening": 20, + "open-telemetry/exporter-otlp": 10, + "open-telemetry/sdk": 10 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index e096b911ace1..d77ce11c2cc6 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -17,6 +17,9 @@ "justinrainbow/json-schema": "^5.2", "mglaman/phpstan-drupal": "^1.1.34", "mikey179/vfsstream": "^1.6.11", + "open-telemetry/exporter-otlp": "@beta", + "open-telemetry/sdk": "@beta", + "php-http/guzzle7-adapter": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.10.1", diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index e113b730d21b..30e003bc3fe6 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -22,14 +22,25 @@ "dealerdirect/phpcodesniffer-composer-installer": "v1.0.0", "doctrine/instantiator": "2.0.0", "drupal/coder": "8.3.18", + "google/protobuf": "v3.23.3", "instaclick/php-webdriver": "1.4.16", "justinrainbow/json-schema": "5.2.12", "mglaman/phpstan-drupal": "1.1.34", "mikey179/vfsstream": "v1.6.11", "myclabs/deep-copy": "1.11.1", "nikic/php-parser": "v4.15.5", + "open-telemetry/api": "0.0.17", + "open-telemetry/context": "0.0.17", + "open-telemetry/exporter-otlp": "0.0.17", + "open-telemetry/gen-otlp-protobuf": "0.0.17", + "open-telemetry/sdk": "0.0.17", + "open-telemetry/sem-conv": "0.0.17", "phar-io/manifest": "2.0.3", "phar-io/version": "3.2.1", + "php-http/discovery": "1.18.1", + "php-http/guzzle7-adapter": "1.0.0", + "php-http/httplug": "2.4.0", + "php-http/promise": "1.1.0", "phpdocumentor/reflection-common": "2.2.0", "phpdocumentor/reflection-docblock": "5.3.0", "phpdocumentor/type-resolver": "1.7.2", @@ -74,6 +85,7 @@ "symfony/finder": "v6.3.0", "symfony/lock": "v6.3.0", "symfony/phpunit-bridge": "v6.3.0", + "symfony/polyfill-php82": "v1.27.0", "theseer/tokenizer": "1.2.1", "webflo/drupal-finder": "1.2.2", "webmozart/assert": "1.11.0" diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt index ae412e0b2442..bc93d98426f8 100644 --- a/core/misc/cspell/dictionary.txt +++ b/core/misc/cspell/dictionary.txt @@ -239,6 +239,7 @@ contaynz contentblock contextuals controlgroup +conv corefake coretest corge @@ -527,6 +528,7 @@ htkey htmlcorrector httpheader httpkernel +httplug httponly huhuu hurlant @@ -840,6 +842,7 @@ optin optionchecker orgchart ossp +otlp otsikko outdent outro @@ -944,6 +947,7 @@ proname prophesize prophesized prophesizing +protobuf protossl proxied proxying