Drop PHP 7.4 support

.github/workflows/php.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
         experimental: [false]
         composer_args: [""]
         include:
@@ -138,4 +138,5 @@ jobs:
     needs: php
     with:
       matrix_extension: '["ast, json, grpc"]'
+      matrix_php_version: '["8.0", "8.1", "8.2", "8.3"]'
       install_directory: '~/.test/.packages'

.github/workflows/publish-otel-php-base-docker-image.yml

@@ -8,7 +8,7 @@ jobs:
     name: OpenTelemetry PHP base docker image creation
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     runs-on: ubuntu-latest
     permissions:
       packages: write

.phan/config.php

@@ -44,7 +44,7 @@
     //
     // Note that the **only** effect of choosing `'5.6'` is to infer that functions removed in php 7.0 exist.
     // (See `backward_compatibility_checks` for additional options)
-    'target_php_version' => '7.4',
+    'target_php_version' => '8.0',
 
     // If enabled, missing properties will be created when
     // they are first seen. If false, we'll report an

.php-cs-fixer.php

@@ -25,10 +25,10 @@
     'blank_line_before_statement' => true,
     'cast_spaces' => true,
     'declare_strict_types' => true,
-    'function_typehint_space' => true,
+    'type_declaration_spaces' => true,
     'include' => true,
     'lowercase_cast' => true,
-    'new_with_braces' => true,
+    'new_with_parentheses' => true,
     'no_extra_blank_lines' => true,
     'no_leading_import_slash' => true,
     'no_trailing_whitespace' => true,
@@ -41,9 +41,9 @@
     '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,
+    'trailing_comma_in_multiline' => ['elements' => ['arrays', 'parameters', 'match']],
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);

DEVELOPMENT.md

@@ -71,8 +71,8 @@ This does the following things:
 ### Other PHP versions
 
 We aim to support officially supported PHP versions, according to https://www.php.net/supported-versions.php. The
