fixing api breakages

the SDK BC layer only works if the SDK is installed :(
open-telemetry · Jun 26, 2023 · 041f049 · 041f049
1 parent ce970de
commit 041f049
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,8 @@ help: ## Show this help
 	@echo "example: PROJECT=Aws PHP_VERSION=8.1 make <command>"
 	@printf "\033[33m%s:\033[0m\n" 'Available commands'
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {printf "  \033[32m%-18s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
-all: update style validate phan psalm phpstan test ## Everything
+all-checks: style validate phan psalm phpstan test
+all: update all-checks ## Everything
 build: ## Build image
 	$(DOCKER_COMPOSE) build --build-arg PHP_VERSION php
 install: ## Install dependencies

diff --git a/src/Aws/src/AwsSdkInstrumentation.php b/src/Aws/src/AwsSdkInstrumentation.php
@@ -6,8 +6,8 @@
 
 use Aws\Middleware;
 use Aws\ResultInterface;
-use OpenTelemetry\API\Common\Instrumentation\InstrumentationInterface;
-use OpenTelemetry\API\Common\Instrumentation\InstrumentationTrait;
+use OpenTelemetry\API\Instrumentation\InstrumentationInterface;
+use OpenTelemetry\API\Instrumentation\InstrumentationTrait;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\TracerInterface;
@@ -98,6 +98,7 @@ public function activate(): bool
 
                 $propagator->inject($carrier);
 
+                /** @psalm-suppress PossiblyInvalidArgument  */
                 $this->span->setAttributes([
                     'rpc.method' => $cmd->getName(),
                     'rpc.service' => $this->clientName,
@@ -106,6 +107,7 @@ public function activate(): bool
                     ]);
             });
 
+            /** @psalm-suppress PossiblyInvalidArgument */
             $end_middleware = Middleware::mapResult(function (ResultInterface $result) {
                 $this->span->setAttributes([
                     'http.status_code' => $result['@metadata']['statusCode'], //@phan-suppress-current-line PhanTypeMismatchDimFetch

diff --git a/src/Aws/src/Xray/Propagator.php b/src/Aws/src/Xray/Propagator.php
@@ -140,7 +140,7 @@ public function extract($carrier, PropagationGetterInterface $getter = null, Con
         $spanContext = SpanContext::createFromRemoteParent(
             $parsedTraceId,
             $parsedSpanId,
-            self::IS_SAMPLED === $sampledFlag ? API\SpanContextInterface::TRACE_FLAG_SAMPLED : API\SpanContextInterface::TRACE_FLAG_DEFAULT
+            self::IS_SAMPLED === $sampledFlag ? API\TraceFlags::SAMPLED : API\TraceFlags::DEFAULT
         );
 
         if ($spanContext->isValid()) {

diff --git a/src/Instrumentation/HttpAsyncClient/composer.json b/src/Instrumentation/HttpAsyncClient/composer.json
@@ -36,5 +36,10 @@
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
     "vimeo/psalm": "^4.0"
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false
+    }
   }
 }
diff --git a/src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php b/src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php
@@ -6,8 +6,8 @@
 
 use Http\Client\HttpAsyncClient;
 use Http\Promise\Promise;
-use OpenTelemetry\API\Common\Instrumentation;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
@@ -37,7 +37,7 @@ public static function register(): void
                     return null;
                 }
 
-                $propagator = Instrumentation\Globals::propagator();
+                $propagator = Globals::propagator();
                 $parentContext = Context::getCurrent();
 
                 /** @psalm-suppress ArgumentTypeCoercion */

diff --git a/src/Instrumentation/Laravel/src/QueryWatcher.php b/src/Instrumentation/Laravel/src/QueryWatcher.php
@@ -53,6 +53,7 @@ public function recordQuery(QueryExecuted $query): void
         ];
 
         $attributes[TraceAttributes::DB_STATEMENT] = $query->sql;
+        /** @psalm-suppress PossiblyInvalidArgument */
         $span->setAttributes($attributes);
         $span->end($nowInNs);
     }

