fixing CI complaints (#1666)

* fixing psalm complaints
use rector (and psalm) to add Override attributes, and add symfony polyfill to
provide Override in earlier php versions

* fixing more psalm complaints

* more fixes

* adding stubs for deptrac
there are some things in our code that deptrac doesn't understand or are missing
for some php versions. stub them to quieten all those violation warnings

* why not cache invalid :(

* display tools versions

* fix tools cache key

* changing cache key

* dont complain about unused psalm suppressions

* suppress invalid attribute

* quieten phpstan php8.5 complaints

* revert previous commit...now other php versions complain about an unused ignore :(

* revert typecasting in metrics aggregators

* Update src/Contrib/Otlp/ProtobufSerializer.php

Co-authored-by: Chris Lightfoot-Wild <[email protected]>

* remove override stub and use the polyfill from deptrac

---------

Co-authored-by: Chris Lightfoot-Wild <[email protected]>

Author: brettmc

Common/Adapter/HttpDiscovery/DependencyResolver.php

@@ -41,41 +41,49 @@ public static function create(
         return new self($messageFactoryResolver, $psrClientResolver, $httpPlugClientResolver);
     }
 
+    #[\Override]
     public function resolveRequestFactory(): RequestFactoryInterface
     {
         return $this->messageFactoryResolver->resolveRequestFactory();
     }
 
+    #[\Override]
     public function resolveResponseFactory(): ResponseFactoryInterface
     {
         return $this->messageFactoryResolver->resolveResponseFactory();
     }
 
+    #[\Override]
     public function resolveServerRequestFactory(): ServerRequestFactoryInterface
     {
         return $this->messageFactoryResolver->resolveServerRequestFactory();
     }
 
+    #[\Override]
     public function resolveStreamFactory(): StreamFactoryInterface
     {
         return $this->messageFactoryResolver->resolveStreamFactory();
     }
 
+    #[\Override]
     public function resolveUploadedFileFactory(): UploadedFileFactoryInterface
     {
         return $this->messageFactoryResolver->resolveUploadedFileFactory();
     }
 
+    #[\Override]
     public function resolveUriFactory(): UriFactoryInterface
     {
         return $this->messageFactoryResolver->resolveUriFactory();
     }
 
+    #[\Override]
     public function resolveHttpPlugAsyncClient(): HttpAsyncClient
     {
         return $this->httpPlugClientResolver->resolveHttpPlugAsyncClient();
     }
 
+    #[\Override]
     public function resolvePsrClient(): ClientInterface
     {
         return $this->psrClientResolver->resolvePsrClient();

Common/Adapter/HttpDiscovery/HttpPlugClientResolver.php

@@ -19,6 +19,7 @@ public static function create(?HttpAsyncClient $httpAsyncClient = null): self
         return new self($httpAsyncClient);
     }
 
+    #[\Override]
     public function resolveHttpPlugAsyncClient(): HttpAsyncClient
     {
         return $this->httpAsyncClient ??= HttpAsyncClientDiscovery::find();

Common/Adapter/HttpDiscovery/MessageFactoryResolver.php

@@ -43,31 +43,37 @@ public static function create(
         );
     }
 
+    #[\Override]
     public function resolveRequestFactory(): RequestFactoryInterface
     {
         return $this->requestFactory ??= Psr17FactoryDiscovery::findRequestFactory();
     }
 
+    #[\Override]
     public function resolveResponseFactory(): ResponseFactoryInterface
     {
         return $this->responseFactory ??= Psr17FactoryDiscovery::findResponseFactory();
     }
 
+    #[\Override]
     public function resolveServerRequestFactory(): ServerRequestFactoryInterface
     {
         return $this->serverRequestFactory ??= Psr17FactoryDiscovery::findServerRequestFactory();
     }
 
+    #[\Override]
     public function resolveStreamFactory(): StreamFactoryInterface
     {
         return $this->streamFactory ??= Psr17FactoryDiscovery::findStreamFactory();
     }
 
+    #[\Override]
     public function resolveUploadedFileFactory(): UploadedFileFactoryInterface
     {
         return $this->uploadedFileFactory ??= Psr17FactoryDiscovery::findUploadedFileFactory();
     }
 
+    #[\Override]
     public function resolveUriFactory(): UriFactoryInterface
     {
         return $this->uriFactory ??= Psr17FactoryDiscovery::findUriFactory();

Common/Adapter/HttpDiscovery/PsrClientResolver.php

@@ -19,6 +19,7 @@ public static function create(?ClientInterface $client = null): self
         return new self($client);
     }
 
+    #[\Override]
     public function resolvePsrClient(): ClientInterface
     {
         return $this->client ??= Psr18ClientDiscovery::find();

Common/Attribute/AttributeValidator.php

@@ -21,6 +21,7 @@ class AttributeValidator implements AttributeValidatorInterface
      * Validate whether a value is a primitive, or a homogeneous array of primitives (treating int/double as equivalent).
      * @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/common/README.md#attribute
      */
+    #[\Override]
     public function validate($value): bool
     {
         if (is_array($value)) {
@@ -51,6 +52,7 @@ private function validateArray(array $value): bool
         return true;
     }
 
+    #[\Override]
     public function getInvalidMessage(): string
     {
         return 'attribute with non-primitive or non-homogeneous array of primitives dropped';

Common/Attribute/Attributes.php

@@ -33,39 +33,46 @@ public static function factory(?int $attributeCountLimit = null, ?int $attribute
         return new AttributesFactory($attributeCountLimit, $attributeValueLengthLimit);
     }
 
+    #[\Override]
     public function has(string $name): bool
     {
         return array_key_exists($name, $this->attributes);
     }
 
+    #[\Override]
     public function get(string $name)
     {
         return $this->attributes[$name] ?? null;
     }
 
     /** @psalm-mutation-free */
+    #[\Override]
     public function count(): int
     {
         return \count($this->attributes);
     }
 
+    #[\Override]
     public function jsonSerialize(): mixed
     {
         return $this->attributes;
     }
 
+    #[\Override]
     public function getIterator(): Traversable
     {
         foreach ($this->attributes as $key => $value) {
             yield (string) $key => $value;
         }
     }
 
+    #[\Override]
     public function toArray(): array
     {
         return $this->attributes;
     }
 
+    #[\Override]
     public function getDroppedAttributesCount(): int
     {
         return $this->droppedAttributesCount;

Common/Attribute/AttributesBuilder.php

@@ -22,11 +22,13 @@ public function __construct(private array $attributes, private ?int $attributeCo
     {
     }
 
+    #[\Override]
     public function build(): AttributesInterface
     {
         return new Attributes($this->attributes, $this->droppedAttributesCount);
     }
 
+    #[\Override]
     public function merge(AttributesInterface $old, AttributesInterface $updating): AttributesInterface
     {
         $new = $old->toArray();
@@ -42,6 +44,7 @@ public function merge(AttributesInterface $old, AttributesInterface $updating):
         return new Attributes($new, $dropped);
     }
 
+    #[\Override]
     public function offsetExists($offset): bool
     {
         return array_key_exists($offset, $this->attributes);
@@ -50,6 +53,7 @@ public function offsetExists($offset): bool
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
      */
+    #[\Override]
     public function offsetGet($offset): mixed
     {
         return $this->attributes[$offset] ?? null;
@@ -58,6 +62,7 @@ public function offsetGet($offset): mixed
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
      */
+    #[\Override]
     public function offsetSet($offset, $value): void
     {
         if ($offset === null) {
@@ -86,6 +91,7 @@ public function offsetSet($offset, $value): void
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
      */
+    #[\Override]
     public function offsetUnset($offset): void
     {
         unset($this->attributes[$offset]);

Common/Attribute/AttributesFactory.php

@@ -15,6 +15,7 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function builder(iterable $attributes = [], ?AttributeValidatorInterface $attributeValidator = null): AttributesBuilderInterface
     {
         $builder = new AttributesBuilder(

Common/Attribute/LogRecordAttributeValidator.php

@@ -6,11 +6,13 @@
 
 class LogRecordAttributeValidator implements AttributeValidatorInterface
 {
+    #[\Override]
     public function validate($value): bool
     {
         return true;
     }
 
+    #[\Override]
     public function getInvalidMessage(): string
     {
         //not required as this validator always returns true

Common/Configuration/EnvComponentLoaderRegistry.php

@@ -41,6 +41,7 @@ public function register(EnvComponentLoader $loader): EnvComponentLoaderRegistry
         return $this;
     }
 
+    #[\Override]
     public function load(string $type, string $name, EnvResolver $env, Context $context): mixed
     {
         if (!$loader = $this->loaders[$type][$name] ?? null) {