File phpMyFAQ-remove-OpenTelemetry.patch of Package phpMyFAQ
Index: phpMyFAQ/phpmyfaq/src/libs/composer/autoload_files.php
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/composer/autoload_files.php
+++ phpMyFAQ/phpmyfaq/src/libs/composer/autoload_files.php
@@ -12,10 +12,8 @@ return array(
'5897ea0ac4cccf14d323035e65887801' => $vendorDir . '/symfony/polyfill-php82/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
- '8e92226780215d0ec758aa7b73e0ede9' => $vendorDir . '/open-telemetry/context/fiber/initialize_fiber_handler.php',
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
- 'c7b4a5d8b94d270f0f9a84f81e1dd63d' => $vendorDir . '/open-telemetry/api/Trace/functions.php',
'667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
Index: phpMyFAQ/phpmyfaq/src/libs/composer/autoload_psr4.php
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/composer/autoload_psr4.php
+++ phpMyFAQ/phpmyfaq/src/libs/composer/autoload_psr4.php
@@ -50,8 +50,6 @@ return array(
'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
'PHPStan\\PhpDocParser\\' => array($vendorDir . '/phpstan/phpdoc-parser/src'),
'PDepend\\' => array($vendorDir . '/pdepend/pdepend/src/main/php/PDepend'),
- 'OpenTelemetry\\Context\\' => array($vendorDir . '/open-telemetry/context'),
- 'OpenTelemetry\\API\\' => array($vendorDir . '/open-telemetry/api'),
'OpenApi\\' => array($vendorDir . '/zircote/swagger-php/src'),
'Nette\\' => array($vendorDir . '/nette/utils/src'),
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
Index: phpMyFAQ/phpmyfaq/src/libs/composer/autoload_static.php
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/composer/autoload_static.php
+++ phpMyFAQ/phpmyfaq/src/libs/composer/autoload_static.php
@@ -13,10 +13,8 @@ class ComposerStaticInitf17f23f54ec4d34a
'5897ea0ac4cccf14d323035e65887801' => __DIR__ . '/..' . '/symfony/polyfill-php82/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
- '8e92226780215d0ec758aa7b73e0ede9' => __DIR__ . '/..' . '/open-telemetry/context/fiber/initialize_fiber_handler.php',
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
'662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
- 'c7b4a5d8b94d270f0f9a84f81e1dd63d' => __DIR__ . '/..' . '/open-telemetry/api/Trace/functions.php',
'667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
@@ -94,12 +92,6 @@ class ComposerStaticInitf17f23f54ec4d34a
'PHPStan\\PhpDocParser\\' => 21,
'PDepend\\' => 8,
),
- 'O' =>
- array (
- 'OpenTelemetry\\Context\\' => 22,
- 'OpenTelemetry\\API\\' => 18,
- 'OpenApi\\' => 8,
- ),
'N' =>
array (
'Nette\\' => 6,
@@ -334,14 +326,6 @@ class ComposerStaticInitf17f23f54ec4d34a
array (
0 => __DIR__ . '/..' . '/pdepend/pdepend/src/main/php/PDepend',
),
- 'OpenTelemetry\\Context\\' =>
- array (
- 0 => __DIR__ . '/..' . '/open-telemetry/context',
- ),
- 'OpenTelemetry\\API\\' =>
- array (
- 0 => __DIR__ . '/..' . '/open-telemetry/api',
- ),
'OpenApi\\' =>
array (
0 => __DIR__ . '/..' . '/zircote/swagger-php/src',
Index: phpMyFAQ/phpmyfaq/src/libs/composer/installed.json
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/composer/installed.json
+++ phpMyFAQ/phpmyfaq/src/libs/composer/installed.json
@@ -678,7 +678,6 @@
},
"require": {
"composer-runtime-api": "^2.0",
- "open-telemetry/api": "^1.0",
"php": "^7.4 || ^8.0",
"php-http/discovery": "^1.14",
"php-http/httplug": "^2.3",
@@ -689,7 +688,6 @@
},
"require-dev": {
"nyholm/psr7": "^1.5",
- "open-telemetry/sdk": "^1.0",
"php-http/mock-client": "^1.5",
"phpstan/phpstan": "^2.1",
"phpunit/phpunit": "^9.5",
@@ -2079,141 +2077,6 @@
"install-path": "../nikic/php-parser"
},
{
- "name": "open-telemetry/api",
- "version": "1.6.0",
- "version_normalized": "1.6.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/opentelemetry-php/api.git",
- "reference": "ee17d937652eca06c2341b6fadc0f74c1c1a5af2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/ee17d937652eca06c2341b6fadc0f74c1c1a5af2",
- "reference": "ee17d937652eca06c2341b6fadc0f74c1c1a5af2",
- "shasum": ""
- },
- "require": {
- "open-telemetry/context": "^1.4",
- "php": "^8.1",
- "psr/log": "^1.1|^2.0|^3.0",
- "symfony/polyfill-php82": "^1.26"
- },
- "conflict": {
- "open-telemetry/sdk": "<=1.0.8"
- },
- "time": "2025-09-19T00:05:49+00:00",
- "type": "library",
- "extra": {
- "spi": {
- "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [
- "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager"
- ]
- },
- "branch-alias": {
- "dev-main": "1.4.x-dev"
- }
- },
- "installation-source": "dist",
- "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": {
- "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V",
- "docs": "https://opentelemetry.io/docs/php",
- "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
- "source": "https://github.com/open-telemetry/opentelemetry-php"
- },
- "install-path": "../open-telemetry/api"
- },
- {
- "name": "open-telemetry/context",
- "version": "1.4.0",
- "version_normalized": "1.4.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/opentelemetry-php/context.git",
- "reference": "d4c4470b541ce72000d18c339cfee633e4c8e0cf"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/d4c4470b541ce72000d18c339cfee633e4c8e0cf",
- "reference": "d4c4470b541ce72000d18c339cfee633e4c8e0cf",
- "shasum": ""
- },
- "require": {
- "php": "^8.1",
- "symfony/polyfill-php82": "^1.26"
- },
- "suggest": {
- "ext-ffi": "To allow context switching in Fibers"
- },
- "time": "2025-09-19T00:05:49+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.0.x-dev"
- }
- },
- "installation-source": "dist",
- "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": {
- "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V",
- "docs": "https://opentelemetry.io/docs/php",
- "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
- "source": "https://github.com/open-telemetry/opentelemetry-php"
- },
- "install-path": "../open-telemetry/context"
- },
- {
"name": "paragonie/constant_time_encoding",
"version": "v3.1.1",
"version_normalized": "3.1.1.0",
Index: phpMyFAQ/phpmyfaq/src/libs/composer/installed.php
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/composer/installed.php
+++ phpMyFAQ/phpmyfaq/src/libs/composer/installed.php
@@ -253,24 +253,6 @@
'aliases' => array(),
'dev_requirement' => true,
),
- 'open-telemetry/api' => array(
- 'pretty_version' => '1.6.0',
- 'version' => '1.6.0.0',
- 'reference' => 'ee17d937652eca06c2341b6fadc0f74c1c1a5af2',
- 'type' => 'library',
- 'install_path' => __DIR__ . '/../open-telemetry/api',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
- 'open-telemetry/context' => array(
- 'pretty_version' => '1.4.0',
- 'version' => '1.4.0.0',
- 'reference' => 'd4c4470b541ce72000d18c339cfee633e4c8e0cf',
- 'type' => 'library',
- 'install_path' => __DIR__ . '/../open-telemetry/context',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
'paragonie/constant_time_encoding' => array(
'pretty_version' => 'v3.1.1',
'version' => '3.1.1.0',
Index: phpMyFAQ/phpmyfaq/src/libs/elastic/transport/composer.json
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/elastic/transport/composer.json
+++ phpMyFAQ/phpmyfaq/src/libs/elastic/transport/composer.json
@@ -19,15 +19,13 @@
"psr/log": "^1 || ^2 || ^3",
"php-http/discovery": "^1.14",
"php-http/httplug": "^2.3",
- "composer-runtime-api": "^2.0",
- "open-telemetry/api": "^1.0"
+ "composer-runtime-api": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpstan/phpstan": "^2.1",
"php-http/mock-client": "^1.5",
"nyholm/psr7": "^1.5",
- "open-telemetry/sdk": "^1.0",
"symfony/http-client": "^5.4"
},
"autoload": {
Index: phpMyFAQ/phpmyfaq/src/libs/elasticsearch/elasticsearch/CHANGELOG.md
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/elasticsearch/elasticsearch/CHANGELOG.md
+++ phpMyFAQ/phpmyfaq/src/libs/elasticsearch/elasticsearch/CHANGELOG.md
@@ -17,9 +17,7 @@
## Release 8.15.0
-Updated the APIs to Elasticsearch [8.15.0](https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-8.15.0.html) and added the support of OpenTelemetry.
-Read the elastic-transport-php [README](https://github.com/elastic/elastic-transport-php?tab=readme-ov-file#opentelemetry)
-for more information about OpenTelemetry support.
+Updated the APIs to Elasticsearch [8.15.0](https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-8.15.0.html).
## Release 8.14.0
Index: phpMyFAQ/phpmyfaq/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc
===================================================================
--- phpMyFAQ.orig/phpmyfaq/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc
+++ phpMyFAQ/phpmyfaq/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc
@@ -82,9 +82,6 @@
=== 8.15.0
* Updated the API endpoints to Elasticserach 8.15.0
-* Added the OpenTelemetry support, for more information
- you can refer to the https://github.com/elastic/elastic-transport-php?tab=readme-ov-file#opentelemetry[elastic-transport-php]
- documentation
[discrete]
[[rn-8-14-0]]