-developer image `ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base` is tagged as `7.4`, `8.0`, `8.1` and `8.2`
-respectively, with `7.4` being the default. You can execute the test suite against other PHP versions by running the
+developer image `ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base` is tagged as `8.0`, `8.1`, `8.2` and `8.3`
+respectively, with `8.0` being the default. You can execute the test suite against other PHP versions by running the
 following command:
 
 ```bash

Makefile

@@ -1,6 +1,6 @@
 include .env
 
-PHP_VERSION ?= 7.4
+PHP_VERSION ?= 8.0
 DOCKER_COMPOSE ?= docker-compose
 DC_RUN_PHP = $(DOCKER_COMPOSE) run --rm php
 

composer.json

@@ -7,7 +7,7 @@
     "readme": "./README.md",
     "license": "Apache-2.0",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "google/protobuf": "^3.22",
         "php-http/discovery": "^1.14",
@@ -17,7 +17,6 @@
         "psr/http-message": "^1.0.1|^2.0",
         "psr/log": "^1.1|^2.0|^3.0",
         "symfony/polyfill-mbstring": "^1.23",
-        "symfony/polyfill-php80": "^1.26",
         "symfony/polyfill-php81": "^1.26",
         "symfony/polyfill-php82": "^1.26"
     },
@@ -77,9 +76,9 @@
         "ext-grpc": "*",
         "grpc/grpc": "^1.30",
         "assertwell/phpunit-global-state": "^0.2.2",
-        "composer/xdebug-handler": "^2.0",
+        "composer/xdebug-handler": "^3.0",
         "dg/bypass-finals": "^1.4",
-        "friendsofphp/php-cs-fixer": "^3.4",
+        "friendsofphp/php-cs-fixer": "^3.51",
         "guzzlehttp/guzzle": "^7.4",
         "guzzlehttp/psr7": "^2.1",
         "mikey179/vfsstream": "^1.6.11",

docker-compose.collector.yaml

@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-7.4}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.0}
     volumes:
     - ./:/usr/src/myapp
     depends_on:

docker-compose.prometheus.yaml

@@ -23,7 +23,7 @@ services:
       context: .
       dockerfile: docker/examples/Dockerfile
       args:
-        - PHP_VERSION=7.4-fpm
+        - PHP_VERSION=8.0-fpm
         - EXT_ENABLE=redis
     volumes:
       - ./examples/prometheus/index.php:/var/www/public/index.php

docker-compose.w3cTraceContext.yaml

@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-7.4}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.0}
     volumes:
     - ./:/usr/src/myapp
     - ./:/usr/src/open-telemetry/

docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-7.4}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.0}
     volumes:
     - ./:/usr/src/myapp
     user: "${PHP_USER}:root"

docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=7.4
+ARG PHP_VERSION=8.0
 FROM php:${PHP_VERSION}-cli-alpine as php_build
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

examples/traces/features/batch_exporting_with_self_diagnostics.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\Example;
+
+use OpenTelemetry\API\Globals;
+
+putenv('OTEL_PHP_AUTOLOAD_ENABLED=true');
+putenv('OTEL_TRACES_EXPORTER=console');
+putenv('OTEL_METRICS_EXPORTER=console');
+putenv('OTEL_PHP_INTERNAL_METRICS_ENABLED=true');
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+/**
+ * Demonstrates batch span processing which also emits metrics for the internal state
+ * of the processor (eg spans received, queue length)
+ */
+
+echo 'Starting ConsoleSpanExporter with BatchSpanProcessor and metrics' . PHP_EOL;
+
+$tracer = Globals::tracerProvider()->getTracer('io.opentelemetry.contrib.php');
+$tracer->spanBuilder('root')->startSpan()->end();
+
+echo PHP_EOL . 'Example complete!  ' . PHP_EOL;

proto/otel/composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "google/protobuf": "^3.3.0"
     },
     "autoload": {

psalm.xml.dist

@@ -18,4 +18,11 @@
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
         <pluginClass class="Psalm\MockeryPlugin\Plugin"/>
     </plugins>
+    <issueHandlers>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+              <referencedClass name="GMP" />
+            </errorLevel>
+          </UndefinedClass>
+    </issueHandlers>
 </psalm>

rector.php

@@ -5,18 +5,18 @@
 use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\Config\RectorConfig;
-use Rector\Core\ValueObject\PhpVersion;
+use Rector\ValueObject\PhpVersion;
 use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->phpVersion(PhpVersion::PHP_74);
+    $rectorConfig->phpVersion(PhpVersion::PHP_80);
 
     $rectorConfig->paths([
         __DIR__ . '/src',
     ]);
 
     $rectorConfig->sets([
-        SetList::PHP_74,
+        SetList::PHP_80,
         SetList::CODE_QUALITY,
     ]);
     $rectorConfig->skip([

src/API/Baggage/Baggage.php

@@ -41,13 +41,9 @@ public static function getEmpty(): BaggageInterface
         return self::$emptyBaggage;
     }
 
-    /** @var array<string, Entry> */
-    private array $entries;
-
     /** @param array<string, Entry> $entries */
-    public function __construct(array $entries = [])
+    public function __construct(private array $entries = [])
     {
-        $this->entries = $entries;
     }
 
     /** @inheritDoc */

src/API/Baggage/BaggageBuilder.php

@@ -6,13 +6,9 @@
 
 final class BaggageBuilder implements BaggageBuilderInterface
 {
-    /** @var array<string, Entry> */
-    private array $entries;
-
     /** @param array<string, Entry> $entries */
-    public function __construct(array $entries = [])
+    public function __construct(private array $entries = [])
     {
-        $this->entries = $entries;
     }
 
     /** @inheritDoc */

src/API/Baggage/BaggageBuilderInterface.php

@@ -10,9 +10,8 @@ interface BaggageBuilderInterface
 {
     /**
      * @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.6.1/specification/baggage/api.md#set-value
-     * @param mixed $value
      */
-    public function set(string $key, $value, API\MetadataInterface $metadata = null): API\BaggageBuilderInterface;
+    public function set(string $key, mixed $value, API\MetadataInterface $metadata = null): API\BaggageBuilderInterface;
 
     /**
      * @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.6.1/specification/baggage/api.md#remove-value

src/API/Baggage/Entry.php

@@ -6,27 +6,13 @@
 
 final class Entry
 {
-    /** @var mixed */
-    private $value;
-
-    private MetadataInterface $metadata;
-
-    /**
-     * @param mixed $value
-     * @param MetadataInterface $metadata
-     */
     public function __construct(
-        $value,
-        MetadataInterface $metadata
+        private mixed $value,
+        private MetadataInterface $metadata,
     ) {
-        $this->value = $value;
-        $this->metadata = $metadata;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getValue()
+    public function getValue(): mixed
     {
         return $this->value;
     }

src/API/Baggage/Metadata.php

@@ -13,11 +13,8 @@ public static function getEmpty(): Metadata
         return self::$instance ??= new self('');
     }
 
-    private string $metadata;
-
-    public function __construct(string $metadata)
+    public function __construct(private string $metadata)
     {
-        $this->metadata = $metadata;
     }
 
     public function getValue(): string

src/API/Baggage/Propagation/Parser.php

@@ -17,12 +17,10 @@ final class Parser
     private const EXCLUDED_VALUE_CHARS = [' ', '"', ',', ';', '\\'];
     private const EQUALS = '=';
 
-    /** @readonly */
-    private string $baggageHeader;
-
-    public function __construct(string $baggageHeader)
-    {
-        $this->baggageHeader = $baggageHeader;
+    public function __construct(
+        /** @readonly */
+        private string $baggageHeader,
+    ) {
     }
 
     public function parseInto(BaggageBuilderInterface $baggageBuilder): void

src/API/Behavior/Internal/LogWriter/Psr3LogWriter.php

@@ -8,11 +8,8 @@
 
 class Psr3LogWriter implements LogWriterInterface
 {
-    private LoggerInterface $logger;
-
-    public function __construct(LoggerInterface $logger)
+    public function __construct(private LoggerInterface $logger)
     {
-        $this->logger = $logger;
     }
 
     public function write($level, string $message, array $context): void

src/API/Behavior/Internal/LogWriterFactory.php

@@ -33,6 +33,7 @@ public function create(): LogWriterInterface
                     return new Psr3LogWriter($logger);
                 }
                 error_log('OpenTelemetry: cannot use OTEL_PHP_LOG_DESTINATION=psr3 without providing a PSR-3 logger');
+
                 //default to error log
                 return new ErrorLogWriter();
             case 'error_log':

src/API/Globals.php

@@ -27,21 +27,12 @@ final class Globals
     private static array $initializers = [];
     private static ?self $globals = null;
 
-    private TracerProviderInterface $tracerProvider;
-    private MeterProviderInterface $meterProvider;
-    private TextMapPropagatorInterface $propagator;
-    private LoggerProviderInterface $loggerProvider;
-
     public function __construct(
-        TracerProviderInterface $tracerProvider,
-        MeterProviderInterface $meterProvider,
-        LoggerProviderInterface $loggerProvider,
-        TextMapPropagatorInterface $propagator
+        private TracerProviderInterface $tracerProvider,
+        private MeterProviderInterface $meterProvider,
+        private LoggerProviderInterface $loggerProvider,
+        private TextMapPropagatorInterface $propagator,
     ) {
-        $this->tracerProvider = $tracerProvider;
-        $this->meterProvider = $meterProvider;
-        $this->loggerProvider = $loggerProvider;
-        $this->propagator = $propagator;
     }
 
     public static function tracerProvider(): TracerProviderInterface