update package namespace to match other contrib pkgs

smaddock · smaddock · commit 7d846fe367ab · 2025-07-08T18:56:10.000-05:00
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/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;
 

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": {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace OpenTelemetry\Aws\Ecs;`
	`5`	`+namespace OpenTelemetry\Contrib\Aws\Ecs;`
`6`	`6`
`7`	`7`	`class DataProvider`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace OpenTelemetry\Aws\Eks;`
	`5`	`+namespace OpenTelemetry\Contrib\Aws\Eks;`
`6`	`6`
`7`	`7`	`class DataProvider`
`8`	`8`	`{`