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

Baggage/Baggage.php

@@ -14,24 +14,28 @@ final class Baggage implements BaggageInterface
     private static ?self $emptyBaggage = null;
 
     /** @inheritDoc */
+    #[\Override]
     public static function fromContext(ContextInterface $context): BaggageInterface
     {
         return $context->get(ContextKeys::baggage()) ?? self::getEmpty();
     }
 
     /** @inheritDoc */
+    #[\Override]
     public static function getBuilder(): BaggageBuilderInterface
     {
         return new BaggageBuilder();
     }
 
     /** @inheritDoc */
+    #[\Override]
     public static function getCurrent(): BaggageInterface
     {
         return self::fromContext(Context::getCurrent());
     }
 
     /** @inheritDoc */
+    #[\Override]
     public static function getEmpty(): BaggageInterface
     {
         if (null === self::$emptyBaggage) {
@@ -47,18 +51,21 @@ public function __construct(private readonly array $entries = [])
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function activate(): ScopeInterface
     {
         return Context::getCurrent()->withContextValue($this)->activate();
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function getEntry(string $key): ?Entry
     {
         return $this->entries[$key] ?? null;
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function getValue(string $key)
     {
         if (($entry = $this->getEntry($key)) !== null) {
@@ -69,6 +76,7 @@ public function getValue(string $key)
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function getAll(): iterable
     {
         foreach ($this->entries as $key => $entry) {
@@ -77,18 +85,21 @@ public function getAll(): iterable
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function isEmpty(): bool
     {
         return $this->entries === [];
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function toBuilder(): BaggageBuilderInterface
     {
         return new BaggageBuilder($this->entries);
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function storeInContext(ContextInterface $context): ContextInterface
     {
         return $context->with(ContextKeys::baggage(), $this);

Baggage/BaggageBuilder.php

@@ -12,6 +12,7 @@ public function __construct(private array $entries = [])
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function remove(string $key): BaggageBuilderInterface
     {
         unset($this->entries[$key]);
@@ -20,6 +21,7 @@ public function remove(string $key): BaggageBuilderInterface
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function set(string $key, $value, ?MetadataInterface $metadata = null): BaggageBuilderInterface
     {
         if ($key === '') {
@@ -32,6 +34,7 @@ public function set(string $key, $value, ?MetadataInterface $metadata = null): B
         return $this;
     }
 
+    #[\Override]
     public function build(): BaggageInterface
     {
         return new Baggage($this->entries);

Baggage/Metadata.php

@@ -17,6 +17,7 @@ public function __construct(private readonly string $metadata)
     {
     }
 
+    #[\Override]
     public function getValue(): string
     {
         return $this->metadata;

Baggage/Propagation/BaggagePropagator.php

@@ -34,11 +34,13 @@ public static function getInstance(): self
         return self::$instance;
     }
 
+    #[\Override]
     public function fields(): array
     {
         return [self::BAGGAGE];
     }
 
+    #[\Override]
     public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?ContextInterface $context = null): void
     {
         $setter ??= ArrayAccessGetterSetter::getInstance();
@@ -70,6 +72,7 @@ public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?C
         }
     }
 
+    #[\Override]
     public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface
     {
         $getter ??= ArrayAccessGetterSetter::getInstance();

Behavior/Internal/LogWriter/ErrorLogWriter.php

@@ -6,6 +6,7 @@
 
 class ErrorLogWriter implements LogWriterInterface
 {
+    #[\Override]
     public function write($level, string $message, array $context): void
     {
         error_log(Formatter::format($level, $message, $context));

Behavior/Internal/LogWriter/NoopLogWriter.php

@@ -6,6 +6,7 @@
 
 class NoopLogWriter implements LogWriterInterface
 {
+    #[\Override]
     public function write($level, string $message, array $context): void
     {
         //do nothing

Behavior/Internal/LogWriter/Psr3LogWriter.php

@@ -12,6 +12,7 @@ public function __construct(private readonly LoggerInterface $logger)
     {
     }
 
+    #[\Override]
     public function write($level, string $message, array $context): void
     {
         $this->logger->log($level, $message, $context);

Behavior/Internal/LogWriter/StreamLogWriter.php

@@ -18,6 +18,7 @@ public function __construct(string $destination)
         }
     }
 
+    #[\Override]
     public function write($level, string $message, array $context): void
     {
         fwrite($this->stream, Formatter::format($level, $message, $context));

Common/Time/SystemClock.php

@@ -25,6 +25,7 @@ public static function create(): self
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function now(): int
     {
         return self::$referenceTime + hrtime(true);
@@ -47,6 +48,6 @@ private static function init(): void
      */
     private static function calculateReferenceTime(float $wallClockMicroTime, int $upTime): int
     {
-        return ((int) ($wallClockMicroTime * ClockInterface::NANOS_PER_SECOND)) - $upTime;
+        return ((int) ($wallClockMicroTime * (float) ClockInterface::NANOS_PER_SECOND)) - $upTime;
     }
 }

Common/Time/TestClock.php

@@ -33,6 +33,7 @@ public function setTime(int $nanoSeconds): void
         $this->currentEpochNanos = $nanoSeconds;
     }
 
+    #[\Override]
     public function now(): int
     {
         return $this->currentEpochNanos;