fix: metric provider

Author: overtrue

src/OpenTelemetryServiceProvider.php

@@ -12,9 +12,6 @@
 use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\TracerInterface;
-use OpenTelemetry\SDK\Common\Util\ShutdownHandler;
-use OpenTelemetry\SDK\Metrics\MeterProviderFactory;
-use OpenTelemetry\SDK\Resource\Detectors\Sdk;
 use Overtrue\LaravelOpenTelemetry\Console\Commands\TestCommand;
 use Overtrue\LaravelOpenTelemetry\Facades\Measure;
 use Overtrue\LaravelOpenTelemetry\Http\Middleware\AddTraceId;
@@ -46,11 +43,6 @@ public function register(): void
             __DIR__.'/../config/otel.php', 'otel',
         );
 
-        // Check if OpenTelemetry is enabled
-        if (! config('otel.enabled', true)) {
-            return;
-        }
-
         // Register Tracer
         $this->app->singleton(Support\Measure::class, function ($app) {
             return new Support\Measure($app);
@@ -59,8 +51,7 @@ public function register(): void
         $this->app->alias(Support\Measure::class, 'opentelemetry.measure');
 
         $this->app->singleton(TracerInterface::class, function () {
-            return Globals::tracerProvider()
-                ->getTracer(config('otel.tracer_name', 'overtrue.laravel-open-telemetry'));
+            return Globals::tracerProvider()->getTracer(config('otel.tracer_name', 'overtrue.laravel-open-telemetry'));
         });
 
         $this->app->alias(TracerInterface::class, 'opentelemetry.tracer');
@@ -73,12 +64,7 @@ public function register(): void
 
         // register custom meter
         $this->app->singleton(MeterInterface::class, function () {
-            $resourceInfo = (new Sdk)->getResource();
-            $meterProvider = (new MeterProviderFactory)->create($resourceInfo);
-            ShutdownHandler::register($meterProvider->shutdown(...));
-            Metric::setProvider($meterProvider);
-
-            return $meterProvider->getMeter(config('otel.meter_name', 'overtrue.laravel-open-telemetry'));
+            return Globals::meterProvider()->getMeter(config('otel.meter_name', 'overtrue.laravel-open-telemetry'));
         });
 
         $this->app->alias(MeterInterface::class, 'opentelemetry.meter');

src/Support/Metric.php

@@ -4,11 +4,11 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\Facades\Log;
+use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Metrics\CounterInterface;
 use OpenTelemetry\API\Metrics\GaugeInterface;
 use OpenTelemetry\API\Metrics\HistogramInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
-use OpenTelemetry\API\Metrics\MeterProviderInterface;
 use OpenTelemetry\API\Metrics\Noop\NoopMeter;
 use OpenTelemetry\API\Metrics\ObservableGaugeInterface;
 use Throwable;
@@ -17,8 +17,6 @@ class Metric
 {
     private static ?bool $enabled = null;
 
-    private static ?MeterProviderInterface $meterProvider = null;
-
     public function __construct(protected Application $app) {}
 
     // ======================= Enable/Disable Management =======================
@@ -47,17 +45,7 @@ public function isEnabled(): bool
      */
     public function flush(): void
     {
-        self::$meterProvider?->forceFlush();
-    }
-
-    public static function getProvider(): MeterProviderInterface
-    {
-        return self::$meterProvider;
-    }
-
-    public static function setProvider(MeterProviderInterface $meterProvider): void
-    {
-        self::$meterProvider = $meterProvider;
+        Globals::meterProvider()?->forceFlush();
     }
 
     // ======================= Core OpenTelemetry API =======================

tests/OpenTelemetryServiceProviderTest.php

@@ -133,47 +133,6 @@ public function test_provider_logs_startup_and_registration()
         $this->assertTrue(true); // Mockery will fail if expectation not met
     }
 
-    public function test_provider_does_not_register_services_when_disabled()
-    {
-        // Create a fresh Laravel application WITHOUT auto-loading our package provider
-        $app = new \Illuminate\Foundation\Application(
-            realpath(__DIR__.'/../')
-        );
-
-        $app->singleton(
-            \Illuminate\Contracts\Http\Kernel::class,
-            \Illuminate\Foundation\Http\Kernel::class
-        );
-
-        $app->singleton(
-            \Illuminate\Contracts\Console\Kernel::class,
-            \Illuminate\Foundation\Console\Kernel::class
-        );
-
-        $app->singleton(
-            \Illuminate\Contracts\Debug\ExceptionHandler::class,
-            \Illuminate\Foundation\Exceptions\Handler::class
-        );
-
-        // Set config with enabled = false
-        $app['config'] = new \Illuminate\Config\Repository([
-            'otel' => array_merge(
-                include __DIR__.'/../config/otel.php',
-                ['enabled' => false]
-            ),
-        ]);
-
-        // Create and register service provider
-        $provider = new OpenTelemetryServiceProvider($app);
-        $provider->register();
-
-        // Verify services are NOT bound when disabled
-        $this->assertFalse($app->bound(Measure::class));
-        $this->assertFalse($app->bound(\OpenTelemetry\API\Trace\TracerInterface::class));
-        $this->assertFalse($app->bound(\OpenTelemetry\API\Metrics\MeterInterface::class));
-        $this->assertFalse($app->bound(\Overtrue\LaravelOpenTelemetry\Support\Metric::class));
-    }
-
     public function test_tracer_provider_is_initialized()
     {
         // 获取全局 TracerProvider