moving api/common classes up to api (#1033)

- apply TC review feedback to move Globals to top-level.
it was suggested to move Instrumentation into its own package, but I chose instead to just move that dir
up to the top level of API
- added a BC layer to alias the moved classes
- added some more examples

examples/autoload_sdk.php

@@ -20,7 +20,7 @@ echo 'autoloading SDK example starting...' . PHP_EOL;
 // Composer autoloader will execute SDK/_autoload.php which will register global instrumentation from environment configuration
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$instrumentation = new \OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation('demo');
+$instrumentation = new \OpenTelemetry\API\Instrumentation\CachedInstrumentation('demo');
 
 $instrumentation->tracer()->spanBuilder('root')->startSpan()->end();
 $instrumentation->meter()->createCounter('cnt')->add(1);

examples/autoload_sdk_with_custom_transport.php

@@ -48,7 +48,7 @@ $factory = new class() implements \OpenTelemetry\SDK\Common\Export\TransportFact
 
 \OpenTelemetry\SDK\Registry::registerTransportFactory('grpc', $factory, true);
 
-$instrumentation = new \OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation('demo');
+$instrumentation = new \OpenTelemetry\API\Instrumentation\CachedInstrumentation('demo');
 
 $instrumentation->tracer()->spanBuilder('root')->startSpan()->end();
 $instrumentation->meter()->createCounter('cnt')->add(1);

examples/logs/exporters/otlp_grpc.php

@@ -6,10 +6,10 @@ namespace OpenTelemetry\Example;
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Logs\EventLogger;
 use OpenTelemetry\API\Logs\LogRecord;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\Contrib\Grpc\GrpcTransportFactory;
 use OpenTelemetry\Contrib\Otlp\LogsExporter;
 use OpenTelemetry\Contrib\Otlp\OtlpUtil;

examples/logs/exporters/otlp_http.php

@@ -6,7 +6,7 @@ namespace OpenTelemetry\Example;
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Logs\EventLogger;
 use OpenTelemetry\API\Logs\LogRecord;
 use OpenTelemetry\Contrib\Otlp\LogsExporter;

examples/logs/features/monolog-otel-integration.php

@@ -7,7 +7,7 @@ namespace OpenTelemetry\Example;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Logs\Bridge;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;

examples/logs/logger_builder.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use OpenTelemetry\API\Logs\EventLogger;
+use OpenTelemetry\API\Logs\LogRecord;
+use OpenTelemetry\SDK\Common\Attribute\Attributes;
+use OpenTelemetry\SDK\Logs\Exporter\ConsoleExporterFactory;
+use OpenTelemetry\SDK\Logs\LoggerProvider;
+use OpenTelemetry\SDK\Logs\Processor\SimpleLogsProcessor;
+use OpenTelemetry\SDK\Resource\ResourceInfo;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$loggerProvider = LoggerProvider::builder()
+    ->addLogRecordProcessor(
+        new SimpleLogsProcessor(
+            (new ConsoleExporterFactory())->create()
+        )
+    )
+    ->setResource(ResourceInfo::create(Attributes::create(['foo' => 'bar'])))
+    ->build();
+
+$logger = $loggerProvider->getLogger('demo', '1.0', 'http://schema.url', ['foo' => 'bar']);
+$eventLogger = new EventLogger($logger, 'my-domain');
+
+$record = (new LogRecord(['foo' => 'bar', 'baz' => 'bat', 'msg' => 'hello world']))
+    ->setSeverityText('INFO')
+    ->setSeverityNumber(9);
+
+$eventLogger->logEvent('foo', $record);
+$loggerProvider->shutdown();

examples/metrics/exporters/otlp_grpc.php

@@ -6,14 +6,14 @@ namespace OpenTelemetry\Example;
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\Contrib\Grpc\GrpcTransportFactory;
 use OpenTelemetry\Contrib\Otlp\MetricExporter;
 use OpenTelemetry\Contrib\Otlp\OtlpUtil;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
 use OpenTelemetry\SDK\Metrics\MetricReader\ExportingReader;
 
-\OpenTelemetry\API\Common\Log\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
+\OpenTelemetry\API\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
 
 $clock = ClockFactory::getDefault();
 

examples/metrics/metrics_builder.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+use OpenTelemetry\Contrib\Otlp\MetricExporter;
+use OpenTelemetry\SDK\Common\Export\Stream\StreamTransportFactory;
+use OpenTelemetry\SDK\Metrics\MeterProvider;
+use OpenTelemetry\SDK\Metrics\MetricReader\ExportingReader;
+
+/**
+ * @psalm-suppress InternalMethod
+ */
+$reader = new ExportingReader(new MetricExporter((new StreamTransportFactory())->create(STDOUT, 'application/x-ndjson'), /*Temporality::CUMULATIVE*/));
+
+$meterProvider = MeterProvider::builder()
+    ->addReader($reader)
+    ->build();
+
+$histogram = $meterProvider->getMeter('io.opentelemetry.contrib.php')->createHistogram('demo');
+
+$histogram->record(50);
+$histogram->record(7);
+$reader->collect();
+
+$meterProvider->shutdown();

examples/sdk_builder.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\Contrib\Otlp\MetricExporter;
 use OpenTelemetry\SDK\Common\Export\Http\PsrTransportFactory;

examples/traces/exporters/otlp_file.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\Example;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+use OpenTelemetry\API\LoggerHolder;
+use OpenTelemetry\Contrib\Otlp\ContentTypes;
+use OpenTelemetry\Contrib\Otlp\SpanExporter;
+use OpenTelemetry\SDK\Common\Export\Stream\StreamTransportFactory;
+use OpenTelemetry\SDK\Common\Time\ClockFactory;
+use OpenTelemetry\SDK\Trace\SpanProcessor\BatchSpanProcessor;
+use OpenTelemetry\SDK\Trace\TracerProvider;
+
+LoggerHolder::set(new Logger('otlp-example', [new StreamHandler('php://stderr')]));
+
+$filename = sys_get_temp_dir() . '/traces.jsonl';
+$file = fopen($filename, 'a');
+$transport = (new StreamTransportFactory())->create($file, ContentTypes::NDJSON);
+$exporter = new SpanExporter($transport);
+
+echo 'Starting OTLP example';
+
+$tracerProvider =  new TracerProvider(
+    new BatchSpanProcessor(
+        $exporter,
+        ClockFactory::getDefault()
+    )
+);
+$tracer = $tracerProvider->getTracer('io.opentelemetry.contrib.php');
+
+$root = $span = $tracer->spanBuilder('root')->startSpan();
+$scope = $span->activate();
+
+for ($i = 0; $i < 3; $i++) {
+    // start a span, register some events
+    $span = $tracer->spanBuilder('loop-' . $i)->startSpan();
+
+    $span->setAttribute('remote_ip', '1.2.3.4')
+        ->setAttribute('country', 'USA');
+
+    $span->addEvent('found_login' . $i, [
+        'id' => $i,
+        'username' => 'otuser' . $i,
+    ]);
+    $span->addEvent('generated_session', [
+        'id' => md5((string) microtime(true)),
+    ]);
+
+    $span->end();
+}
+$root->end();
+$scope->detach();
+echo PHP_EOL . 'OTLP example complete!  Traces written to: ' . $filename;
+
+echo PHP_EOL;
+$tracerProvider->shutdown();

examples/traces/exporters/otlp_grpc.php

@@ -6,14 +6,14 @@ namespace OpenTelemetry\Example;
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\Contrib\Grpc\GrpcTransportFactory;
 use OpenTelemetry\Contrib\Otlp\OtlpUtil;
 use OpenTelemetry\Contrib\Otlp\SpanExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
 use OpenTelemetry\SDK\Trace\TracerProvider;
 
-\OpenTelemetry\API\Common\Log\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
+\OpenTelemetry\API\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
 
 $transport = (new GrpcTransportFactory())->create('http://collector:4317' . OtlpUtil::method(Signals::TRACE));
 $exporter = new SpanExporter($transport);

examples/traces/exporters/otlp_grpc_from_factory.php

@@ -8,7 +8,7 @@ use OpenTelemetry\SDK\Trace\TracerProviderFactory;
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-\OpenTelemetry\API\Common\Log\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
+\OpenTelemetry\API\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
 
 /**
  * Create an otlp+grpc tracer provider from TracerProviderFactory, using environment variables as input

examples/traces/exporters/otlp_http.php

@@ -8,7 +8,7 @@ require __DIR__ . '/../../../vendor/autoload.php';
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\Contrib\Otlp\OtlpHttpTransportFactory;
 use OpenTelemetry\Contrib\Otlp\SpanExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;

examples/traces/exporters/otlp_http_from_factory.php

@@ -6,7 +6,7 @@ namespace OpenTelemetry\Example;
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-\OpenTelemetry\API\Common\Log\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
+\OpenTelemetry\API\LoggerHolder::set(new \Monolog\Logger('grpc', [new \Monolog\Handler\StreamHandler('php://stderr')]));
 
 /**
  * Create an otlp+http/protobuf tracer provider from TracerProviderFactory, using environment variables as input

examples/traces/exporters/otlp_http_json.php

@@ -8,7 +8,7 @@ require __DIR__ . '/../../../vendor/autoload.php';
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\Contrib\Otlp\OtlpHttpTransportFactory;
 use OpenTelemetry\Contrib\Otlp\SpanExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;

examples/traces/troubleshooting/setting_up_logging.php

@@ -8,7 +8,7 @@ require __DIR__ . '/../../../vendor/autoload.php';
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\SDK\Trace\TracerProviderFactory;
 use Psr\Log\LogLevel;
 

rector.php

@@ -25,5 +25,8 @@ return static function (RectorConfig $rectorConfig): void {
             __DIR__ . '/src/SDK/SdkAutoloader.php',
         ],
         FlipTypeControlToUseExclusiveTypeRector::class,
+        \Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector::class,
+        \Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector::class,
+        \Rector\RemovingStatic\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector::class,
     ]);
 };

src/API/Behavior/LogsMessagesTrait.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\API\Behavior;
 
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use Psr\Log\LogLevel;
 
 trait LogsMessagesTrait

src/API/Globals.php

@@ -2,11 +2,13 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Instrumentation;
+namespace OpenTelemetry\API;
 
 use function assert;
 use Closure;
 use const E_USER_WARNING;
+use OpenTelemetry\API\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\ContextKeys;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;
 use OpenTelemetry\API\Trace\TracerProviderInterface;
@@ -21,7 +23,7 @@ use function trigger_error;
  */
 final class Globals
 {
-    /** @var list<Closure(Configurator): Configurator> */
+    /** @var Closure[] */
     private static array $initializers = [];
     private static ?self $globals = null;
 

src/API/Instrumentation/CachedInstrumentation.php

@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Instrumentation;
+namespace OpenTelemetry\API\Instrumentation;
 
 use ArrayAccess;
 use function assert;
 use function class_exists;
+use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;

src/API/Instrumentation/Configurator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Instrumentation;
+namespace OpenTelemetry\API\Instrumentation;
 
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Logs\NoopLoggerProvider;

src/API/Instrumentation/ContextKeys.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Instrumentation;
+namespace OpenTelemetry\API\Instrumentation;
 
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;

src/API/Instrumentation/InstrumentationInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Instrumentation;
+namespace OpenTelemetry\API\Instrumentation;
 
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;

src/API/Instrumentation/InstrumentationTrait.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Instrumentation;
+namespace OpenTelemetry\API\Instrumentation;
 
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;

src/API/LoggerHolder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Log;
+namespace OpenTelemetry\API;
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;

src/API/Signals.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\API\Common\Signal;
+namespace OpenTelemetry\API;
 
 use InvalidArgumentException;
 

src/Contrib/Otlp/LogsExporterFactory.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Contrib\Otlp;
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\SDK\Common\Configuration\Configuration;
 use OpenTelemetry\SDK\Common\Configuration\Defaults;
 use OpenTelemetry\SDK\Common\Configuration\Variables;

src/Contrib/Otlp/MetricExporterFactory.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Contrib\Otlp;
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\SDK\Common\Configuration\Configuration;
 use OpenTelemetry\SDK\Common\Configuration\Defaults;
 use OpenTelemetry\SDK\Common\Configuration\Variables;

src/Contrib/Otlp/OtlpUtil.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Contrib\Otlp;
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\SDK\Resource\Detectors\Sdk;
 use OpenTelemetry\SemConv\ResourceAttributes;
 use UnexpectedValueException;

src/Contrib/Otlp/SpanExporterFactory.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OpenTelemetry\Contrib\Otlp;
 
 use OpenTelemetry\API\Behavior\LogsMessagesTrait;
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\SDK\Common\Configuration\Configuration;
 use OpenTelemetry\SDK\Common\Configuration\Defaults;
 use OpenTelemetry\SDK\Common\Configuration\Variables;

src/SDK/Common/Dev/Compatibility/BC/ApiCommon.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\SDK\Common\Dev\Compatibility\BC;
+
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\ContextKeys;
+use OpenTelemetry\API\Instrumentation\InstrumentationInterface;
+use OpenTelemetry\API\Instrumentation\InstrumentationTrait;
+use OpenTelemetry\API\LoggerHolder;
+use OpenTelemetry\API\Signals;
+
+/**
+ * @codeCoverageIgnoreStart
+ */
+const OpenTelemetry_API_Common_Instrumentation_CachedInstrumentation = 'OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation.php';
+const OpenTelemetry_API_Common_Instrumentation_Configurator = 'OpenTelemetry\API\Common\Instrumentation\Configurator.php';
+const OpenTelemetry_API_Common_Instrumentation_ContextKeys = 'OpenTelemetry\API\Common\Instrumentation\ContextKeys.php';
+const OpenTelemetry_API_Common_Instrumentation_Globals = 'OpenTelemetry\API\Common\Instrumentation\Globals.php';
+const OpenTelemetry_API_Common_Instrumentation_InstrumentationInterface = 'OpenTelemetry\API\Common\Instrumentation\InstrumentationInterface.php';
+const OpenTelemetry_API_Common_Instrumentation_InstrumentationTrait = 'OpenTelemetry\API\Common\Instrumentation\InstrumentationTrait.php';
+const OpenTelemetry_API_Common_Log_LoggerHolder = 'OpenTelemetry\API\LoggerHolder.php';
+const OpenTelemetry_API_Common_Signal_Signals = 'OpenTelemetry\API\Common\Signal\Signals.php';
+
+const MAP = [
+    OpenTelemetry_API_Common_Instrumentation_CachedInstrumentation => CachedInstrumentation::class,
+    OpenTelemetry_API_Common_Instrumentation_Configurator => Configurator::class,
+    OpenTelemetry_API_Common_Instrumentation_ContextKeys => ContextKeys::class,
+    OpenTelemetry_API_Common_Instrumentation_Globals => Globals::class,
+    OpenTelemetry_API_Common_Instrumentation_InstrumentationInterface => InstrumentationInterface::class,
+    OpenTelemetry_API_Common_Instrumentation_InstrumentationTrait => InstrumentationTrait::class,
+    OpenTelemetry_API_Common_Log_LoggerHolder => LoggerHolder::class,
+    OpenTelemetry_API_Common_Signal_Signals => Signals::class,
+];
+
+foreach (MAP as $old => $new) {
+    if (!class_exists($old, false)) {
+        class_alias($new, $old);
+    }
+}
+
+/**
+ * @codeCoverageIgnoreEnd
+ */

src/SDK/Common/Dev/Compatibility/BC/LoggerHolder.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenTelemetry\SDK\Common\Dev\Compatibility\BC;
-
-use OpenTelemetry\API\Common\Log\LoggerHolder as Moved;
-use OpenTelemetry\SDK\Common\Dev\Compatibility\Util;
-use Psr\Log\LoggerInterface;
-
-/**
- * @codeCoverageIgnoreStart
- */
-const OpenTelemetry_SDK_Common_Log_LoggerHolder = 'OpenTelemetry\SDK\Common\Log\LoggerHolder';
-
-final class LoggerHolder
-{
-    public static function set(LoggerInterface $logger): void
-    {
-        Moved::set($logger);
-        Util::triggerClassDeprecationNotice(
-            OpenTelemetry_SDK_Common_Log_LoggerHolder,
-            Moved::class
-        );
-    }
-}
-
-if (!class_exists(OpenTelemetry_SDK_Common_Log_LoggerHolder, false)) {
-    class_alias(LoggerHolder::class, OpenTelemetry_SDK_Common_Log_LoggerHolder);
-}
-/**
- * @codeCoverageIgnoreEnd
- */

src/SDK/Common/Dev/Compatibility/_load.php

@@ -3,4 +3,4 @@
 declare(strict_types=1);
 
 require_once __DIR__ . '/BC/OtlpExporter.php';
-require_once __DIR__ . '/BC/LoggerHolder.php';
+require_once __DIR__ . '/BC/ApiCommon.php';

src/SDK/Common/Otlp/HttpEndpointResolver.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OpenTelemetry\SDK\Common\Otlp;
 
 use InvalidArgumentException;
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\SDK\Common\Adapter\HttpDiscovery\MessageFactoryResolver;
 use OpenTelemetry\SDK\Common\Http\Psr\Message\FactoryResolverInterface;
 use Psr\Http\Message\UriInterface;

src/SDK/Common/Otlp/HttpEndpointResolverInterface.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\SDK\Common\Otlp;
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use Psr\Http\Message\UriInterface;
 
 interface HttpEndpointResolverInterface

src/SDK/README.md

@@ -25,8 +25,8 @@ SDK autoloading will be attempted as part of composer's autoloader:
 ```php
 require 'vendor/autoload.php';
 
-$tracer = OpenTelemetry\API\Common\Instrumentation\Globals::tracerProvider()->getTracer('example');
-$meter = OpenTelemetry\API\Common\Instrumentation\Globals::meterProvider()->getMeter('example');
+$tracer = \OpenTelemetry\API\Globals::tracerProvider()->getTracer('example');
+$meter = \OpenTelemetry\API\Globals::meterProvider()->getMeter('example');
 ```
 
 If autoloading was not successful (or partially successful), no-op implementations of the above may be returned.

src/SDK/SdkAutoloader.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace OpenTelemetry\SDK;
 
 use InvalidArgumentException;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\SDK\Common\Configuration\Configuration;
 use OpenTelemetry\SDK\Common\Configuration\Variables;
 use OpenTelemetry\SDK\Common\Util\ShutdownHandler;

src/SDK/SdkBuilder.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\SDK;
 
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\Propagation\NoopTextMapPropagator;
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;

tests/Unit/API/Behavior/LogsMessagesTraitTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OpenTelemetry\Tests\Unit\API\Behavior;
 
 use OpenTelemetry\API\Behavior\LogsMessagesTrait;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use PHPUnit\Framework\Exception as PHPUnitFrameworkException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;

tests/Unit/API/Instrumentation/InstrumentationTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Tests\Unit\API\Common\Instrumentation;
+namespace OpenTelemetry\Tests\Unit\API\Instrumentation;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\API\Logs\LoggerProviderInterface;
 use OpenTelemetry\API\Logs\NoopLoggerProvider;
 use OpenTelemetry\API\Metrics\MeterInterface;
@@ -22,10 +22,10 @@ use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \OpenTelemetry\API\Common\Instrumentation\Globals
- * @covers \OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation
- * @covers \OpenTelemetry\API\Common\Instrumentation\Configurator
- * @covers \OpenTelemetry\API\Common\Instrumentation\ContextKeys
+ * @covers \OpenTelemetry\API\Globals
+ * @covers \OpenTelemetry\API\Instrumentation\CachedInstrumentation
+ * @covers \OpenTelemetry\API\Instrumentation\Configurator
+ * @covers \OpenTelemetry\API\Instrumentation\ContextKeys
  */
 final class InstrumentationTest extends TestCase
 {

tests/Unit/API/Instrumentation/InstrumentationTraitTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Tests\Unit\API\Common\Instrumentation;
+namespace OpenTelemetry\Tests\Unit\API\Instrumentation;
 
-use OpenTelemetry\API\Common\Instrumentation\InstrumentationInterface;
-use OpenTelemetry\API\Common\Instrumentation\InstrumentationTrait;
+use OpenTelemetry\API\Instrumentation\InstrumentationInterface;
+use OpenTelemetry\API\Instrumentation\InstrumentationTrait;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Metrics\MeterProviderInterface;
 use OpenTelemetry\API\Metrics\Noop\NoopMeter;
@@ -20,7 +20,7 @@ use Psr\Log\NullLogger;
 use RuntimeException;
 
 /**
- * @covers \OpenTelemetry\API\Common\Instrumentation\InstrumentationTrait
+ * @covers \OpenTelemetry\API\Instrumentation\InstrumentationTrait
  */
 class InstrumentationTraitTest extends TestCase
 {
@@ -116,12 +116,12 @@ class InstrumentationTraitTest extends TestCase
 
     private function createValidImplementation(): InstrumentationInterface
     {
-        return new ValidInstrumentation();
+        return new \OpenTelemetry\Tests\Unit\API\Instrumentation\ValidInstrumentation();
     }
 
     private function createInvalidImplementation(): object
     {
-        return new InvalidInstrumentation();
+        return new \OpenTelemetry\Tests\Unit\API\Instrumentation\InvalidInstrumentation();
     }
 }
 

tests/Unit/API/LoggerHolderTest.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Tests\Unit\API\Common\Log;
+namespace OpenTelemetry\Tests\Unit\API;
 
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 /**
- * @covers \OpenTelemetry\API\Common\Log\LoggerHolder
+ * @covers \OpenTelemetry\API\LoggerHolder
  */
 class LoggerHolderTest extends TestCase
 {

tests/Unit/API/Trace/Propagation/TraceContextPropagatorTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Tests\Unit\API\Trace\Propagation;
 
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;

tests/Unit/API/Trace/TraceStateTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Tests\API\Unit\Trace;
 
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\TraceState;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;

tests/Unit/Contrib/Otlp/OtlpUtilTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Tests\Unit\Contrib\Otlp;
 
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\Contrib\Otlp\OtlpUtil;
 use PHPUnit\Framework\TestCase;
 

tests/Unit/SDK/Common/Otlp/HttpEndpointResolverTest.php

@@ -6,7 +6,7 @@ namespace OpenTelemetry\Tests\Unit\SDK\Common\Otlp;
 
 use Generator;
 use InvalidArgumentException;
-use OpenTelemetry\API\Common\Signal\Signals;
+use OpenTelemetry\API\Signals;
 use OpenTelemetry\SDK\Common\Otlp\HttpEndpointResolver;
 use OpenTelemetry\SDK\Common\Otlp\HttpEndpointResolverInterface;
 use PHPUnit\Framework\TestCase;

tests/Unit/SDK/Logs/Processor/BatchLogsProcessorTest.php

@@ -8,7 +8,7 @@ use InvalidArgumentException;
 use LogicException;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Common\Future\CompletedFuture;

tests/Unit/SDK/Metrics/MeterProviderFactoryTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OpenTelemetry\Tests\Unit\SDK\Metrics;
 
 use AssertWell\PHPUnitGlobalState\EnvironmentVariables;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\SDK\Common\Configuration\KnownValues;
 use OpenTelemetry\SDK\Common\Configuration\Variables;

tests/Unit/SDK/Propagation/PropagatorFactoryTest.php

@@ -6,7 +6,7 @@ namespace OpenTelemetry\Tests\Unit\SDK\Propagation;
 
 use AssertWell\PHPUnitGlobalState\EnvironmentVariables;
 use OpenTelemetry\API\Baggage\Propagation\BaggagePropagator;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\Context\Propagation\MultiTextMapPropagator;
 use OpenTelemetry\Context\Propagation\NoopTextMapPropagator;

tests/Unit/SDK/Resource/ResourceInfoFactoryTest.php

@@ -6,7 +6,7 @@ namespace OpenTelemetry\Tests\Unit\SDK\Resource;
 
 use AssertWell\PHPUnitGlobalState\EnvironmentVariables;
 use InvalidArgumentException;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Registry;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;

tests/Unit/SDK/Resource/ResourceInfoTest.php

@@ -7,7 +7,7 @@ namespace OpenTelemetry\Tests\Unit\SDK\Resource;
 use AssertWell\PHPUnitGlobalState\EnvironmentVariables;
 use Composer\InstalledVersions;
 use Generator;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\Detectors;
 use OpenTelemetry\SDK\Resource\ResourceInfo;

tests/Unit/SDK/SdkAutoloaderTest.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace OpenTelemetry\Tests\Unit\SDK;
 
 use AssertWell\PHPUnitGlobalState\EnvironmentVariables;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Logs\NoopLoggerProvider;
 use OpenTelemetry\API\Metrics\Noop\NoopMeterProvider;
 use OpenTelemetry\API\Trace\NoopTracerProvider;

tests/Unit/SDK/SdkBuilderTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace OpenTelemetry\Tests\Unit\SDK;
 
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use OpenTelemetry\SDK\Metrics\MeterProviderInterface;
 use OpenTelemetry\SDK\SdkBuilder;

tests/Unit/SDK/Trace/SpanExporter/AbstractExporterTest.php

@@ -6,7 +6,7 @@ namespace OpenTelemetry\Tests\Unit\SDK\Trace\SpanExporter;
 
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\SDK\Common\Export\TransportInterface;
 use OpenTelemetry\SDK\Common\Future\CompletedFuture;
 use OpenTelemetry\SDK\Common\Future\ErrorFuture;

tests/Unit/SDK/Trace/SpanProcessor/BatchSpanProcessorTest.php

@@ -9,7 +9,7 @@ use InvalidArgumentException;
 use LogicException;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace as API;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;

tests/Unit/SDK/Trace/SpanProcessor/SimpleSpanProcessorTest.php

@@ -8,7 +8,7 @@ use LogicException;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\MockInterface;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;
 use OpenTelemetry\API\Trace\SpanContextValidator;

tests/Unit/SDK/Trace/SpanTest.php

@@ -9,7 +9,7 @@ use Exception;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\MockInterface;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace as API;
 use OpenTelemetry\API\Trace\NonRecordingSpan;
 use OpenTelemetry\API\Trace\SpanContext;
@@ -39,7 +39,6 @@ use OpenTelemetry\SDK\Trace\SpanProcessorInterface;
 use OpenTelemetry\SDK\Trace\StatusData;
 use OpenTelemetry\Tests\Unit\SDK\Util\TestClock;
 use Psr\Log\LoggerInterface;
-
 use function range;
 use function str_repeat;
 

tests/Unit/SDK/Trace/TracerProviderFactoryTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OpenTelemetry\Tests\Unit\SDK\Trace;
 
 use AssertWell\PHPUnitGlobalState\EnvironmentVariables;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\NoopTracerProvider;
 use OpenTelemetry\SDK\Trace\ExporterFactory;
 use OpenTelemetry\SDK\Trace\SamplerFactory;