Add ServerTimingPropagator

open-telemetry · Nov 23, 2023 · d0888a4 · d0888a4
1 parent 2ddf2a5
commit d0888a4
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 373 deletions.
diff --git a/src/Instrumentation/Symfony/composer.json b/src/Instrumentation/Symfony/composer.json
@@ -16,7 +16,8 @@
     "symfony/http-client-contracts": "*"
   },
   "suggest": {
-    "open-telemetry/opentelemetry-propagation-traceresponse": "Automatically propagate the context to the client."
+    "open-telemetry/opentelemetry-propagation-server-timing": "Automatically propagate the context to the client through server-timing headers.",
+    "open-telemetry/opentelemetry-propagation-traceresponse": "Automatically propagate the context to the client through trace-response headers."
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",

diff --git a/src/Instrumentation/Symfony/src/SymfonyInstrumentation.php b/src/Instrumentation/Symfony/src/SymfonyInstrumentation.php
@@ -117,6 +117,12 @@ public static function register(): void
 
                 $span->setAttribute(TraceAttributes::HTTP_RESPONSE_BODY_SIZE, $contentLength);
 
+                // Propagate server-timing header to response, if ServerTimingPropagator is present
+                if (class_exists('OpenTelemetry\Contrib\Propagation\ServerTiming\ServerTimingPropagator')) {
+                    $prop = new \OpenTelemetry\Contrib\Propagation\ServerTiming\ServerTimingPropagator();
+                    $prop->inject($response, ResponsePropagationSetter::instance(), $scope->context());
+                }
+
                 // Propagate traceresponse header to response, if TraceResponsePropagator is present
                 if (class_exists('OpenTelemetry\Contrib\Propagation\TraceResponse\TraceResponsePropagator')) {
                     $prop = new \OpenTelemetry\Contrib\Propagation\TraceResponse\TraceResponsePropagator();

diff --git a/src/Propagation/ResponsePropagator/.gitattributes b/src/Propagation/ResponsePropagator/.gitattributes
diff --git a/src/Propagation/ResponsePropagator/.gitignore b/src/Propagation/ResponsePropagator/.gitignore
diff --git a/src/Propagation/ResponsePropagator/.php-cs-fixer.php b/src/Propagation/ResponsePropagator/.php-cs-fixer.php
diff --git a/src/Propagation/ResponsePropagator/README.md b/src/Propagation/ResponsePropagator/README.md
diff --git a/src/Propagation/ResponsePropagator/composer.json b/src/Propagation/ResponsePropagator/composer.json
diff --git a/src/Propagation/ResponsePropagator/phpstan.neon.dist b/src/Propagation/ResponsePropagator/phpstan.neon.dist
diff --git a/src/Propagation/ResponsePropagator/phpunit.xml.dist b/src/Propagation/ResponsePropagator/phpunit.xml.dist
diff --git a/src/Propagation/ResponsePropagator/psalm.xml.dist b/src/Propagation/ResponsePropagator/psalm.xml.dist
diff --git a/src/Propagation/ResponsePropagator/tests/Unit/PropagatorTest.php b/src/Propagation/ResponsePropagator/tests/Unit/PropagatorTest.php
diff --git a/src/Propagation/ServerTiming/composer.json b/src/Propagation/ServerTiming/composer.json
@@ -10,8 +10,7 @@
   "prefer-stable": true,
   "require": {
     "php": "^7.0|^8.0",
-    "open-telemetry/context": "^1.0",
-    "open-telemetry/opentelemetry-propagation-response": "*"
+    "open-telemetry/context": "^1.0"
   },
   "autoload": {
     "psr-4": {