File phpMyFAQ-remove-OpenTelemetry.patch of Package phpMyFAQ

Overview Repositories Revisions Requests Users Attributes Meta

File phpMyFAQ-remove-OpenTelemetry.patch of Package phpMyFAQ (Revision bff9fe24f49ad9006fe77560de1ef61e)

Currently displaying revision bff9fe24f49ad9006fe77560de1ef61e , Show latest

diff -Pdpru phpmyfaq.orig/src/libs/composer/autoload_files.php phpmyfaq/src/libs/composer/autoload_files.php
--- phpmyfaq.orig/src/libs/composer/autoload_files.php	2024-11-09 11:07:38.000000000 +0100
+++ phpmyfaq/src/libs/composer/autoload_files.php	2024-11-13 12:34:35.616490646 +0100
@@ -10,10 +10,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',
     '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
-    'c7b4a5d8b94d270f0f9a84f81e1dd63d' => $vendorDir . '/open-telemetry/api/Trace/functions.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     '662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
     '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
diff -Pdpru phpmyfaq.orig/src/libs/composer/autoload_psr4.php phpmyfaq/src/libs/composer/autoload_psr4.php
--- phpmyfaq.orig/src/libs/composer/autoload_psr4.php	2024-11-09 11:07:38.000000000 +0100
+++ phpmyfaq/src/libs/composer/autoload_psr4.php	2024-11-13 12:34:48.916133220 +0100
@@ -28,8 +28,6 @@ return array(
     'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
-    'OpenTelemetry\\Context\\' => array($vendorDir . '/open-telemetry/context'),
-    'OpenTelemetry\\API\\' => array($vendorDir . '/open-telemetry/api'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
     'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
     'League\\Uri\\' => array($vendorDir . '/league/uri-interfaces', $vendorDir . '/league/uri'),
diff -Pdpru phpmyfaq.orig/src/libs/composer/autoload_static.php phpmyfaq/src/libs/composer/autoload_static.php
--- phpmyfaq.orig/src/libs/composer/autoload_static.php	2024-11-09 11:07:38.000000000 +0100
+++ phpmyfaq/src/libs/composer/autoload_static.php	2024-11-13 12:38:34.366070530 +0100
@@ -11,10 +11,8 @@ class ComposerStaticInit169796f816590a49
         '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',
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
-        'c7b4a5d8b94d270f0f9a84f81e1dd63d' => __DIR__ . '/..' . '/open-telemetry/api/Trace/functions.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         '662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
@@ -56,11 +54,6 @@ class ComposerStaticInit169796f816590a49
             'Psr\\Container\\' => 14,
             'ParagonIE\\ConstantTime\\' => 23,
         ),
-        'O' => 
-        array (
-            'OpenTelemetry\\Context\\' => 22,
-            'OpenTelemetry\\API\\' => 18,
-        ),
         'M' => 
         array (
             'Monolog\\' => 8,
@@ -193,14 +186,6 @@ class ComposerStaticInit169796f816590a49
         array (
             0 => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src',
         ),
-        'OpenTelemetry\\Context\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/open-telemetry/context',
-        ),
-        'OpenTelemetry\\API\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/open-telemetry/api',
-        ),
         'Monolog\\' => 
         array (
             0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
diff -Pdpru phpmyfaq.orig/src/libs/composer/installed.json phpmyfaq/src/libs/composer/installed.json
--- phpmyfaq.orig/src/libs/composer/installed.json	2024-11-09 11:07:38.000000000 +0100
+++ phpmyfaq/src/libs/composer/installed.json	2024-11-13 12:36:27.077494644 +0100
@@ -311,7 +311,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",
@@ -322,7 +321,6 @@
             },
             "require-dev": {
                 "nyholm/psr7": "^1.5",
-                "open-telemetry/sdk": "^1.0",
                 "php-http/mock-client": "^1.5",
                 "phpstan/phpstan": "^1.4",
                 "phpunit/phpunit": "^9.5",
@@ -1275,141 +1273,6 @@
             "install-path": "../myclabs/deep-copy"
         },
         {
-            "name": "open-telemetry/api",
-            "version": "1.1.1",
-            "version_normalized": "1.1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opentelemetry-php/api.git",
-                "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/542064815d38a6df55af7957cd6f1d7d967c99c6",
-                "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6",
-                "shasum": ""
-            },
-            "require": {
-                "open-telemetry/context": "^1.0",
-                "php": "^8.1",
-                "psr/log": "^1.1|^2.0|^3.0",
-                "symfony/polyfill-php82": "^1.26"
-            },
-            "conflict": {
-                "open-telemetry/sdk": "<=1.0.8"
-            },
-            "time": "2024-10-15T22:42:37+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.1.x-dev"
-                },
-                "spi": {
-                    "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [
-                        "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager"
-                    ]
-                }
-            },
-            "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.1.0",
-            "version_normalized": "1.1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opentelemetry-php/context.git",
-                "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/0cba875ea1953435f78aec7f1d75afa87bdbf7f3",
-                "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1",
-                "symfony/polyfill-php82": "^1.26"
-            },
-            "suggest": {
-                "ext-ffi": "To allow context switching in Fibers"
-            },
-            "time": "2024-08-21T00:29:20+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.0.0",
             "version_normalized": "3.0.0.0",
