feat: Support newer API namespace for open-telemetry/api >= 1.0.0beta…

…10 (#171) * build(deps): Bump open-telemetry/api to 1.0.0beta10 * fix: Use OpenTelemetry\API instead of OpenTelemetry\API\Common Signed-off-by: Natsuki Ikeguchi <n_ikeguchi@yumemi.co.jp>
open-telemetry · Jun 26, 2023 · e866749 · e866749
1 parent ce970de
commit e866749
Show file tree

Hide file tree

Showing 48 changed files with 67 additions and 69 deletions.
diff --git a/examples/instrumentation/Psr18/request.php b/examples/instrumentation/Psr18/request.php
@@ -4,7 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
-use OpenTelemetry\API\Common\Instrumentation;
+use OpenTelemetry\API\Instrumentation;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
 use OpenTelemetry\SDK\Resource\ResourceInfoFactory;

diff --git a/src/Aws/composer.json b/src/Aws/composer.json
@@ -14,6 +14,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.4 || ^8.0",
+        "open-telemetry/api": "^1.0.0beta10",
         "open-telemetry/sdk": "^1.0",
         "aws/aws-sdk-php": "^3.232"
     },

diff --git a/src/Aws/src/AwsSdkInstrumentation.php b/src/Aws/src/AwsSdkInstrumentation.php
@@ -6,8 +6,8 @@
 
 use Aws\Middleware;
 use Aws\ResultInterface;
-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\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\TracerInterface;

diff --git a/src/Aws/tests/Unit/Ecs/DetectorTest.php b/src/Aws/tests/Unit/Ecs/DetectorTest.php
@@ -9,7 +9,7 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Response;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\Aws\Ecs\DataProvider;
 use OpenTelemetry\Aws\Ecs\Detector;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;

diff --git a/src/HookGen/branch_merger/lib/head_content.html b/src/HookGen/branch_merger/lib/head_content.html
@@ -30,7 +30,7 @@
 }
 
 function genUseStatements(names) {
-   var code = '  use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation\n';
+   var code = '  use OpenTelemetry\API\Instrumentation\CachedInstrumentation\n';
    code += '  use OpenTelemetry\API\Trace\Span\n';
    code += '  use OpenTelemetry\API\Trace\SpanBuilderInterface\n';
    code += '  use OpenTelemetry\API\Trace\StatusCode\n';
@@ -163,4 +163,4 @@
    }
 
 </style>
