Merge pull request #30 from tidal/psr4

Reorganize directory structure

Author: bobstrecansky

README.md

@@ -38,7 +38,7 @@ $ composer require open-telemetry/opentelemetry-php-contrib
 
 ### Symfony
 #### SdkBundle
-- The documentation for the Symfony SdkBundle can be found [here](/instrumentation/symfony/OtelSdkBundle/README.md).
+- The documentation for the Symfony SdkBundle can be found [here](/src/Symfony/OtelSdkBundle/README.md).
 - An example symfony application using the SdkBundle can be found [here](https://github.com/tidal/otel-sdk-bundle-example-sf5).
 
 

composer.json

@@ -32,22 +32,13 @@
     },
     "autoload": {
         "psr-4": {
-            "OpenTelemetry\\Instrumentation\\Symfony\\": "instrumentation/symfony"
-        },
-        "classmap": [
-            "detectors/",
-            "exporters/",
-            "instrumentation/",
-            "propagators/"
-        ],
-        "exclude-from-classmap": ["instrumentation/symfony/OtelSdkBundle/vendor"]
+            "OpenTelemetry\\": "src"
+        }
     },
     "autoload-dev": {
         "psr-4": {
-            "OpenTelemetry\\Test\\Unit\\Symfony\\": "tests/unit/instrumentation/Symfony",
-            "OpenTelemetry\\Test\\Integration\\Symfony\\": "tests/integration/instrumentation/Symfony"
-        },
-        "classmap": ["examples/"]
+            "OpenTelemetry\\Test\\": "tests"
+        }
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

detectors/README.md

@@ -22,13 +22,13 @@
 require __DIR__ . '/../../../vendor/autoload.php';
 
 use GuzzleHttp\Client;
-use Instrumentation\Aws\Xray\AwsXrayIdGenerator;
+use OpenTelemetry\Aws\Xray\IdGenerator;
+use OpenTelemetry\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
-use OpenTelemetry\Sdk\Trace\PropagationMap;
-use OpenTelemetry\Sdk\Trace\SpanProcessor\SimpleSpanProcessor;
-use OpenTelemetry\Sdk\Trace\TracerProvider;
+use OpenTelemetry\SDK\Trace\PropagationMap;
+use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
+use OpenTelemetry\SDK\Trace\TracerProvider;
 use OpenTelemetry\Trace as API;
-use Propagators\Aws\Xray\AwsXrayPropagator;
 
 // use Aws\S3\S3Client;
 // use Aws\Exception\AwsException;
@@ -71,7 +71,7 @@
 
 // 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 AwsXrayIdGenerator()))
+$tracer = (new TracerProvider(null, null, new IdGenerator()))
     ->addSpanProcessor(new SimpleSpanProcessor($Exporter))
     ->getTracer('io.opentelemetry.contrib.php');
 
@@ -92,7 +92,7 @@
     // Make an HTTP request to take some time up
     // Carrier is injected into the header to simulate a microservice needing the carrier
     $childSpan = $tracer->startAndActivateSpan('session.generate.http.span.' . microtime(true), API\SpanKind::KIND_CLIENT);
