fixing CI complaints

.github/workflows/php.yml

@@ -87,57 +87,71 @@ jobs:
       uses: actions/cache@v4
       with:
         path: vendor
-        key: ${{ runner.os }}-${{ matrix.php-version }}-php-${{ hashFiles('**/composer.json') }}
+        key: ${{ runner.os }}-${{ matrix.php-version }}-vendor-${{ hashFiles('composer.json') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.php-version }}-php-
+          ${{ runner.os }}-${{ matrix.php-version }}-vendor-
     - name: Cache test tools
       id: test-tools-cache
       uses: actions/cache@v4
       with:
         path: vendor-bin
-        key: ${{ runner.os }}-${{ matrix.php-version }}-php-${{ hashFiles('**/composer.json') }}
+        key: ${{ runner.os }}-${{ matrix.php-version }}-vendor-bin-${{ hashFiles('vendor-bin/*/composer.json') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.php-version }}-php-
+          ${{ runner.os }}-${{ matrix.php-version }}-vendor-bin-
 
     - name: Install dependencies
       id: composer
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress ${{ matrix.composer_args }}
+      run: |
+        composer --version
+        composer install --prefer-dist --no-progress ${{ matrix.composer_args }}
 
     - name: Check Style
       id: style
       continue-on-error: ${{ matrix.experimental }}
       env:
         PHP_CS_FIXER_IGNORE_ENV: 1
-      run: vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no -vvv
+      run: |
+        vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer --version
+        vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no -vvv
 
     - name: Check Dependencies
       id: deps
       continue-on-error: ${{ matrix.experimental }}
-      run: vendor-bin/deptrac/vendor/bin/deptrac --formatter=github-actions --report-uncovered
+      run: |
+        vendor-bin/deptrac/vendor/bin/deptrac --version
+        vendor-bin/deptrac/vendor/bin/deptrac --formatter=github-actions --report-uncovered
 
     - name: Run Phan
       id: phan
       continue-on-error: ${{ matrix.experimental }}
       env:
         XDEBUG_MODE: off
         PHAN_DISABLE_XDEBUG_WARN: 1
-      run: vendor-bin/phan/vendor/bin/phan
+      run: |
+        vendor-bin/phan/vendor/bin/phan --version
+        vendor-bin/phan/vendor/bin/phan
 
     - name: Run Psalm
       id: psalm
       continue-on-error: ${{ matrix.experimental }}
-      run: vendor-bin/psalm/vendor/bin/psalm --output-format=github
+      run: |
+        vendor-bin/psalm/vendor/bin/psalm --version
+        vendor-bin/psalm/vendor/bin/psalm --output-format=github
 
     - name: Run Phpstan
       id: phpstan
       continue-on-error: ${{ matrix.experimental }}
-      run: vendor/bin/phpstan analyse --error-format=github
+      run: |
+        vendor/bin/phpstan --version
+        vendor/bin/phpstan analyse --error-format=github
 
     - name: Run PHPUnit (unit tests)
       id: unit
       continue-on-error: ${{ matrix.experimental }}
-      run: php -dzend.assertions=1 vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover --testsuite unit
+      run: |
+        vendor/bin/phpunit --version
+        php -dzend.assertions=1 vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover --testsuite unit
 
     - name: Run PHPUnit (integration tests)
       id: integration

.phan/config.php

@@ -286,6 +286,7 @@
         'PhanAccessPropertyInternal',
         'PhanTypeMismatchPropertyReal',
         'PhanTemplateTypeNotUsedInFunctionReturn',
+        'PhanUndeclaredClassAttribute',
     ],
 
     // A regular expression to match files to be excluded

Makefile

@@ -5,6 +5,7 @@ DOCKER_COMPOSE ?= docker compose
 DC_RUN_PHP = $(DOCKER_COMPOSE) run --rm php
 
 .DEFAULT_GOAL : help
+.PHONY: deptrac
 
 help: ## Show this help
 	@printf "\033[33m%s:\033[0m\n" 'Available commands'

composer.json

