Merge branch 'main' into xraySampler2

AsakerMohd · AsakerMohd · commit 21e93123511c · 2025-07-10T00:17:28.000-07:00
diff --git a/src/Aws/.gitattributes b/src/Aws/.gitattributes
@@ -8,6 +8,7 @@
 /.phan export-ignore
 /.php-cs-fixer.php export-ignore
 /coverage.clover export-ignore
+/examples export-ignore
 /phpstan.neon.dist export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/src/Aws/composer.json b/src/Aws/composer.json
@@ -33,7 +33,7 @@
     },
     "autoload": {
         "psr-4": {
-            "OpenTelemetry\\Aws\\": "src/"
+            "OpenTelemetry\\Contrib\\Aws\\": "src/"
         }
     },
     "autoload-dev": {
diff --git a/src/Aws/examples/AwsClientApp/bin/app b/src/Aws/examples/AwsClientApp/bin/app
diff --git a/src/Aws/examples/AwsClientApp/composer.json b/src/Aws/examples/AwsClientApp/composer.json
diff --git a/src/Aws/examples/AwsClientApp/src/main.php b/src/Aws/examples/AwsClientApp/src/main.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright The OpenTelemetry Authors
  *
@@ -23,8 +24,8 @@
 use Aws\S3\S3Client;
 use GuzzleHttp\Client;
 use OpenTelemetry\API\Trace\SpanKind;
-use OpenTelemetry\Aws\Xray\IdGenerator;
-use OpenTelemetry\Aws\Xray\Propagator;
+use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
 use OpenTelemetry\SDK\Trace\TracerProvider;
diff --git a/src/Aws/examples/README.md b/src/Aws/examples/README.md
diff --git a/src/Aws/examples/collector/config.yaml b/src/Aws/examples/collector/config.yaml
diff --git a/src/Aws/examples/sampleApp2/SampleApp2.php b/src/Aws/examples/sampleApp2/SampleApp2.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright The OpenTelemetry Authors
  *
@@ -21,8 +22,8 @@
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use OpenTelemetry\Aws\Xray\IdGenerator;
-use OpenTelemetry\Aws\Xray\Propagator;
+use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
 use OpenTelemetry\SDK\Trace\PropagationMap;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
diff --git a/src/Aws/examples/sampleApp2/Service1.php b/src/Aws/examples/sampleApp2/Service1.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright The OpenTelemetry Authors
  *
@@ -21,8 +22,8 @@
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use OpenTelemetry\Aws\Xray\IdGenerator;
-use OpenTelemetry\Aws\Xray\Propagator;
+use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
 use OpenTelemetry\SDK\Trace\PropagationMap;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
@@ -45,13 +46,13 @@ public function useService()
     {
         $Exporter = new OTLPExporter();
         $map = new PropagationMap();
-        
+
         // Create a tracer object that uses the AWS X-Ray ID Generator to
         // generate trace IDs in the correct format
         $tracer = (new TracerProvider(null, null, new IdGenerator()))
             ->addSpanProcessor(new SimpleSpanProcessor($Exporter))
             ->getTracer('io.opentelemetry.contrib.php');
-        
+
         // Extract the SpanContext from the carrier
         $spanContext = Propagator::extract($this->carrier, $map);
 
diff --git a/src/Aws/examples/sampleApp2/Service2.php b/src/Aws/examples/sampleApp2/Service2.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright The OpenTelemetry Authors
  *
@@ -21,8 +22,8 @@
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use OpenTelemetry\Aws\Xray\IdGenerator;
-use OpenTelemetry\Aws\Xray\Propagator;
+use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
 use OpenTelemetry\SDK\Trace\PropagationMap;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
@@ -45,13 +46,13 @@ public function useService()
     {
         $Exporter = new OTLPExporter();
         $map = new PropagationMap();
-        
+
         // Create a tracer object that uses the AWS X-Ray ID Generator to
         // generate trace IDs in the correct format
         $tracer = (new TracerProvider(null, null, new IdGenerator()))
             ->addSpanProcessor(new SimpleSpanProcessor($Exporter))
             ->getTracer('io.opentelemetry.contrib.php');
-        
+
         // Extract the SpanContext from the carrier
         $spanContext = Propagator::extract($this->carrier, $map);
 
diff --git a/src/Aws/src/AwsSdkInstrumentation.php b/src/Aws/src/AwsSdkInstrumentation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Aws;
+namespace OpenTelemetry\Contrib\Aws;
 
 use Aws\CommandInterface;
 use Aws\Middleware;
diff --git a/src/Aws/src/Ec2/Detector.php b/src/Aws/src/Ec2/Detector.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace OpenTelemetry\Aws\Ec2;
+namespace OpenTelemetry\Contrib\Aws\Ec2;
 
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
diff --git a/src/Aws/src/Ecs/DataProvider.php b/src/Aws/src/Ecs/DataProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Aws\Ecs;
+namespace OpenTelemetry\Contrib\Aws\Ecs;
 
 class DataProvider
 {
diff --git a/src/Aws/src/Ecs/Detector.php b/src/Aws/src/Ecs/Detector.php
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-namespace OpenTelemetry\Aws\Ecs;
+namespace OpenTelemetry\Contrib\Aws\Ecs;
 
 use OpenTelemetry\API\Behavior\LogsMessagesTrait;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
diff --git a/src/Aws/src/Eks/DataProvider.php b/src/Aws/src/Eks/DataProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Aws\Eks;
+namespace OpenTelemetry\Contrib\Aws\Eks;
 
 class DataProvider
 {
diff --git a/src/Aws/src/Eks/Detector.php b/src/Aws/src/Eks/Detector.php
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-namespace OpenTelemetry\Aws\Eks;
+namespace OpenTelemetry\Contrib\Aws\Eks;
 
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
diff --git a/src/Aws/src/Lambda/Detector.php b/src/Aws/src/Lambda/Detector.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace OpenTelemetry\Aws\Lambda;
+namespace OpenTelemetry\Contrib\Aws\Lambda;
 
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceDetectorInterface;
diff --git a/src/Aws/src/Xray/IdGenerator.php b/src/Aws/src/Xray/IdGenerator.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Aws\Xray;
+namespace OpenTelemetry\Contrib\Aws\Xray;
 
 use OpenTelemetry\SDK\Trace\IdGeneratorInterface;
 use OpenTelemetry\SDK\Trace\RandomIdGenerator;
diff --git a/src/Aws/src/Xray/Propagator.php b/src/Aws/src/Xray/Propagator.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Aws\Xray;
+namespace OpenTelemetry\Contrib\Aws\Xray;
 
 use OpenTelemetry\API\Trace as API;
 use OpenTelemetry\API\Trace\SpanContext;
@@ -60,7 +60,7 @@ class Propagator implements TextMapPropagatorInterface
     private const SAMPLED_FLAG_KEY = 'Sampled';
     private const IS_SAMPLED = '1';
     private const NOT_SAMPLED = '0';
-    
+
     /**
      * Returns list of fields used by HTTPTextFormat
      */
diff --git a/src/Aws/tests/Integration/AwsSdkInstrumentationTest.php b/src/Aws/tests/Integration/AwsSdkInstrumentationTest.php
@@ -12,8 +12,8 @@
 use Aws\Sqs\SqsClient;
 use GuzzleHttp\Promise;
 use OpenTelemetry\API\Trace\StatusCode;
-use OpenTelemetry\Aws\AwsSdkInstrumentation;
-use OpenTelemetry\Aws\Xray\Propagator;
+use OpenTelemetry\Contrib\Aws\AwsSdkInstrumentation;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\SDK\Trace\ReadWriteSpanInterface;
 use OpenTelemetry\SDK\Trace\TracerProvider;
 use PHPUnit\Framework\TestCase;
diff --git a/src/Aws/tests/Unit/AwsSdkInstrumentationTest.php b/src/Aws/tests/Unit/AwsSdkInstrumentationTest.php
@@ -6,8 +6,8 @@
 
 use DG\BypassFinals;
 use OpenTelemetry\API\Trace\TracerInterface;
-use OpenTelemetry\Aws\AwsSdkInstrumentation;
-use OpenTelemetry\Aws\Xray\Propagator;
+use OpenTelemetry\Contrib\Aws\AwsSdkInstrumentation;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\SDK\Trace\TracerProviderInterface;
 use PHPUnit\Framework\TestCase;
 
diff --git a/src/Aws/tests/Unit/Ec2/DetectorTest.php b/src/Aws/tests/Unit/Ec2/DetectorTest.php
@@ -9,7 +9,7 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Response;
-use OpenTelemetry\Aws\Ec2\Detector;
+use OpenTelemetry\Contrib\Aws\Ec2\Detector;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SemConv\ResourceAttributes;
diff --git a/src/Aws/tests/Unit/Ecs/DetectorTest.php b/src/Aws/tests/Unit/Ecs/DetectorTest.php
@@ -10,8 +10,8 @@
 use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Response;
 use OpenTelemetry\API\LoggerHolder;
-use OpenTelemetry\Aws\Ecs\DataProvider;
-use OpenTelemetry\Aws\Ecs\Detector;
+use OpenTelemetry\Contrib\Aws\Ecs\DataProvider;
+use OpenTelemetry\Contrib\Aws\Ecs\Detector;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
 use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
@@ -36,7 +36,7 @@ class DetectorTest extends TestCase
     private const ECS_ENV_VAR_V3_KEY = 'ECS_CONTAINER_METADATA_URI';
     private const ECS_ENV_VAR_V4_VAL = 'ecs_metadata_v4_uri';
     private const ECS_ENV_VAR_V3_VAL = 'ecs_metadata_v3_uri';
-    
+
     private const CLOUD_PROVIDER     = 'aws';
     private const CLOUD_PLATFORM     = 'aws_ecs';
 
diff --git a/src/Aws/tests/Unit/Eks/DataProviderTest.php b/src/Aws/tests/Unit/Eks/DataProviderTest.php
@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\Tests\Aws\Unit\Eks;
 
-use OpenTelemetry\Aws\Eks\DataProvider;
+use OpenTelemetry\Contrib\Aws\Eks\DataProvider;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 use PHPUnit\Framework\TestCase;
diff --git a/src/Aws/tests/Unit/Eks/DetectorTest.php b/src/Aws/tests/Unit/Eks/DetectorTest.php
@@ -9,8 +9,8 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Response;
-use OpenTelemetry\Aws\Eks\DataProvider;
-use OpenTelemetry\Aws\Eks\Detector;
+use OpenTelemetry\Contrib\Aws\Eks\DataProvider;
+use OpenTelemetry\Contrib\Aws\Eks\Detector;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
 use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
diff --git a/src/Aws/tests/Unit/Lambda/DetectorTest.php b/src/Aws/tests/Unit/Lambda/DetectorTest.php
@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\Tests\Aws\Unit\Lambda;
 
-use OpenTelemetry\Aws\Lambda\Detector;
+use OpenTelemetry\Contrib\Aws\Lambda\Detector;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
 use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
diff --git a/src/Aws/tests/Unit/Xray/IdGeneratorTest.php b/src/Aws/tests/Unit/Xray/IdGeneratorTest.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Tests\Aws\Unit\Xray;
 
 use OpenTelemetry\API\Trace\SpanContextValidator;
-use OpenTelemetry\Aws\Xray\IdGenerator;
+use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
 use PHPUnit\Framework\TestCase;
 
 class IdGeneratorTest extends TestCase
diff --git a/src/Aws/tests/Unit/Xray/PropagatorTest.php b/src/Aws/tests/Unit/Xray/PropagatorTest.php
@@ -9,9 +9,9 @@
 use OpenTelemetry\API\Trace\SpanContextValidator;
 use OpenTelemetry\API\Trace\TraceFlags;
 use OpenTelemetry\API\Trace\TraceState;
-use OpenTelemetry\Aws\Xray\Propagator;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\ContextInterface;
+use OpenTelemetry\Contrib\Aws\Xray\Propagator;
 use OpenTelemetry\SDK\Trace\Span;
 use PHPUnit\Framework\TestCase;
 
diff --git a/src/Instrumentation/Symfony/src/SymfonyInstrumentation.php b/src/Instrumentation/Symfony/src/SymfonyInstrumentation.php
@@ -47,8 +47,14 @@ public static function register(): void
                 $request = ($params[0] instanceof Request) ? $params[0] : null;
                 $type = $params[1] ?? HttpKernelInterface::MAIN_REQUEST;
                 $method = $request?->getMethod() ?? 'unknown';
+                $controller = $request?->attributes?->get('_controller');
+
+                if (!is_callable($controller, true, $controllerName)) {
+                    $controllerName = 'sub-request';
+                }
+
                 $name = ($type === HttpKernelInterface::SUB_REQUEST)
-                    ? sprintf('%s %s', $method, $request?->attributes?->get('_controller') ?? 'sub-request')
+                    ? sprintf('%s %s', $method, $controllerName)
                     : $method;
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $builder = $instrumentation
diff --git a/src/Instrumentation/Symfony/tests/Integration/SymfonyInstrumentationTest.php b/src/Instrumentation/Symfony/tests/Integration/SymfonyInstrumentationTest.php
@@ -204,6 +204,54 @@ public function test_http_kernel_handle_subrequest(): void
         $this->assertSame(SpanKind::KIND_INTERNAL, $span->getKind());
     }
 
+    public function test_http_kernel_handle_subrequest_with_various_controller_types(): void
+    {
+        $kernel = $this->getHttpKernel(new EventDispatcher());
+
+        // String controller
+        $request = new Request();
+        $request->attributes->set('_controller', 'SomeController::index');
+        $kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
+        $this->assertSame('GET SomeController::index', $this->storage[0]->getName());
+        $this->storage->exchangeArray([]);
+
+        // Array: [object, method]
+        $controllerObj = new class() {};
+        $request = new Request();
+        $request->attributes->set('_controller', [$controllerObj, 'fooAction']);
+        $kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
+        $this->assertSame('GET ' . get_class($controllerObj) . '::fooAction', $this->storage[0]->getName());
+        $this->storage->exchangeArray([]);
+
+        // Array: [class, method]
+        $request = new Request();
+        $request->attributes->set('_controller', ['SomeClass', 'barAction']);
+        $kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
+        $this->assertSame('GET SomeClass::barAction', $this->storage[0]->getName());
+        $this->storage->exchangeArray([]);
+    }
+
+    /**
+     * @psalm-suppress UnevaluatedCode
+     */
+    public function test_http_kernel_handle_subrequest_with_null_and_object_controller(): void
+    {
+        $kernel = $this->getHttpKernel(new EventDispatcher());
+
+        // Object controller  (should fallback to 'sub-request')
+        $controllerObj2 = new class() {};
+        $request = new Request();
+        $request->attributes->set('_controller', $controllerObj2);
+        $kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
+        $this->assertSame('GET sub-request', $this->storage[0]->getName());
+
+        // Null/other controller (should fallback to 'sub-request')
+        $request = new Request();
+        $request->attributes->set('_controller', null);
+        $kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
+        $this->assertSame('GET sub-request', $this->storage[0]->getName());
+    }
+
     private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, ?RequestStack $requestStack = null, array $arguments = []): HttpKernel
     {
         $controller ??= fn () => new Response('Hello');
diff --git a/src/ResourceDetectors/Azure/_register.php b/src/ResourceDetectors/Azure/_register.php
@@ -4,6 +4,6 @@
 
 use OpenTelemetry\SDK\Registry;
 
-Registry::registerResourceDetector('azure_app_service', new OpenTelemetry\Azure\AppService\Detector());
-Registry::registerResourceDetector('azure_container_apps', new OpenTelemetry\Azure\ContainerApps\Detector());
-Registry::registerResourceDetector('azure_vm', new OpenTelemetry\Azure\Vm\Detector());
+Registry::registerResourceDetector('azure_app_service', new OpenTelemetry\Contrib\Resource\Detector\Azure\AppService\Detector());
+Registry::registerResourceDetector('azure_container_apps', new OpenTelemetry\Contrib\Resource\Detector\Azure\ContainerApps\Detector());
+Registry::registerResourceDetector('azure_vm', new OpenTelemetry\Contrib\Resource\Detector\Azure\Vm\Detector());
diff --git a/src/ResourceDetectors/Azure/composer.json b/src/ResourceDetectors/Azure/composer.json
diff --git a/src/ResourceDetectors/Azure/src/AppService/Detector.php b/src/ResourceDetectors/Azure/src/AppService/Detector.php
diff --git a/src/ResourceDetectors/Azure/src/ContainerApps/Detector.php b/src/ResourceDetectors/Azure/src/ContainerApps/Detector.php
diff --git a/src/ResourceDetectors/Azure/src/Vm/Detector.php b/src/ResourceDetectors/Azure/src/Vm/Detector.php
diff --git a/src/ResourceDetectors/Azure/tests/Unit/AppService/DetectorTest.php b/src/ResourceDetectors/Azure/tests/Unit/AppService/DetectorTest.php
diff --git a/src/ResourceDetectors/Azure/tests/Unit/ContainerApps/DetectorTest.php b/src/ResourceDetectors/Azure/tests/Unit/ContainerApps/DetectorTest.php
diff --git a/src/ResourceDetectors/Azure/tests/Unit/Vm/DetectorTest.php b/src/ResourceDetectors/Azure/tests/Unit/Vm/DetectorTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`},`
`34`	`34`	`"autoload": {`
`35`	`35`	`"psr-4": {`
`36`		`- "OpenTelemetry\\Aws\\": "src/"`
	`36`	`+ "OpenTelemetry\\Contrib\\Aws\\": "src/"`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`"autoload-dev": {`