-    AwsXrayPropagator::inject($childSpan->getContext(), $carrier, $map);
+    Propagator::inject($childSpan->getContext(), $carrier, $map);
 
     try {
         $res = $client->request('GET', 'https://aws.amazon.com', ['headers' => $carrier, 'timeout' => 2000,]);
@@ -110,7 +110,7 @@
     echo 'The desired function is currently unavailable';
     // // Create a child span for sdk call
     // $childSpan = $tracer->startAndActivateSpan('session.generate.aws.sdk.span.' . microtime(true), API\SpanKind::KIND_CLIENT);
-    // AwsXrayPropagator::inject($childSpan->getContext(), $carrier, $map);
+    // Propagator::inject($childSpan->getContext(), $carrier, $map);
 
     // // Make a call to aws s3 buckets
     // $s3Client = new S3Client([

examples/aws/sampleApp1/SampleApp1.php

@@ -21,12 +21,12 @@
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use Instrumentation\Aws\Xray\AwsXrayIdGenerator;
+use OpenTelemetry\Aws\Xray\IdGenerator;
+use OpenTelemetry\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
-use OpenTelemetry\Sdk\Trace\PropagationMap;
-use OpenTelemetry\Sdk\Trace\SpanProcessor\SimpleSpanProcessor;
-use OpenTelemetry\Sdk\Trace\TracerProvider;
-use Propagators\Aws\Xray\AwsXrayPropagator;
+use OpenTelemetry\SDK\Trace\PropagationMap;
+use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
+use OpenTelemetry\SDK\Trace\TracerProvider;
 
 /**
  * This is a sample app that makes an http request to aws.amazon.com
@@ -46,7 +46,7 @@
 
 // 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 AwsXrayIdGenerator()))
+$tracer = (new TracerProvider(null, null, new IdGenerator()))
     ->addSpanProcessor(new SimpleSpanProcessor($Exporter))
     ->getTracer('io.opentelemetry.contrib.php');
 
@@ -64,12 +64,12 @@
 
 // TODO: The next step for testing propagation would be to create two separate
 // web application, each making a request from a client front end.
-AwsXrayPropagator::inject($span->getContext(), $carrier, $map);
+Propagator::inject($span->getContext(), $carrier, $map);
 $service1 = new Service1($carrier);
 $childSpanContext = $service1->useService();
 
 // Inject the context of the child span into the carrier to pass to the first service2
-AwsXrayPropagator::inject($childSpanContext, $carrier, $map);
+Propagator::inject($childSpanContext, $carrier, $map);
 $service2 = new Service2($carrier);
 $childSpanContext2 = $service2->useService();
 

examples/aws/sampleApp2/SampleApp2.php

@@ -21,13 +21,13 @@
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use Instrumentation\Aws\Xray\AwsXrayIdGenerator;
+use OpenTelemetry\Aws\Xray\IdGenerator;
+use OpenTelemetry\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
-use OpenTelemetry\Sdk\Trace\PropagationMap;
-use OpenTelemetry\Sdk\Trace\SpanProcessor\SimpleSpanProcessor;
-use OpenTelemetry\Sdk\Trace\TracerProvider;
+use OpenTelemetry\SDK\Trace\PropagationMap;
+use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
+use OpenTelemetry\SDK\Trace\TracerProvider;
 use OpenTelemetry\Trace as API;
-use Propagators\Aws\Xray\AwsXrayPropagator;
 
 class Service1
 {
@@ -48,12 +48,12 @@ public function useService()
 
         // 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 AwsXrayIdGenerator()))
+        $tracer = (new TracerProvider(null, null, new IdGenerator()))
             ->addSpanProcessor(new SimpleSpanProcessor($Exporter))
             ->getTracer('io.opentelemetry.contrib.php');
 
         // Extract the SpanContext from the carrier
-        $spanContext = AwsXrayPropagator::extract($this->carrier, $map);
+        $spanContext = Propagator::extract($this->carrier, $map);
 
         // Do some kind of operation
         $i = 0;

examples/aws/sampleApp2/Service1.php

@@ -21,13 +21,13 @@
 
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use Instrumentation\Aws\Xray\AwsXrayIdGenerator;
+use OpenTelemetry\Aws\Xray\IdGenerator;
+use OpenTelemetry\Aws\Xray\Propagator;
 use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
-use OpenTelemetry\Sdk\Trace\PropagationMap;
-use OpenTelemetry\Sdk\Trace\SpanProcessor\SimpleSpanProcessor;
-use OpenTelemetry\Sdk\Trace\TracerProvider;
+use OpenTelemetry\SDK\Trace\PropagationMap;
+use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
+use OpenTelemetry\SDK\Trace\TracerProvider;
 use OpenTelemetry\Trace as API;
-use Propagators\Aws\Xray\AwsXrayPropagator;
 
 class Service2
 {
@@ -48,12 +48,12 @@ public function useService()
 
         // 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 AwsXrayIdGenerator()))
+        $tracer = (new TracerProvider(null, null, new IdGenerator()))
             ->addSpanProcessor(new SimpleSpanProcessor($Exporter))
             ->getTracer('io.opentelemetry.contrib.php');
 
         // Extract the SpanContext from the carrier
-        $spanContext = AwsXrayPropagator::extract($this->carrier, $map);
+        $spanContext = Propagator::extract($this->carrier, $map);
 
         // Do some kind of operation
         $i = 0;

examples/aws/sampleApp2/Service2.php

@@ -5,10 +5,7 @@ parameters:
     tmpDir: var/cache/phpstan
     level: 5
     paths:
-        - .
-    excludes_analyse:
-        - var
-        - vendor
-        - proto
-        - tests/TraceContext/W3CTestService
-        - examples  # TODO: Remove this once examples are updated
+        - src
+        - tests
+        # - examples  # TODO: Remove this once examples are updated
+