Remove runkit7 dependency and update activate method implementation

Author: carolabadeer

.github/workflows/php.yml

@@ -25,7 +25,7 @@ jobs:
         php-version: ${{ matrix.php-version }}
         coverage: xdebug
         tools: php-cs-fixer
-        extensions: ast, grpc, runkit7
+        extensions: ast, grpc
 
     - name: Validate composer.json and composer.lock
       run: composer validate

composer.json

@@ -16,6 +16,7 @@
         "ext-json": "*",
         "open-telemetry/opentelemetry": "^0.0.15",
         "php-http/discovery": "^1.14",
+        "aws/aws-sdk-php": "^3.232",
         "php-http/message": "^1.12"
     },
     "replace": {
@@ -61,8 +62,7 @@
     "suggest": {
         "symfony/config": "Needed to use otel-sdk-bundle",
         "symfony/dependency-injection": "Needed to use otel-sdk-bundle",
-        "symfony/options-resolver": "Needed to use otel-sdk-bundle",
-        "runkit7": "Needed to use AWS SDK Instrumentation"
+        "symfony/options-resolver": "Needed to use otel-sdk-bundle"
     },
     "scripts": {
         "post-install-cmd": [

src/Instrumentation/AwsSdk/AwsGlobal.php

@@ -4,11 +4,15 @@
 
 namespace OpenTelemetry\Instrumentation\AwsSdk;
 
+use Aws\Middleware;
+use Aws\ResultInterface;
 use OpenTelemetry\API\Common\Instrumentation\InstrumentationInterface;
 use OpenTelemetry\API\Common\Instrumentation\InstrumentationTrait;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\TracerInterface;
 use OpenTelemetry\API\Trace\TracerProviderInterface;
+
+use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 
 /**
@@ -23,6 +27,7 @@ class AwsSdkInstrumentation implements InstrumentationInterface
     public const SPAN_KIND = SpanKind::KIND_CLIENT;
     private TextMapPropagatorInterface $propagator;
     private TracerProviderInterface $tracerProvider;
+    private $clients = [] ;
 
     public function getName(): string
     {
@@ -69,52 +74,56 @@ public function getTracer(): TracerInterface
         return $this->tracerProvider->getTracer('io.opentelemetry.contrib.php');
     }
 
-    public function activate(): bool
+    public function getContext():Context
     {
-        AwsGlobal::setInstrumentation($this);
+        return Context::getRoot();
+    }
 
+    public function instrumentClients($clientsArray) : void
+    {
+        $this->clients = $clientsArray;
+    }
+
+    public function activate(): bool
+    {
         try {
-            runkit7_method_copy('Aws\AwsClient', '__call_copy', 'Aws\AwsClient', '__call');
-            runkit7_method_copy('Aws\AwsClient', 'executeAsync_copy', 'Aws\AwsClient', 'executeAsync');
-
-            runkit7_method_redefine(
-                'Aws\AwsClient',
-                '__call',
-                '$name, $args',
-                '   
-                
-                $tracer = \OpenTelemetry\Instrumentation\AwsSdk\AwsGlobal::getInstrumentation()->getTracer();
+            $middleware = Middleware::tap(function ($cmd, $req) {
+                $tracer = $this->getTracer();
+                $propagator = $this->getPropagator();
+
                 $carrier = [];
-                
-                $this->span = $tracer->spanBuilder($this->getApi()->getServiceName() . "." . $name)->setSpanKind(\OpenTelemetry\Instrumentation\AwsSdk\AwsSdkInstrumentation::SPAN_KIND)->startSpan();
+
+                $this->span = $tracer->spanBuilder($this->clientName . '.' . $cmd->getName())->setSpanKind(AwsSdkInstrumentation::SPAN_KIND)->startSpan();
                 $this->scope = $this->span->activate();
-                
-                $propagator = \OpenTelemetry\Instrumentation\AwsSdk\AwsGlobal::getInstrumentation()->getPropagator();
-                $propagator->inject($carrier);
-                
+
+                $propagator->inject($carrier, null, $this->getContext());
+
+                $this->span->setAttributes([
+                    'rpc.method' => $cmd->getName(),
+                    'rpc.service' => $this->clientName,
+                    'rpc.system' => 'aws-api',
+                    'aws.region' => $this->region,
+                    ]);
+            });
+
+            $end_middleware = Middleware::mapResult(function (ResultInterface $result) {
                 $this->span->setAttributes([
-                    "rpc.method" => $name,
-                    "rpc.service" => $this->getApi()->getServiceName(),
-                    "rpc.system" => "aws-api",
-                    "aws.region" => $this->getRegion()
+                    'http.status_code' => $result['@metadata']['statusCode'],
                 ]);
-                
-                return $this->__call_copy($name, $args);
-                    
-                
-                ',
-            );
-
-            runkit7_method_redefine(
-                'Aws\AwsClient',
-                'executeAsync',
-                '$command',
-                ' 
-                    $this->scope->detach();
-                    $this->span->end();
-                    return $this->executeAsync_copy($command);
-                ',
-            );
+
+                $this->span->end();
+                $this->scope->detach();
+
+                return $result;
+            });
+
+            foreach ($this->clients as $client) {
+                $this->clientName = $client->getApi()->getServiceName();
+                $this->region = $client->getRegion();
+
+                $client->getHandlerList()->prependInit($middleware, 'instrumentation');
+                $client->getHandlerList()->appendSign($end_middleware, 'end_instrumentation');
+            }
         } catch (\Throwable $e) {
             return false;
         }