@@ -20,6 +20,8 @@
         "symfony/config": "^5.4 || ^6.4 || ^7.0",
         "symfony/polyfill-mbstring": "^1.23",
         "symfony/polyfill-php82": "^1.26",
+        "symfony/polyfill-php83": "^1.32",
+        "symfony/polyfill-php84": "^1.32",
         "tbachert/spi": "^1.0.1"
     },
     "config": {
@@ -98,7 +100,7 @@
         "open-telemetry/dev-tools": "dev-main",
         "php-http/mock-client": "^1.5",
         "phpdocumentor/reflection-docblock": "^5.3",
-        "phpspec/prophecy": "^1.17.0",
+        "phpspec/prophecy": "^1.22",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/phpstan": "^1.10.13",
         "phpstan/phpstan-mockery": "^1.1",

deptrac.yaml

@@ -14,6 +14,7 @@ deptrac:
         - ./src
         - ./proto
         - ./tests
+        - ./deptrac/stubs
     exclude_files:
         - '#.*test.*#'
     layers:
@@ -109,10 +110,15 @@ deptrac:
           collectors:
               - type: className
                 regex: ^Nyholm\\Psr7Server\\*
+      -   name: Stubs
+          collectors:
+              - type: directory
+                value: deptrac/stubs/.*
 
     ruleset:
       Context:
           - FFI
+          - Stubs
       SemConv: ~
       ConfigSDK:
           - SymfonyConfig
@@ -124,10 +130,12 @@ deptrac:
           - Context
           - Contrib
           - Extension
+          - Stubs
       API:
           - Context
           - PsrLog
           - SPI
+          - Stubs
       SDK:
           - +API
           - ConfigSDK

deptrac/stubs/ComponentPlugin.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenTelemetry\Config\SDK\Configuration;
+
+class ComponentPlugin {}

deptrac/stubs/ComponentProvider.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenTelemetry\Config\SDK\Configuration;
+
+class ComponentProvider {}

deptrac/stubs/ComponentProviderRegistry.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenTelemetry\Config\SDK\Configuration;
+
+class ComponentProviderRegistry {}

deptrac/stubs/Context.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenTelemetry\Config\SDK\Configuration;
+
+class Context {}

deptrac/stubs/Override.php

@@ -0,0 +1,10 @@
+<?php
+
+//stub Override attribute for PHP <8.3
+
+namespace {
+    if (!class_exists('Override')) {
+        #[\Attribute(\Attribute::TARGET_METHOD)]
+        final class Override {}
+    }
+}

deptrac/stubs/README.md

@@ -0,0 +1,2 @@
+Stubs for deptrac, which represent classes missing from some PHP versions, or classes
+that deptrac does not understand.

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2 AS composer
+FROM composer:2.8 AS composer
 FROM debian:bullseye
 WORKDIR /usr/src/myapp
 
@@ -38,7 +38,7 @@ RUN apt-get install -y \
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
-RUN echo ";grpc.enable_fork_support = 1" > $(php-config --ini-dir)/40-otel-dev.ini \
+RUN echo "grpc.enable_fork_support = 1" > $(php-config --ini-dir)/40-otel-dev.ini \
   && echo "grpc.poll_strategy = epoll1" >> $(php-config --ini-dir)/40-otel-dev.ini \
   && echo "zend.assertions = 1" >> $(php-config --ini-dir)/40-otel-dev.ini
 

examples/autoload_sdk_with_custom_transport.php

@@ -24,21 +24,26 @@
  * @psalm-suppress MissingTemplateParam
  */
 $factory = new class() implements \OpenTelemetry\SDK\Common\Export\TransportFactoryInterface {
+    #[\Override]
     public function create(string $endpoint, string $contentType, array $headers = [], $compression = null, float $timeout = 10., int $retryDelay = 100, int $maxRetries = 3, ?string $cacert = null, ?string $cert = null, ?string $key = null): \OpenTelemetry\SDK\Common\Export\TransportInterface
     {
         return new class() implements \OpenTelemetry\SDK\Common\Export\TransportInterface {
+            #[\Override]
             public function contentType(): string
             {
                 return 'application/x-protobuf';
             }
+            #[\Override]
             public function send(string $payload, ?\OpenTelemetry\SDK\Common\Future\CancellationInterface $cancellation = null): \OpenTelemetry\SDK\Common\Future\FutureInterface
             {
                 return new \OpenTelemetry\SDK\Common\Future\CompletedFuture(null);
             }
+            #[\Override]
             public function shutdown(?\OpenTelemetry\SDK\Common\Future\CancellationInterface $cancellation = null): bool
             {
                 return true;
             }
+            #[\Override]
             public function forceFlush(?\OpenTelemetry\SDK\Common\Future\CancellationInterface $cancellation = null): bool
             {
                 return true;

examples/logs/features/monolog-otel-integration.php

@@ -50,6 +50,7 @@ public function __construct(string $level, bool $bubble = true, ?LoggerProviderI
         $this->logger = $provider->getLogger('monolog-demo', null, null, ['logging.library' => 'monolog']);
     }
 
+    #[\Override]
     protected function write(MonologLogRecord $record): void
     {
         $this->logger->emit($this->convert($record));
@@ -59,7 +60,7 @@ private function convert(MonologLogRecord $record): LogRecord
     {
         return (new LogRecord($record['message']))
             ->setSeverityText($record->level->toPsrLogLevel())
-            ->setTimestamp((int) (microtime(true) * LogRecord::NANOS_PER_SECOND))
+            ->setTimestamp((int) (microtime(true) * (float) LogRecord::NANOS_PER_SECOND))
             ->setObservedTimestamp((int) $record->datetime->format('U') * LogRecord::NANOS_PER_SECOND)
             ->setSeverityNumber(Severity::fromPsr3($record->level->toPsrLogLevel()))
             ->setAttributes($record->context + $record->extra);

examples/src/ExampleConfigLoader.php

@@ -15,13 +15,15 @@
  */
 final class ExampleConfigLoader implements EnvComponentLoader
 {
+    #[\Override]
     public function load(EnvResolver $env, EnvComponentLoaderRegistry $registry, Context $context): InstrumentationConfiguration
     {
         return new ExampleConfig(
             spanName: $env->string('OTEL_PHP_EXAMPLE_INSTRUMENTATION_SPAN_NAME') ?? 'example',
         );
     }
 
+    #[\Override]
     public function name(): string
     {
         return ExampleConfig::class;

examples/src/ExampleConfigProvider.php

@@ -24,6 +24,7 @@ final class ExampleConfigProvider implements ComponentProvider
      *     enabled: bool,
      * } $properties
      */
+    #[\Override]
     public function createPlugin(array $properties, Context $context): InstrumentationConfiguration
     {
         return new ExampleConfig(
@@ -35,6 +36,7 @@ public function createPlugin(array $properties, Context $context): Instrumentati
     /**
      * @psalm-suppress UndefinedInterfaceMethod,PossiblyNullReference
      */
+    #[\Override]
     public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
     {
         $node = $builder->arrayNode('example_instrumentation');

examples/src/ExampleInstrumentation.php

@@ -13,6 +13,7 @@
 
 final class ExampleInstrumentation implements Instrumentation
 {
+    #[\Override]
     public function register(HookManagerInterface $hookManager, ConfigProperties $configuration, InstrumentationContext $context): void
     {
         $config = $configuration->get(ExampleConfig::class) ?? new ExampleConfig();

examples/traces/exporters/otlp_file.php

@@ -15,6 +15,9 @@
 
 $filename = sys_get_temp_dir() . '/traces.jsonl';
 $file = fopen($filename, 'a');
+if ($file === false) {
+    throw new \RuntimeException('Failed to open file for writing: ' . $filename);
+}
 $transport = (new StreamTransportFactory())->create($file, ContentTypes::NDJSON);
 $exporter = new SpanExporter($transport);
 

phpstan.neon.dist

@@ -54,4 +54,4 @@ parameters:
         -
             message: "#.*expects Google\\\\Protobuf\\\\RepeatedField.*#"
             paths:
-                - src/Contrib/Otlp
+                - src/Contrib/Otlp