From f58bbf82c583d4507468a2b869028e43480ed5b1 Mon Sep 17 00:00:00 2001 From: Weslen Teche Date: Thu, 19 Oct 2023 21:14:08 -0300 Subject: [PATCH] Update deprecated attributes (#207) --- .../Laravel/src/Watchers/ClientRequestWatcher.php | 1 - src/Instrumentation/Psr18/src/Psr18Instrumentation.php | 2 +- src/Instrumentation/Wordpress/src/WordpressInstrumentation.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Instrumentation/Laravel/src/Watchers/ClientRequestWatcher.php b/src/Instrumentation/Laravel/src/Watchers/ClientRequestWatcher.php index 73fa1714..3d96d5c0 100644 --- a/src/Instrumentation/Laravel/src/Watchers/ClientRequestWatcher.php +++ b/src/Instrumentation/Laravel/src/Watchers/ClientRequestWatcher.php @@ -50,7 +50,6 @@ public function recordRequest(RequestSending $request): void TraceAttributes::HTTP_REQUEST_METHOD => $request->request->method(), TraceAttributes::URL_FULL => $processedUrl, TraceAttributes::URL_PATH => $parsedUrl['path'] ?? '', - TraceAttributes::HTTP_HOST => $parsedUrl['host'] ?? '', TraceAttributes::URL_SCHEME => $parsedUrl['scheme'] ?? '', TraceAttributes::SERVER_ADDRESS => $parsedUrl['host'] ?? '', TraceAttributes::SERVER_PORT => $parsedUrl['port'] ?? '', diff --git a/src/Instrumentation/Psr18/src/Psr18Instrumentation.php b/src/Instrumentation/Psr18/src/Psr18Instrumentation.php index 2f73a636..3cbe8b1f 100644 --- a/src/Instrumentation/Psr18/src/Psr18Instrumentation.php +++ b/src/Instrumentation/Psr18/src/Psr18Instrumentation.php @@ -52,7 +52,7 @@ public static function register(): void ->setAttribute(TraceAttributes::URL_FULL, (string) $request->getUri()) ->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $request->getMethod()) ->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $request->getProtocolVersion()) - ->setAttribute(TraceAttributes::HTTP_USER_AGENT, $request->getHeaderLine('User-Agent')) + ->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $request->getHeaderLine('User-Agent')) ->setAttribute(TraceAttributes::HTTP_REQUEST_BODY_SIZE, $request->getHeaderLine('Content-Length')) ->setAttribute(TraceAttributes::SERVER_ADDRESS, $request->getUri()->getHost()) ->setAttribute(TraceAttributes::SERVER_PORT, $request->getUri()->getPort()) diff --git a/src/Instrumentation/Wordpress/src/WordpressInstrumentation.php b/src/Instrumentation/Wordpress/src/WordpressInstrumentation.php index bd3577dc..7893947b 100644 --- a/src/Instrumentation/Wordpress/src/WordpressInstrumentation.php +++ b/src/Instrumentation/Wordpress/src/WordpressInstrumentation.php @@ -90,7 +90,7 @@ function: 'wp_initial_constants', ->setAttribute(TraceAttributes::URL_FULL, (string) $request->getUri()) ->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $request->getMethod()) ->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $request->getProtocolVersion()) - ->setAttribute(TraceAttributes::HTTP_USER_AGENT, $request->getHeaderLine('User-Agent')) + ->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $request->getHeaderLine('User-Agent')) ->setAttribute(TraceAttributes::HTTP_REQUEST_BODY_SIZE, $request->getHeaderLine('Content-Length')) ->setAttribute(TraceAttributes::CLIENT_ADDRESS, $request->getUri()->getHost()) ->setAttribute(TraceAttributes::CLIENT_PORT, $request->getUri()->getPort())