Merge remote-tracking branch 'upstream/main' into laravel/hook/applic…

…ation
open-telemetry · Aug 13, 2023 · e376229 · e376229
2 parents da40eaf + 395b7b8
commit e376229
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Instrumentation/Laravel/composer.json b/src/Instrumentation/Laravel/composer.json
@@ -9,7 +9,7 @@
   "minimum-stability": "dev",
   "require": {
     "php": "^8.0",
-    "laravel/framework": "*",
+    "laravel/framework": ">=6.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0.0beta10",
     "open-telemetry/sem-conv": "^1"

diff --git a/src/Instrumentation/Laravel/src/LaravelInstrumentation.php b/src/Instrumentation/Laravel/src/LaravelInstrumentation.php
@@ -58,7 +58,7 @@ public static function register(): void
                         ->setAttribute(TraceAttributes::HTTP_FLAVOR, $request->getProtocolVersion())
                         ->setAttribute(TraceAttributes::HTTP_CLIENT_IP, $request->ip())
                         ->setAttribute(TraceAttributes::HTTP_TARGET, self::httpTarget($request))
-                        ->setAttribute(TraceAttributes::NET_HOST_NAME, $request->host())
+                        ->setAttribute(TraceAttributes::NET_HOST_NAME, self::httpHostName($request))
                         ->setAttribute(TraceAttributes::NET_HOST_PORT, $request->getPort())
                         ->setAttribute(TraceAttributes::NET_PEER_PORT, $request->server('REMOTE_PORT'))
                         ->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $request->userAgent())
@@ -152,4 +152,16 @@ private static function httpTarget(Request $request): string
 
         return $query ? $request->path() . $question . $query : $request->path();
     }
+
+    private static function httpHostName(Request $request): string
+    {
+        if (method_exists($request, 'host')) {
+            return $request->host();
+        }
+        if (method_exists($request, 'getHost')) {
+            return $request->getHost();
+        }
+
+        return '';
+    }
 }