-</head>
+</head>
diff --git a/src/Instrumentation/HttpAsyncClient/README.md b/src/Instrumentation/HttpAsyncClient/README.md
@@ -23,7 +23,7 @@ If you are not using SDK autoloading, you will need to create and register a `Tr
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -47,4 +47,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|-------------------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | http-async-client | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
diff --git a/src/Instrumentation/HttpAsyncClient/composer.json b/src/Instrumentation/HttpAsyncClient/composer.json
@@ -11,7 +11,7 @@
   "require": {
     "php": "^8.0",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": "^1",
+    "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1",
     "php-http/httplug": "^2"
   },

diff --git a/src/Instrumentation/HttpAsyncClient/examples/async_requests.php b/src/Instrumentation/HttpAsyncClient/examples/async_requests.php
@@ -6,8 +6,8 @@
 use Http\Adapter\Guzzle7\Client;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use OpenTelemetry\API\Common\Instrumentation;
-use OpenTelemetry\API\Common\Log\LoggerHolder;
+use OpenTelemetry\API\Instrumentation;
+use OpenTelemetry\API\LoggerHolder;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\SDK\Common\Export\Stream\StreamTransportFactory;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;

diff --git a/src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php b/src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php
@@ -6,8 +6,8 @@
 
 use Http\Client\HttpAsyncClient;
 use Http\Promise\Promise;
-use OpenTelemetry\API\Common\Instrumentation;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
@@ -37,7 +37,7 @@ public static function register(): void
                     return null;
                 }
 
-                $propagator = Instrumentation\Globals::propagator();
+                $propagator = Globals::propagator();
                 $parentContext = Context::getCurrent();
 
                 /** @psalm-suppress ArgumentTypeCoercion */

diff --git a/src/Instrumentation/HttpAsyncClient/tests/Integration/HttpAsyncClientInstrumentationTest.php b/src/Instrumentation/HttpAsyncClient/tests/Integration/HttpAsyncClientInstrumentationTest.php
@@ -10,7 +10,7 @@
 use Http\Promise\Promise;
 use Nyholm\Psr7\Request;
 use Nyholm\Psr7\Response;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\Context\ScopeInterface;
 use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;

diff --git a/src/Instrumentation/IO/README.md b/src/Instrumentation/IO/README.md
@@ -34,7 +34,7 @@ See https://github.com/open-telemetry/opentelemetry-php#sdk-autoloading
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -68,4 +68,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|---------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | io      | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
diff --git a/src/Instrumentation/IO/composer.json b/src/Instrumentation/IO/composer.json
@@ -10,7 +10,7 @@
   "require": {
     "php": "^8.2",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": "^1",
+    "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1"
   },
   "require-dev": {

diff --git a/src/Instrumentation/IO/src/IOInstrumentation.php b/src/Instrumentation/IO/src/IOInstrumentation.php
@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\IO;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanBuilderInterface;
 use OpenTelemetry\API\Trace\StatusCode;

diff --git a/src/Instrumentation/IO/tests/Integration/IOInstrumentationTest.php b/src/Instrumentation/IO/tests/Integration/IOInstrumentationTest.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Tests\Instrumentation\IO\tests\Integration;
 
 use ArrayObject;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\Context\ScopeInterface;
 use OpenTelemetry\SDK\Trace\ImmutableSpan;
 use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;

diff --git a/src/Instrumentation/Laravel/README.md b/src/Instrumentation/Laravel/README.md
@@ -25,7 +25,7 @@ See https://github.com/open-telemetry/opentelemetry-php#sdk-autoloading
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -59,4 +59,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|---------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | laravel | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
diff --git a/src/Instrumentation/Laravel/composer.json b/src/Instrumentation/Laravel/composer.json
@@ -11,7 +11,7 @@
     "php": "^8.0",
     "laravel/framework": "*",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": "^1",
+    "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1"
   },
   "require-dev": {

diff --git a/src/Instrumentation/Laravel/src/ClientRequestWatcher.php b/src/Instrumentation/Laravel/src/ClientRequestWatcher.php
@@ -8,7 +8,7 @@
 use Illuminate\Http\Client\Events\ConnectionFailed;
 use Illuminate\Http\Client\Events\RequestSending;
 use Illuminate\Http\Client\Events\ResponseReceived;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;

diff --git a/src/Instrumentation/Laravel/src/LaravelInstrumentation.php b/src/Instrumentation/Laravel/src/LaravelInstrumentation.php
@@ -7,8 +7,8 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Http\Kernel;
 use Illuminate\Http\Request;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;

diff --git a/src/Instrumentation/Laravel/src/QueryWatcher.php b/src/Instrumentation/Laravel/src/QueryWatcher.php
@@ -7,7 +7,7 @@
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Support\Str;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
 use OpenTelemetry\SemConv\TraceAttributes;

diff --git a/src/Instrumentation/Laravel/tests/Integration/LaravelInstrumentationTest.php b/src/Instrumentation/Laravel/tests/Integration/LaravelInstrumentationTest.php
@@ -8,7 +8,7 @@
 use Illuminate\Foundation\Http\Kernel;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Http;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\Context\ScopeInterface;
 use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;

diff --git a/src/Instrumentation/Laravel/tests/app/Providers/EventServiceProvider.php b/src/Instrumentation/Laravel/tests/app/Providers/EventServiceProvider.php
@@ -7,7 +7,6 @@
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

diff --git a/src/Instrumentation/PDO/README.md b/src/Instrumentation/PDO/README.md
@@ -26,7 +26,7 @@ See https://github.com/open-telemetry/opentelemetry-php#sdk-autoloading
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -60,4 +60,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|---------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | pdo     | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
diff --git a/src/Instrumentation/PDO/composer.json b/src/Instrumentation/PDO/composer.json
@@ -10,7 +10,7 @@
   "require": {
     "php": "^8.2",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": "^1",
+    "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1"
   },
   "require-dev": {

diff --git a/src/Instrumentation/PDO/src/PDOInstrumentation.php b/src/Instrumentation/PDO/src/PDOInstrumentation.php
@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\PDO;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanBuilderInterface;
 use OpenTelemetry\API\Trace\SpanKind;

diff --git a/src/Instrumentation/PDO/tests/Integration/PDOInstrumentationTest.php b/src/Instrumentation/PDO/tests/Integration/PDOInstrumentationTest.php
@@ -5,9 +5,8 @@
 namespace OpenTelemetry\Tests\Instrumentation\PDO\tests\Integration;
 
 use ArrayObject;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\Context\ScopeInterface;
-use OpenTelemetry\SDK\Trace\ImmutableSpan;
 use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
 use OpenTelemetry\SDK\Trace\TracerProvider;

diff --git a/src/Instrumentation/Psr15/README.md b/src/Instrumentation/Psr15/README.md
@@ -18,7 +18,7 @@ To export spans, you will need to create and register a `TracerProvider` early i
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -43,4 +43,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|---------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | psr15   | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
diff --git a/src/Instrumentation/Psr15/composer.json b/src/Instrumentation/Psr15/composer.json
@@ -11,7 +11,7 @@
   "require": {
     "php": "^8.0",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": "^1",
+    "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1",
     "psr/http-server-middleware": "^1"
   },

diff --git a/src/Instrumentation/Psr15/src/Psr15Instrumentation.php b/src/Instrumentation/Psr15/src/Psr15Instrumentation.php
@@ -4,8 +4,8 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\Psr15;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;

diff --git a/src/Instrumentation/Psr15/tests/Integration/Psr15InstrumentationTest.php b/src/Instrumentation/Psr15/tests/Integration/Psr15InstrumentationTest.php
@@ -9,7 +9,7 @@
 use Nyholm\Psr7\Response;
 use Nyholm\Psr7\ServerRequest;
 use Nyholm\Psr7\Uri;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanInterface;

diff --git a/src/Instrumentation/Psr18/README.md b/src/Instrumentation/Psr18/README.md
@@ -24,7 +24,7 @@ If you are not using SDK autoloading, you will need to create and register a `Tr
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -49,4 +49,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|---------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | psr18   | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
diff --git a/src/Instrumentation/Psr18/composer.json b/src/Instrumentation/Psr18/composer.json
@@ -11,7 +11,7 @@
   "require": {
     "php": "^8.0",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": "^1",
+    "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1",
     "psr/http-client": "^1"
   },