diff -Pdpru phpmyfaq.orig/src/libs/composer/installed.php phpmyfaq/src/libs/composer/installed.php
--- phpmyfaq.orig/src/libs/composer/installed.php	2024-11-09 11:07:38.000000000 +0100
+++ phpmyfaq/src/libs/composer/installed.php	2024-11-13 12:36:49.704886410 +0100
@@ -154,24 +154,6 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
-        'open-telemetry/api' => array(
-            'pretty_version' => '1.1.1',
-            'version' => '1.1.1.0',
-            'reference' => '542064815d38a6df55af7957cd6f1d7d967c99c6',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../open-telemetry/api',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-        'open-telemetry/context' => array(
-            'pretty_version' => '1.1.0',
-            'version' => '1.1.0.0',
-            'reference' => '0cba875ea1953435f78aec7f1d75afa87bdbf7f3',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../open-telemetry/context',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
         'paragonie/constant_time_encoding' => array(
             'pretty_version' => 'v3.0.0',
             'version' => '3.0.0.0',
diff -Pdpru phpmyfaq.orig/src/libs/elastic/transport/composer.json phpmyfaq/src/libs/elastic/transport/composer.json
--- phpmyfaq.orig/src/libs/elastic/transport/composer.json	2024-08-14 10:55:07.000000000 +0200
+++ phpmyfaq/src/libs/elastic/transport/composer.json	2024-11-13 12:37:10.760320432 +0100
@@ -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": "^1.4",
         "php-http/mock-client": "^1.5",
         "nyholm/psr7": "^1.5",
-        "open-telemetry/sdk": "^1.0",
         "symfony/http-client": "^5.4"
     },
     "autoload": {
diff -Pdpru phpmyfaq.orig/src/libs/elasticsearch/elasticsearch/CHANGELOG.md phpmyfaq/src/libs/elasticsearch/elasticsearch/CHANGELOG.md
--- phpmyfaq.orig/src/libs/elasticsearch/elasticsearch/CHANGELOG.md	2024-08-14 16:32:50.000000000 +0200
+++ phpmyfaq/src/libs/elasticsearch/elasticsearch/CHANGELOG.md	2024-11-13 12:37:41.215500901 +0100
@@ -1,8 +1,6 @@
 ## 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
 
diff -Pdpru phpmyfaq.orig/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc phpmyfaq/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc
--- phpmyfaq.orig/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc	2024-08-14 16:32:50.000000000 +0200
+++ phpmyfaq/src/libs/elasticsearch/elasticsearch/docs/release-notes.asciidoc	2024-11-13 12:37:57.611059634 +0100
@@ -52,9 +52,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]]
Nur in phpmyfaq.orig/src/libs: open-telemetry.

Places

File phpMyFAQ-remove-OpenTelemetry.patch of Package phpMyFAQ (Revision bff9fe24f49ad9006fe77560de1ef61e)

Places