Merge remote-tracking branch 'upstream/main' into spi/laravel

Author: ChrisLightfootWild

.github/workflows/php.yml

@@ -47,6 +47,7 @@ jobs:
           'Propagation/TraceResponse',
           'ResourceDetectors/Azure',
           'ResourceDetectors/Container',
+          'Sampler/RuleBased',
           'Shims/OpenTracing',
           'Symfony'
         ]
@@ -111,6 +112,10 @@ jobs:
             php-version: 7.4
           - project: 'ResourceDetectors/Container'
             php-version: 7.4
+          - project: 'Sampler/RuleBased'
+            php-version: 7.4
+          - project: 'Sampler/RuleBased'
+            php-version: 8.0
     steps:
     - uses: actions/checkout@v4
 

.gitsplit.yml

@@ -68,6 +68,8 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-detector-azure.git"
   - prefix: "src/ResourceDetectors/Container"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-detector-container.git"
+  - prefix: "src/Sampler/RuleBased"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sampler-rulebased.git"
   - prefix: "src/Shims/OpenTracing"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-shim-opentracing.git"
 # List of references to split (defined as regexp)

src/Context/Swoole/src/SwooleContextHandler.php

@@ -41,7 +41,7 @@ public function switchToActiveCoroutine(): void
     public function splitOffChildCoroutines(): void
     {
         $pcid = Coroutine::getCid();
-        foreach (Coroutine::listCoroutines() as $cid) {
+        foreach (method_exists(Coroutine::class, 'list') ? Coroutine::list() : Coroutine::listCoroutines() as $cid) {
             if ($pcid === Coroutine::getPcid($cid) && !$this->isForked($cid)) {
                 $this->forkCoroutine($cid);
             }

src/Instrumentation/CakePHP/src/CakePHPInstrumentation.php

@@ -8,7 +8,6 @@
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Command\Command;
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Controller\Controller;
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Http\Server;
-use OpenTelemetry\SemConv\TraceAttributes;
 
 class CakePHPInstrumentation
 {
@@ -25,4 +24,4 @@ public static function register(): void
         Controller::hook($instrumentation);
         Command::hook($instrumentation);
     }
-}
+}

src/Instrumentation/CakePHP/src/Hooks/Cake/Command/Command.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace  OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Command;
+namespace OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\Cake\Command;
 
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\StatusCode;

src/Instrumentation/CakePHP/src/Hooks/Cake/Http/Server.php

@@ -6,13 +6,11 @@
 
 use Cake\Routing\Exception\MissingRouteException;
 use Cake\Routing\Router;
-use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\CakeHook;
 use OpenTelemetry\Contrib\Instrumentation\CakePHP\Hooks\CakeHookTrait;
 use function OpenTelemetry\Instrumentation\hook;
-use OpenTelemetry\SDK\Common\Time\ClockInterface;
 use OpenTelemetry\SemConv\TraceAttributes;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -47,7 +45,7 @@ public function instrument(): void
                 $route = $this->getRouteTemplate($request);
                 $span = \OpenTelemetry\API\Trace\Span::fromContext($scope->context());
 
-                if($route && $this->isRoot()) {
+                if ($route && $this->isRoot()) {
                     $span->setAttribute(TraceAttributes::HTTP_ROUTE, $route);
                 }
                 if ($exception) {
@@ -83,4 +81,4 @@ private function getRouteTemplate($request): string|null
             return null;
         }
     }
-}
+}

src/Instrumentation/CakePHP/src/Hooks/CakeHookTrait.php

@@ -44,6 +44,7 @@ public static function hook(CachedInstrumentation $instrumentation): CakeHook
      * @param string|null $filename
      * @param int|null $lineno
      * @return mixed
+     * @psalm-suppress ArgumentTypeCoercion
      */
     protected function buildSpan(?ServerRequestInterface $request, string $class, string $function, ?string $filename, ?int $lineno): mixed
     {

src/Instrumentation/CakePHP/tests/Integration/App/config/app.php

@@ -173,7 +173,9 @@
         'skipLog' => [],
         'log' => true,
         'trace' => true,
-        'ignoredDeprecationPaths' => [],
+        'ignoredDeprecationPaths' => [
+            '/src/I18n/I18n.php',
+        ],
     ],
 
     /*

src/Instrumentation/CakePHP/tests/Integration/CakePHPInstrumentationTest.php

@@ -7,7 +7,6 @@
 use Cake\TestSuite\IntegrationTestTrait;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
-use OpenTelemetry\SDK\Metrics\Data\Histogram;
 use OpenTelemetry\SDK\Trace\ImmutableSpan;
 
 /**
@@ -129,4 +128,4 @@ public function test_response_code_gte_400(): void
         $attributes = $span->getAttributes()->toArray();
         $this->assertSame(400, $attributes['http.response.status_code']);
     }
-}
+}

src/Instrumentation/CakePHP/tests/Integration/TestCase.php

@@ -8,8 +8,6 @@
 use OpenTelemetry\API\Instrumentation\Configurator;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\Context\ScopeInterface;
-use OpenTelemetry\SDK\Metrics\MeterProvider;
-use OpenTelemetry\SDK\Metrics\MetricReader\ExportingReader;
 use OpenTelemetry\SDK\Trace\ImmutableSpan;
 use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
@@ -45,4 +43,4 @@ public function tearDown(): void
 
         $this->scope->detach();
     }
-}
+}