diff --git a/src/Instrumentation/Psr18/src/Psr18Instrumentation.php b/src/Instrumentation/Psr18/src/Psr18Instrumentation.php
@@ -5,8 +5,8 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Psr18;
 
 use function get_cfg_var;
-use OpenTelemetry\API\Common\Instrumentation;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
@@ -40,7 +40,7 @@ public static function register(): void
                     return null;
                 }
 
-                $propagator = Instrumentation\Globals::propagator();
+                $propagator = Globals::propagator();
                 $parentContext = Context::getCurrent();
 
                 /** @psalm-suppress ArgumentTypeCoercion */

diff --git a/src/Instrumentation/Psr18/tests/Integration/Psr18InstrumentationTest.php b/src/Instrumentation/Psr18/tests/Integration/Psr18InstrumentationTest.php
@@ -7,7 +7,7 @@
 use ArrayObject;
 use Nyholm\Psr7\Request;
 use Nyholm\Psr7\Response;
-use OpenTelemetry\API\Common\Instrumentation\Configurator;
+use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\Context\ScopeInterface;
 use OpenTelemetry\SDK\Trace\ImmutableSpan;

diff --git a/src/Instrumentation/Slim/README.md b/src/Instrumentation/Slim/README.md
@@ -29,7 +29,7 @@ See https://github.com/open-telemetry/opentelemetry-php#sdk-autoloading
 require_once 'vendor/autoload.php';
 
 $tracerProvider = /*create tracer provider*/;
-$scope = \OpenTelemetry\API\Common\Instrumentation\Configurator::create()
+$scope = \OpenTelemetry\API\Instrumentation\Configurator::create()
     ->withTracerProvider($tracerProvider)
     ->activate();
 
@@ -54,4 +54,4 @@ Parts of this auto-instrumentation library can be configured, more options are a
 |-------------------------------------|---------------|-------------------------|---------|---------------------------------------------------------------------------------|
 | OTEL_PHP_DISABLED_INSTRUMENTATIONS  | []            | Instrumentation name(s) | slim    | Disable one or more installed auto-instrumentations, names are comma seperated. |
 
-Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)
+Configurations can be provided as environment variables, or via `php.ini` (or a file included by `php.ini`)