diff --git a/src/Instrumentation/Laravel/tests/app/Providers/EventServiceProvider.php b/src/Instrumentation/Laravel/tests/app/Providers/EventServiceProvider.php
@@ -7,7 +7,6 @@
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

diff --git a/src/Instrumentation/PDO/src/PDOInstrumentation.php b/src/Instrumentation/PDO/src/PDOInstrumentation.php
@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\PDO;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanBuilderInterface;
 use OpenTelemetry\API\Trace\SpanKind;

diff --git a/src/Instrumentation/Psr15/composer.json b/src/Instrumentation/Psr15/composer.json
@@ -34,5 +34,10 @@
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
     "vimeo/psalm": "^4.0"
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false
+    }
   }
 }
diff --git a/src/Instrumentation/Psr15/src/Psr15Instrumentation.php b/src/Instrumentation/Psr15/src/Psr15Instrumentation.php
@@ -4,8 +4,8 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\Psr15;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;

diff --git a/src/Instrumentation/Psr18/composer.json b/src/Instrumentation/Psr18/composer.json
@@ -34,5 +34,10 @@
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
     "vimeo/psalm": "^4.0"
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false
+    }
   }
 }
diff --git a/src/Instrumentation/Psr18/src/Psr18Instrumentation.php b/src/Instrumentation/Psr18/src/Psr18Instrumentation.php
@@ -5,8 +5,8 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Psr18;
 
 use function get_cfg_var;
-use OpenTelemetry\API\Common\Instrumentation;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
@@ -40,7 +40,7 @@ public static function register(): void
                     return null;
                 }
 
-                $propagator = Instrumentation\Globals::propagator();
+                $propagator = Globals::propagator();
                 $parentContext = Context::getCurrent();
 
                 /** @psalm-suppress ArgumentTypeCoercion */
@@ -52,7 +52,7 @@ public static function register(): void
                     ->setAttribute(TraceAttributes::HTTP_URL, (string) $request->getUri())
                     ->setAttribute(TraceAttributes::HTTP_METHOD, $request->getMethod())
                     ->setAttribute(TraceAttributes::HTTP_FLAVOR, $request->getProtocolVersion())
-                    ->setAttribute(TraceAttributes::HTTP_USER_AGENT, $request->getHeaderLine('User-Agent'))
+                    ->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $request->getHeaderLine('User-Agent'))
                     ->setAttribute(TraceAttributes::HTTP_REQUEST_CONTENT_LENGTH, $request->getHeaderLine('Content-Length'))
                     ->setAttribute(TraceAttributes::NET_PEER_NAME, $request->getUri()->getHost())
                     ->setAttribute(TraceAttributes::NET_PEER_PORT, $request->getUri()->getPort())

diff --git a/src/Instrumentation/Slim/.php-cs-fixer.php b/src/Instrumentation/Slim/.php-cs-fixer.php
@@ -36,7 +36,7 @@
     'phpdoc_scalar' => true,
     'phpdoc_types' => true,
     'short_scalar_cast' => true,
-    'single_blank_line_before_namespace' => true,
+    'blank_lines_before_namespace' => true,
     'single_quote' => true,
     'trailing_comma_in_multiline' => true,
     ])

diff --git a/src/Instrumentation/Slim/composer.json b/src/Instrumentation/Slim/composer.json
@@ -42,5 +42,10 @@
     "psr-4": {
       "OpenTelemetry\\Tests\\Instrumentation\\Slim\\": "tests/"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false
+    }
   }
 }
diff --git a/src/Instrumentation/Slim/src/SlimInstrumentation.php b/src/Instrumentation/Slim/src/SlimInstrumentation.php
@@ -4,8 +4,8 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\Slim;
 
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
-use OpenTelemetry\API\Common\Instrumentation\Globals;
+use OpenTelemetry\API\Globals;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;