From 6a7a2dc23738a364be36e576a7068ca4dfe30a22 Mon Sep 17 00:00:00 2001
From: Neil Whitworth <neil.whitworth@rivieratravel.co.uk>
Date: Fri, 11 Oct 2024 23:35:52 +0100
Subject: [PATCH] Add request hostname to span name - addresses
 https://github.com/open-telemetry/opentelemetry-php/issues/1399

---
 .../Symfony/src/HttpClientInstrumentation.php | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php b/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php
index 666ac67a..bdafec45 100644
--- a/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php
+++ b/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php
@@ -48,16 +48,34 @@ public static function register(): void
                 ?int $lineno,
             ) use ($instrumentation): array {
                 /** @psalm-suppress ArgumentTypeCoercion */
+                $requestOptions = $params[2] ?? [];
+
+                if (array_key_exists('base_uri', $requestOptions)) {
+                    $baseuri = $requestOptions['base_uri'];
+                    $parsedUrl = parse_url($baseuri);
+                    if (!array_key_exists('port', $parsedUrl)) {
+                        $parsedUrl['port'] = $parsedUrl['scheme'] === 'https' ? 443 : 80;
+                    }
+                } else {
+                    $parsedUrl = parse_url((string) $params[1]);
+                    if (!array_key_exists('port', $parsedUrl)) {
+                        $parsedUrl['port'] = $parsedUrl['scheme'] === 'https' ? 443 : 80;
+                    }
+                    $baseuri = sprintf('%s://%s:%d', $parsedUrl['scheme'], $parsedUrl['host'], $parsedUrl['port']);
+                }
+
                 $builder = $instrumentation
                     ->tracer()
-                    ->spanBuilder(\sprintf('%s', $params[0]))
+                    ->spanBuilder(\sprintf('%s %s', $params[0],$baseuri))
                     ->setSpanKind(SpanKind::KIND_CLIENT)
-                    ->setAttribute(TraceAttributes::PEER_SERVICE, parse_url((string) $params[1])['host'] ?? null)
+                    ->setAttribute(TraceAttributes::PEER_SERVICE, $parsedUrl['host'])
                     ->setAttribute(TraceAttributes::URL_FULL, (string) $params[1])
                     ->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $params[0])
                     ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::SERVER_ADDRESS,$parsedUrl['host'])
+                    ->setAttribute(TraceAttributes::SERVER_PORT, $parsedUrl['port'])
                     ->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
 
                 $propagator = Globals::propagator();
@@ -67,7 +85,6 @@ public static function register(): void
                     ->setParent($parent)
                     ->startSpan();
 
-                $requestOptions = $params[2] ?? [];
 
                 if (!isset($requestOptions['headers'])) {
                     $requestOptions['headers'] = [];