Fix sentry-tower URL

sentry-tower/Cargo.toml

@@ -12,14 +12,15 @@ Sentry integration for tower-based crates.
 edition = "2018"
 
 [features]
-http = ["http_", "pin-project"]
+http = ["http_", "pin-project", "url"]
 
 [dependencies]
 tower-layer = "0.3"
 tower-service = "0.3"
 http_ = { package = "http", version = "0.2.6", optional = true }
 pin-project = { version = "1.0.10", optional = true }
 sentry-core = { version = "0.25.0", path = "../sentry-core", default-features = false, features = ["client"] }
+url = { version = "2.2.2", optional = true }
 
 [dev-dependencies]
 anyhow = "1"

sentry-tower/src/http.rs

@@ -2,7 +2,7 @@ use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-use http_::{Request, Response, StatusCode};
+use http_::{header, Request, Response, StatusCode};
 use sentry_core::protocol;
 use tower_layer::Layer;
 use tower_service::Service;
@@ -136,7 +136,7 @@ where
     fn call(&mut self, request: Request<ReqBody>) -> Self::Future {
         let sentry_req = sentry_core::protocol::Request {
             method: Some(request.method().to_string()),
-            url: request.uri().to_string().parse().ok(),
+            url: get_url_from_request(&request),
             headers: request
                 .headers()
                 .into_iter()
@@ -186,3 +186,13 @@ fn map_status(status: StatusCode) -> protocol::SpanStatus {
         _ => protocol::SpanStatus::UnknownError,
     }
 }
+
+fn get_url_from_request<B>(request: &Request<B>) -> Option<url::Url> {
+    format!(
+        "http://{}{}",
+        request.headers().get(header::HOST)?.to_str().ok()?,
+        request.uri()
+    )
+    .parse()
+    .ok()
+}