feat: Support newer API namespace for open-telemetry/api >= 1.0.0beta10 (#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 <[email protected]>

Author: siketyan

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`)

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": {

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;

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;

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;

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;

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
 {