From 7d846fe367ab8e37ac429cd1ba864fbef860a442 Mon Sep 17 00:00:00 2001 From: Shawn Maddock Date: Tue, 8 Jul 2025 18:56:10 -0500 Subject: [PATCH 1/3] update package namespace to match other contrib pkgs --- src/Aws/composer.json | 2 +- src/Aws/src/AwsSdkInstrumentation.php | 2 +- src/Aws/src/Ec2/Detector.php | 2 +- src/Aws/src/Ecs/DataProvider.php | 2 +- src/Aws/src/Ecs/Detector.php | 2 +- src/Aws/src/Eks/DataProvider.php | 2 +- src/Aws/src/Eks/Detector.php | 2 +- src/Aws/src/Lambda/Detector.php | 2 +- src/Aws/src/Xray/IdGenerator.php | 2 +- src/Aws/src/Xray/Propagator.php | 4 ++-- src/Aws/tests/Integration/AwsSdkInstrumentationTest.php | 4 ++-- src/Aws/tests/Unit/AwsSdkInstrumentationTest.php | 4 ++-- src/Aws/tests/Unit/Ec2/DetectorTest.php | 2 +- src/Aws/tests/Unit/Ecs/DetectorTest.php | 6 +++--- src/Aws/tests/Unit/Eks/DataProviderTest.php | 2 +- src/Aws/tests/Unit/Eks/DetectorTest.php | 4 ++-- src/Aws/tests/Unit/Lambda/DetectorTest.php | 2 +- src/Aws/tests/Unit/Xray/IdGeneratorTest.php | 2 +- src/Aws/tests/Unit/Xray/PropagatorTest.php | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Aws/composer.json b/src/Aws/composer.json index de89c7459..ca120da03 100644 --- 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 index 0044b086d..17203c909 100644 --- 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 index 00d43d94e..02a8a9c2d 100644 --- 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 index 2a9918f97..5dab34b29 100644 --- 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 index 5b0826279..c1dc321d2 100644 --- 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 index e7da40cd4..a807891c0 100644 --- 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 index e09e9f37d..be7e30677 100644 --- 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 index 3fdbf3e69..586dba299 100644 --- 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 index fa5c853ab..bebff4a90 100644 --- 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 index 4776f93e6..f32d15ee6 100644 --- 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 index a8deca822..4dfdf1073 100644 --- 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 index 99e3d1c01..1e516e372 100644 --- 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 index e186eb431..2d7384946 100644 --- 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 index 566be9607..47ec73e6a 100644 --- 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 index 2fca0dc5d..6d960c7b1 100644 --- 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 index 604718cc0..ce01d2b70 100644 --- 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 index 2a2d58d07..eae542dbb 100644 --- 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 index ec55eed56..5f21be195 100644 --- 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 index 5ec0a415e..01318f7d3 100644 --- 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; From 14cb0fe247a06cd31a5557c9933f1af7408bf626 Mon Sep 17 00:00:00 2001 From: Shawn Maddock Date: Tue, 8 Jul 2025 18:56:50 -0500 Subject: [PATCH 2/3] move AWS examples to project directory and update namespace --- {examples/aws => src/Aws/examples}/AwsClientApp/bin/app | 0 .../aws => src/Aws/examples}/AwsClientApp/composer.json | 0 .../aws => src/Aws/examples}/AwsClientApp/src/main.php | 5 +++-- {examples/aws => src/Aws/examples}/README.md | 0 {examples/aws => src/Aws/examples}/collector/config.yaml | 0 .../aws => src/Aws/examples}/sampleApp2/SampleApp2.php | 5 +++-- .../aws => src/Aws/examples}/sampleApp2/Service1.php | 9 +++++---- .../aws => src/Aws/examples}/sampleApp2/Service2.php | 9 +++++---- 8 files changed, 16 insertions(+), 12 deletions(-) rename {examples/aws => src/Aws/examples}/AwsClientApp/bin/app (100%) rename {examples/aws => src/Aws/examples}/AwsClientApp/composer.json (100%) rename {examples/aws => src/Aws/examples}/AwsClientApp/src/main.php (97%) rename {examples/aws => src/Aws/examples}/README.md (100%) rename {examples/aws => src/Aws/examples}/collector/config.yaml (100%) rename {examples/aws => src/Aws/examples}/sampleApp2/SampleApp2.php (97%) rename {examples/aws => src/Aws/examples}/sampleApp2/Service1.php (95%) rename {examples/aws => src/Aws/examples}/sampleApp2/Service2.php (96%) diff --git a/examples/aws/AwsClientApp/bin/app b/src/Aws/examples/AwsClientApp/bin/app similarity index 100% rename from examples/aws/AwsClientApp/bin/app rename to src/Aws/examples/AwsClientApp/bin/app diff --git a/examples/aws/AwsClientApp/composer.json b/src/Aws/examples/AwsClientApp/composer.json similarity index 100% rename from examples/aws/AwsClientApp/composer.json rename to src/Aws/examples/AwsClientApp/composer.json diff --git a/examples/aws/AwsClientApp/src/main.php b/src/Aws/examples/AwsClientApp/src/main.php similarity index 97% rename from examples/aws/AwsClientApp/src/main.php rename to src/Aws/examples/AwsClientApp/src/main.php index f158ac460..d9e22eafb 100644 --- a/examples/aws/AwsClientApp/src/main.php +++ b/src/Aws/examples/AwsClientApp/src/main.php @@ -1,4 +1,5 @@ addSpanProcessor(new SimpleSpanProcessor($Exporter)) ->getTracer('io.opentelemetry.contrib.php'); - + // Extract the SpanContext from the carrier $spanContext = Propagator::extract($this->carrier, $map); diff --git a/examples/aws/sampleApp2/Service2.php b/src/Aws/examples/sampleApp2/Service2.php similarity index 96% rename from examples/aws/sampleApp2/Service2.php rename to src/Aws/examples/sampleApp2/Service2.php index 92633dcd6..ed24c11c6 100644 --- a/examples/aws/sampleApp2/Service2.php +++ b/src/Aws/examples/sampleApp2/Service2.php @@ -1,4 +1,5 @@ addSpanProcessor(new SimpleSpanProcessor($Exporter)) ->getTracer('io.opentelemetry.contrib.php'); - + // Extract the SpanContext from the carrier $spanContext = Propagator::extract($this->carrier, $map); From f6ca651349454f09af2f883ff5a47fd6b7f3c8cb Mon Sep 17 00:00:00 2001 From: Shawn Maddock Date: Wed, 9 Jul 2025 13:25:50 -0500 Subject: [PATCH 3/3] remove Aws examples from export --- src/Aws/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Aws/.gitattributes b/src/Aws/.gitattributes index e088d9982..6c999fb98 100644 --- 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