feat: frankenphp

Author: overtrue

.github/workflows/test.yml

@@ -1,35 +1,36 @@
 name: Test
 
 on:
-    push:
-        branches: [main]
-    pull_request:
-        branches: [main]
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
-    phpcs:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Setup PHP environment
-              uses: shivammathur/setup-php@v2
-            - name: Install dependencies
-              run: composer install --ignore-platform-reqs
-            - name: PHPCSFixer check
-              run: composer check-style
-    phpunit:
-        strategy:
-            matrix:
-                php_version: [8.4]
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Setup PHP environment
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php_version }}
-                  coverage: xdebug
-            - name: Install dependencies
-              run: composer install --ignore-platform-reqs
-            - name: PHPUnit check
-              run: ./vendor/bin/phpunit --coverage-text
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup PHP environment
+        uses: shivammathur/setup-php@v2
+      - name: Install dependencies
+        run: composer install --ignore-platform-reqs
+      - name: PHPCSFixer check
+        run: composer check-style
+  phpunit:
+    strategy:
+      matrix:
+        php_version: [8.4]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup PHP environment
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          coverage: xdebug
+          extensions: opentelemetry
+      - name: Install dependencies
+        run: composer install --ignore-platform-reqs
+      - name: PHPUnit check
+        run: ./vendor/bin/phpunit --coverage-text

tests/Hooks/Illuminate/Http/KernelTest.php

@@ -3,7 +3,6 @@
 namespace Overtrue\LaravelOpenTelemetry\Tests\Hooks\Illuminate\Http;
 
 use Mockery;
-use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use Overtrue\LaravelOpenTelemetry\Facades\Measure;
 use Overtrue\LaravelOpenTelemetry\Hooks\Illuminate\Http\Kernel;
 use Overtrue\LaravelOpenTelemetry\Tests\TestCase;
@@ -25,9 +24,8 @@ public function test_adds_trace_id_to_response_header()
         $expectedTraceId = '12345678901234567890123456789012';
         Measure::shouldReceive('traceId')->andReturn($expectedTraceId);
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化而不是通过 hook() 方法
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;
@@ -49,9 +47,8 @@ public function test_does_not_add_header_when_config_is_null()
         // Set configuration to null
         config(['otel.response_trace_header_name' => null]);
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;
@@ -73,9 +70,8 @@ public function test_does_not_add_header_when_config_is_empty()
         // Set configuration to empty string
         config(['otel.response_trace_header_name' => '']);
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;
@@ -100,9 +96,8 @@ public function test_does_not_add_header_when_trace_id_is_empty()
         // Mock empty trace ID
         Measure::shouldReceive('traceId')->andReturn('');
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;
@@ -128,9 +123,8 @@ public function test_does_not_add_header_when_trace_id_is_all_zeros()
         $allZerosTraceId = '00000000000000000000000000000000';
         Measure::shouldReceive('traceId')->andReturn($allZerosTraceId);
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;
@@ -155,9 +149,8 @@ public function test_handles_exception_gracefully()
         // Mock Measure::traceId() to throw exception
         Measure::shouldReceive('traceId')->andThrow(new \Exception('Test exception'));
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;
@@ -183,9 +176,8 @@ public function test_uses_custom_header_name()
         $expectedTraceId = '98765432109876543210987654321098';
         Measure::shouldReceive('traceId')->andReturn($expectedTraceId);
 
-        // Create hook
-        $instrumentation = new CachedInstrumentation('test');
-        $hook = Kernel::hook($instrumentation);
+        // Create hook - 在测试环境中直接实例化
+        $hook = new Kernel();
 
         // Create response
         $response = new Response;

tests/TestCase.php

@@ -2,10 +2,16 @@
 
 namespace Overtrue\LaravelOpenTelemetry\Tests;
 
+use Orchestra\Testbench\TestCase as OrchestraTestCase;
 use Overtrue\LaravelOpenTelemetry\OpenTelemetryServiceProvider;
 
-abstract class TestCase extends \Orchestra\Testbench\TestCase
+abstract class TestCase extends OrchestraTestCase
 {
+        protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
     protected function getPackageProviders($app): array
     {
         return [
@@ -49,4 +55,10 @@ protected function defineEnvironment($app)
     {
         $app['config']->set('otel.enabled', true);
     }
+
+        protected function getEnvironmentSetUp($app): void
+    {
+        // Setup the application environment for testing
+        config()->set('database.default', 'testing');
+    }
 }