From 24af6ac173f6fdbdd973f777d322b2ee8e6a9c7b Mon Sep 17 00:00:00 2001 From: Piotr Antosik Date: Sun, 5 Feb 2023 11:59:01 +0100 Subject: [PATCH] fix PHP 7.4 preload error (#919) --- src/SDK/Common/Dev/Compatibility/BC/AbstractClock.php | 4 +++- src/SDK/Common/Dev/Compatibility/BC/ClockInterface.php | 4 +++- .../Dev/Compatibility/BC/InstrumentationLibrary.php | 4 +++- .../Compatibility/BC/InstrumentationLibraryInterface.php | 4 +++- src/SDK/Common/Dev/Compatibility/BC/LoggerHolder.php | 4 +++- src/SDK/Common/Dev/Compatibility/BC/OtlpExporter.php | 8 +++++--- src/SDK/Common/Dev/Compatibility/BC/SystemClock.php | 4 +++- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/SDK/Common/Dev/Compatibility/BC/AbstractClock.php b/src/SDK/Common/Dev/Compatibility/BC/AbstractClock.php index 185b8c61..729420bb 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/AbstractClock.php +++ b/src/SDK/Common/Dev/Compatibility/BC/AbstractClock.php @@ -74,4 +74,6 @@ abstract class AbstractClock implements ClockInterface * BC class alias * @todo: remove in future release. Also in composer.json autoload/files. */ -class_alias(AbstractClock::class, 'OpenTelemetry\SDK\AbstractClock'); +if (!class_exists('OpenTelemetry\SDK\AbstractClock', false)) { + class_alias(AbstractClock::class, 'OpenTelemetry\SDK\AbstractClock'); +} diff --git a/src/SDK/Common/Dev/Compatibility/BC/ClockInterface.php b/src/SDK/Common/Dev/Compatibility/BC/ClockInterface.php index f2e540ad..85936faf 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/ClockInterface.php +++ b/src/SDK/Common/Dev/Compatibility/BC/ClockInterface.php @@ -13,7 +13,9 @@ interface ClockInterface extends Moved /** * @codeCoverageIgnoreStart */ -class_alias(ClockInterface::class, 'OpenTelemetry\SDK\ClockInterface'); +if (!interface_exists('OpenTelemetry\SDK\ClockInterface', false)) { + class_alias(ClockInterface::class, 'OpenTelemetry\SDK\ClockInterface'); +} /** * @codeCoverageIgnoreEnd */ diff --git a/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibrary.php b/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibrary.php index c3eebf92..8c657765 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibrary.php +++ b/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibrary.php @@ -49,7 +49,9 @@ final class InstrumentationLibrary implements InstrumentationLibraryInterface } } -class_alias(InstrumentationLibrary::class, OpenTelemetry_SDK_InstrumentationLibrary); +if (!class_exists(OpenTelemetry_SDK_InstrumentationLibrary, false)) { + class_alias(InstrumentationLibrary::class, OpenTelemetry_SDK_InstrumentationLibrary); +} /** * @codeCoverageIgnoreEnd */ diff --git a/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibraryInterface.php b/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibraryInterface.php index b7da1080..d6d78d3e 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibraryInterface.php +++ b/src/SDK/Common/Dev/Compatibility/BC/InstrumentationLibraryInterface.php @@ -13,7 +13,9 @@ interface InstrumentationLibraryInterface extends Moved /** * @codeCoverageIgnoreStart */ -class_alias(InstrumentationLibraryInterface::class, 'OpenTelemetry\SDK\Common\Instrumentation\InstrumentationLibraryInterface'); +if (!interface_exists('OpenTelemetry\SDK\Common\Instrumentation\InstrumentationLibraryInterface', false)) { + class_alias(InstrumentationLibraryInterface::class, 'OpenTelemetry\SDK\Common\Instrumentation\InstrumentationLibraryInterface'); +} /** * @codeCoverageIgnoreEnd */ diff --git a/src/SDK/Common/Dev/Compatibility/BC/LoggerHolder.php b/src/SDK/Common/Dev/Compatibility/BC/LoggerHolder.php index 57d87b21..cd6dc5d5 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/LoggerHolder.php +++ b/src/SDK/Common/Dev/Compatibility/BC/LoggerHolder.php @@ -25,7 +25,9 @@ final class LoggerHolder } } -class_alias(LoggerHolder::class, OpenTelemetry_SDK_Common_Log_LoggerHolder); +if (!class_exists(OpenTelemetry_SDK_Common_Log_LoggerHolder, false)) { + class_alias(LoggerHolder::class, OpenTelemetry_SDK_Common_Log_LoggerHolder); +} /** * @codeCoverageIgnoreEnd */ diff --git a/src/SDK/Common/Dev/Compatibility/BC/OtlpExporter.php b/src/SDK/Common/Dev/Compatibility/BC/OtlpExporter.php index 07ec0e9a..b2ce4ac4 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/OtlpExporter.php +++ b/src/SDK/Common/Dev/Compatibility/BC/OtlpExporter.php @@ -46,6 +46,8 @@ class OtlpExporter implements SpanExporterInterface } } -class_alias(OtlpExporter::class, 'OpenTelemetry\Contrib\OtlpGrpc\Exporter'); -class_alias(OtlpExporter::class, 'OpenTelemetry\Contrib\OtlpHttp\Exporter'); -class_alias(OtlpExporter::class, 'OpenTelemetry\Contrib\Otlp\Exporter'); +if (!class_exists('OpenTelemetry\Contrib\Otlp\Exporter', false)) { + class_alias(OtlpExporter::class, 'OpenTelemetry\Contrib\OtlpGrpc\Exporter'); + class_alias(OtlpExporter::class, 'OpenTelemetry\Contrib\OtlpHttp\Exporter'); + class_alias(OtlpExporter::class, 'OpenTelemetry\Contrib\Otlp\Exporter'); +} diff --git a/src/SDK/Common/Dev/Compatibility/BC/SystemClock.php b/src/SDK/Common/Dev/Compatibility/BC/SystemClock.php index a420346b..8c162f13 100644 --- a/src/SDK/Common/Dev/Compatibility/BC/SystemClock.php +++ b/src/SDK/Common/Dev/Compatibility/BC/SystemClock.php @@ -41,7 +41,9 @@ class SystemClock implements ClockInterface } } -class_alias(SystemClock::class, OpenTelemetry_SDK_SystemClock); +if (!class_exists(OpenTelemetry_SDK_SystemClock, false)) { + class_alias(SystemClock::class, OpenTelemetry_SDK_SystemClock); +} /** * @codeCoverageIgnoreEnd */