Refactor services injection

.github/workflows/ci.yml

@@ -96,7 +96,7 @@ jobs:
       - name: Run PHPStan analysis
         run: |
           ./vendor/bin/phpstan --version
-          ./vendor/bin/phpstan analyse --no-interaction --no-progress --ansi --format=github
+          ./vendor/bin/phpstan analyse --no-interaction --no-progress --ansi --error-format=github --memory-limit=256M
   phpunit:
     name: PHPUnit (PHP ${{ matrix.php }})
     runs-on: ubuntu-latest

.gitignore

@@ -10,3 +10,4 @@ composer.lock
 phpunit.xml
 .phpunit.result.cache
 .phpunit.cache
+coverage

composer.json

@@ -27,8 +27,10 @@
         "open-telemetry/api": "^1.0",
         "open-telemetry/context": "^1.0",
         "open-telemetry/opentelemetry-logger-monolog": "^1.0",
+        "open-telemetry/opentelemetry-propagation-server-timing": "^0.0.1",
+        "open-telemetry/opentelemetry-propagation-traceresponse": "^0.0.2",
         "open-telemetry/sdk": "^1.0",
-        "open-telemetry/sem-conv": "^1.23",
+        "open-telemetry/sem-conv": "^1.24",
         "open-telemetry/symfony-sdk-bundle": "^0.0.24",
         "php-http/discovery": "^1.19",
         "psr/http-factory": "^1.0",
@@ -45,15 +47,15 @@
         "ext-mbstring": "*",
         "ext-opentelemetry": "*",
         "ext-xdebug": "*",
-        "doctrine/dbal": "^3.7",
+        "doctrine/dbal": "^3.8",
         "doctrine/doctrine-bundle": "^2.11",
         "doctrine/orm": "^2.17",
-        "ergebnis/composer-normalize": "^2.41",
-        "friendsofphp/php-cs-fixer": "^3.41",
+        "ergebnis/composer-normalize": "^2.42",
+        "friendsofphp/php-cs-fixer": "^3.49",
         "guzzlehttp/promises": "^2.0",
         "maglnet/composer-require-checker": "^4.8",
         "matthiasnoback/symfony-config-test": "^5.1",
-        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
         "nyholm/symfony-bundle-test": "^3.0",
         "open-telemetry/exporter-otlp": "^1.0",
         "open-telemetry/exporter-zipkin": "^1.0",
@@ -65,7 +67,7 @@
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpstan/phpstan-symfony": "^1.3",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "pyrech/composer-changelogs": "^2.1",
         "roave/security-advisories": "dev-master",
         "symfony/cache": "^6.4 || ^7.0",
@@ -117,6 +119,10 @@
     },
     "scripts": {
         "check-reqs": "@php vendor/bin/composer-require-checker check",
+        "coverage": [
+            "@putenv XDEBUG_MODE=coverage",
+            "@phpunit --coverage-html=coverage"
+        ],
         "format": [
             "@php-cs-fixer:fix",
             "@composer normalize"

phpunit.xml.dist

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
-         executionOrder="depends,defects"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="false"
-         verbose="true">
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    executionOrder="depends,defects"
+    beStrictAboutOutputDuringTests="true"
+    failOnRisky="true"
+    failOnWarning="false"
+    cacheDirectory=".phpunit.cache"
+>
 
     <php>
         <ini name="error_reporting" value="-1"/>
@@ -24,14 +22,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
+    </source>
 </phpunit>

src/DependencyInjection/Configuration.php

@@ -7,12 +7,12 @@
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterOptions;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LoggerProvider\LoggerProviderEnum;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogProcessor\LogProcessorEnum;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MeterProvider\ExemplarFilterEnum;
+use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\ExemplarFilterEnum;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MeterProvider\MeterProviderEnum;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\MetricTemporalityEnum;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanProcessor\SpanProcessorEnum;
 use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TracerProvider\TraceProviderEnum;
-use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TracerProvider\TraceSamplerEnum;
+use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceSamplerEnum;
 use Monolog\Level;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -237,8 +237,7 @@ private function getTracingProvidersNode(): ArrayNodeDefinition
                                 ->values(array_map(fn (TraceSamplerEnum $enum) => $enum->value, TraceSamplerEnum::cases()))
                                 ->isRequired()
                             ->end()
-                            ->floatNode('ratio')->end()
-                            ->scalarNode('parent')->cannotBeEmpty()->end()
+                            ->floatNode('probability')->end()
                         ->end()
                     ->end()
                     ->arrayNode('processors')

src/DependencyInjection/OpenTelemetryExtension.php

@@ -35,9 +35,13 @@
     {
         $loader = new PhpFileLoader($container, new FileLocator(dirname(__DIR__).'/Resources/config'));
         $loader->load('services.php');
+        $loader->load('services_transports.php');
+        $loader->load('services_logs.php');
+        $loader->load('services_metrics.php');
+        $loader->load('services_traces.php');
         $loader->load('services_tracing_instrumentation.php');
 
-        $this->loadService($mergedConfig['service'], $container);
+        $this->loadServiceParams($mergedConfig['service'], $container);
         $this->loadInstrumentationParams($mergedConfig['instrumentation'], $container);
 
         (new OpenTelemetryTracesExtension())($mergedConfig['traces'], $container);
@@ -55,7 +59,7 @@
      *     environment: string
      * } $config
      */
-    private function loadService(array $config, ContainerBuilder $container): void
+    private function loadServiceParams(array $config, ContainerBuilder $container): void
     {
         $container->setParameter('open_telemetry.service.namespace', $config['namespace']);
         $container->setParameter('open_telemetry.service.name', $config['name']);
@@ -123,7 +127,7 @@
                 ->setDefinition($handlerId, new ChildDefinition('open_telemetry.logs.monolog.handler'))
                 ->setPublic(true)
                 ->setArguments([
-                    '$loggerProvider' => new Reference(sprintf('open_telemetry.logs.providers.%s', $handler['provider'])),
+                    '$loggerProvider' => new Reference($handler['provider']),
                     '$level' => Level::fromName(ucfirst($handler['level'])),
                     '$bubble' => $handler['bubble'],
                 ]);