Removes http_02 dependency and updates tonic/prost

Cargo.toml

@@ -91,9 +91,9 @@ futures = "0.3"
 futures-core = "0.3.29"
 futures-util = "0.3.29"
 golem-wasm-ast = "0.3.2"
-golem-wasm-rpc = { version = "0.0.34", default-features = false, features = ["host"] }
+#golem-wasm-rpc = { version = "0.0.34", default-features = false, features = ["host"] }
+golem-wasm-rpc = { git = "https://github.com/golemcloud/wasm-rpc", branch="update-prost", default-features = false, features = ["host"] }
 http = "1.0.0" # keep in sync with wasmtime
-http_02 = { package = "http", version = "0.2.11" }
 humantime-serde = "1.1.1"
 hyper = { version = "1.0.1", features = ["full"] } # keep in sync with wasmtime
 iso8601-timestamp = "0.2.16"
@@ -121,8 +121,8 @@ poem = { version = "3.0.1", features = ["prometheus", "opentelemetry", "test"] }
 postgres = "0.19.7"
 prometheus = { version = "0.13.3", features = ["process"] }
 proptest = "1.4.0"
-prost = "0.12.3"
-prost-types = "0.12.3"
+prost = "0.13.1"
+prost-types = "0.13.1"
 redis = { version = "0.25.2", features = ["default"] }
 regex = "1.10.3"
 reqwest = { version = "0.12.5", features = [
@@ -165,9 +165,9 @@ tokio-rustls = { version = "0.26.0" }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tokio-util = "0.7.10"
 toml = "0.8.14"
-tonic = "0.11.0"
-tonic-reflection = "0.11.0"
-tonic-health = "0.11.0"
+tonic = "0.12.0"
+tonic-reflection = "0.12.0"
+tonic-health = "0.12.0"
 tracing = { version = "0.1.40", features = ["log"] }
 tracing-opentelemetry = "0.24.0"
 tracing-serde = "0.1.3"

golem-api-grpc/Cargo.toml

@@ -25,4 +25,4 @@ uuid = { workspace = true }
 
 [build-dependencies]
 cargo_metadata = "0.18.1"
-tonic-build = "0.11.0"
+tonic-build = "0.12.0"

golem-common/Cargo.toml

@@ -26,8 +26,8 @@ derive_more = { workspace = true }
 figment = { workspace = true }
 fred = { workspace = true }
 futures-core = { workspace = true }
+http = { workspace = true }
 humantime-serde = { workspace = true }
-http_02 = { workspace = true }
 iso8601-timestamp = { workspace = true }
 lazy_static = { workspace = true }
 poem = { workspace = true }

golem-common/src/client.rs

@@ -25,7 +25,7 @@ use tonic::{Code, Status};
 
 #[derive(Clone)]
 pub struct GrpcClient<T: Clone> {
-    endpoint: http_02::Uri,
+    endpoint: http::Uri,
     config: GrpcClientConfig,
     client: Arc<Mutex<Option<GrpcClientConnection<T>>>>,
     client_factory: Arc<dyn Fn(Channel) -> T + Send + Sync + 'static>,
@@ -34,7 +34,7 @@ pub struct GrpcClient<T: Clone> {
 impl<T: Clone> GrpcClient<T> {
     pub fn new(
         client_factory: impl Fn(Channel) -> T + Send + Sync + 'static,
-        endpoint: http_02::Uri,
+        endpoint: http::Uri,
         config: GrpcClientConfig,
     ) -> Self {
         Self {
@@ -96,7 +96,7 @@ impl<T: Clone> GrpcClient<T> {
 #[derive(Clone)]
 pub struct MultiTargetGrpcClient<T: Clone> {
     config: GrpcClientConfig,
-    clients: Arc<DashMap<http_02::Uri, GrpcClientConnection<T>>>,
+    clients: Arc<DashMap<http::Uri, GrpcClientConnection<T>>>,
     client_factory: Arc<dyn Fn(Channel) -> T + Send + Sync>,
 }
 
@@ -112,7 +112,7 @@ impl<T: Clone> MultiTargetGrpcClient<T> {
         }
     }
 
-    pub async fn call<F, R>(&self, endpoint: http_02::Uri, f: F) -> Result<R, Status>
+    pub async fn call<F, R>(&self, endpoint: http::Uri, f: F) -> Result<R, Status>
     where
         F: for<'a> Fn(&'a mut T) -> Pin<Box<dyn Future<Output = Result<R, Status>> + 'a + Send>>
             + Send,
@@ -143,7 +143,7 @@ impl<T: Clone> MultiTargetGrpcClient<T> {
 
     fn get(
         &self,
-        endpoint: http_02::Uri,
+        endpoint: http::Uri,
     ) -> Result<GrpcClientConnection<T>, tonic::transport::Error> {
         let connect_timeout = self.config.connect_timeout;
         let entry = self

golem-common/src/model/mod.rs

@@ -542,8 +542,8 @@ impl Pod {
             .expect("Failed to build URI")
     }
 
-    pub fn uri_02(&self) -> http_02::Uri {
-        http_02::Uri::builder()
+    pub fn uri_02(&self) -> http::Uri {
+        http::Uri::builder()
             .scheme("http")
             .authority(format!("{}:{}", self.host, self.port).as_str())
             .path_and_query("/")

golem-component-compilation-service/Cargo.toml

@@ -18,7 +18,6 @@ golem-worker-executor-base = { version = "0.0.0", path = "../golem-worker-execut
 async-trait = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
-http_02 = { workspace = true }
 tokio = { workspace = true }
 
 tracing = { workspace = true }

golem-component-compilation-service/src/lib.rs

@@ -144,13 +144,3 @@ fn create_wasmtime_config() -> wasmtime::Config {
 
     config
 }
-
-pub trait UriBackConversion {
-    fn as_http_02(&self) -> http_02::Uri;
-}
-
-impl UriBackConversion for http::Uri {
-    fn as_http_02(&self) -> http_02::Uri {
-        self.to_string().parse().unwrap()
-    }
-}

golem-component-compilation-service/src/service/compile_worker.rs

@@ -75,7 +75,7 @@ impl CompileWorker {
                     ComponentServiceClient::new(channel)
                         .max_decoding_message_size(max_component_size)
                 },
-                uri.as_http_02(),
+                uri,
                 GrpcClientConfig {
                     retries_on_unavailable: config.retries.clone(),
                     ..Default::default() // TODO

golem-component-service-base/Cargo.toml

@@ -15,7 +15,6 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 bincode = { workspace = true }
 bytes = { workspace = true }
-http_02 = { workspace = true }
 prost = { workspace = true }
 serde = { workspace = true }
 sqlx = { workspace = true, features = [

golem-component-service-base/src/config.rs

@@ -38,8 +38,8 @@ pub struct ComponentCompilationEnabledConfig {
 }
 
 impl ComponentCompilationEnabledConfig {
-    pub fn uri(&self) -> http_02::Uri {
-        http_02::Uri::builder()
+    pub fn uri(&self) -> http::Uri {
+        http::Uri::builder()
             .scheme("http")
             .authority(format!("{}:{}", self.host, self.port).as_str())
             .path_and_query("/")

golem-component-service-base/src/service/component_compilation.rs

@@ -31,7 +31,7 @@ pub struct ComponentCompilationServiceDefault {
 }
 
 impl ComponentCompilationServiceDefault {
-    pub fn new(uri: http_02::Uri) -> Self {
+    pub fn new(uri: http::Uri) -> Self {
         let client = GrpcClient::new(
             ComponentCompilationServiceClient::new,
             uri,

golem-component-service/Cargo.toml

@@ -22,7 +22,6 @@ console-subscriber = { workspace = true }
 figment = { workspace = true }
 futures-util = { workspace = true }
 golem-wasm-ast = { workspace = true }
-http_02 = { workspace = true }
 humantime-serde = { workspace = true }
 lazy_static = { workspace = true }
 mappable-rc = "0.1.1"

golem-service-base/Cargo.toml

@@ -20,7 +20,6 @@ bigdecimal = "0.4.2"
 bincode = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
-http_02 = { workspace = true }
 hyper = { workspace = true }
 num-traits = "0.2"
 poem-openapi = { workspace = true }

golem-service-base/src/routing_table.rs

@@ -37,7 +37,7 @@ pub struct RoutingTableConfig {
 }
 
 impl RoutingTableConfig {
-    pub fn url(&self) -> http_02::Uri {
+    pub fn url(&self) -> http::Uri {
         format!("http://{}:{}", self.host, self.port)
             .parse()
             .expect("Failed to parse shard manager URL")

golem-shard-manager/Cargo.toml

@@ -23,7 +23,6 @@ figment = { workspace = true }
 fred = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
-http_02 = { workspace = true }
 humantime-serde = { workspace = true }
 k8s-openapi = { workspace = true, optional = true }
 kube = { workspace = true, optional = true }

golem-shard-manager/src/http_server.rs

@@ -14,7 +14,7 @@
 
 use std::net::SocketAddr;
 
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use prometheus::{Encoder, Registry, TextEncoder};
 use tokio::task::JoinHandle;
 use warp::hyper::Body;

golem-shard-manager/src/model.rs

@@ -55,8 +55,8 @@ impl Pod {
         Endpoint::from(self.uri())
     }
 
-    pub fn uri(&self) -> http_02::Uri {
-        http_02::Uri::builder()
+    pub fn uri(&self) -> http::Uri {
+        http::Uri::builder()
             .scheme("http")
             .authority(format!("{}:{}", self.ip, self.port).as_str())
             .path_and_query("")

golem-worker-executor-base/Cargo.toml

@@ -48,7 +48,6 @@ futures-util = { workspace = true }
 gethostname = "0.4.3"
 golem-wit = { version = "0.3.1" }
 http = { workspace = true }
-http_02 = { workspace = true }
 http-body = "1.0.0"                                 # keep in sync with wasmtime
 humansize = "2.1.3"
 humantime-serde = { workspace = true }

golem-worker-executor-base/src/grpc.rs

@@ -1830,16 +1830,6 @@ impl GrpcInvokeRequest for golem::workerexecutor::InvokeAndAwaitWorkerRequest {
     }
 }
 
-pub trait UriBackConversion {
-    fn as_http_02(&self) -> http_02::Uri;
-}
-
-impl UriBackConversion for http::Uri {
-    fn as_http_02(&self) -> http_02::Uri {
-        self.to_string().parse().unwrap()
-    }
-}
-
 pub fn authorised_grpc_request<T>(request: T, access_token: &Uuid) -> Request<T> {
     let mut req = Request::new(request);
     req.metadata_mut().insert(

golem-worker-executor-base/src/http_server.rs

@@ -15,7 +15,7 @@
 use std::fmt::Display;
 use std::net::SocketAddr;
 
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use prometheus::{Encoder, Registry, TextEncoder};
 use tokio::task::JoinHandle;
 use tracing::info;

golem-worker-executor-base/src/services/component.rs

@@ -148,7 +148,7 @@ impl ComponentServiceGrpc {
                     ComponentServiceClient::new(channel)
                         .max_decoding_message_size(max_component_size)
                 },
-                endpoint.as_http_02(),
+                endpoint,
                 GrpcClientConfig {
                     retries_on_unavailable: retry_config.clone(),
                     ..Default::default() // TODO

golem-worker-executor-base/src/services/shard_manager.rs

@@ -53,7 +53,7 @@ impl ShardManagerServiceGrpc {
     pub fn new(config: ShardManagerServiceGrpcConfig) -> Self {
         let client = GrpcClient::new(
             ShardManagerServiceClient::new,
-            config.uri().as_http_02(),
+            config.uri(),
             GrpcClientConfig {
                 retries_on_unavailable: config.retries.clone(),
                 ..Default::default()

golem-worker-executor-base/src/services/worker_proxy.rs

@@ -150,7 +150,7 @@ impl RemoteWorkerProxy {
         Self {
             client: GrpcClient::new(
                 WorkerServiceClient::new,
-                endpoint.as_http_02(),
+                endpoint,
                 Default::default(), // TODO
             ),
             access_token,

golem-worker-executor-base/tests/api.rs

@@ -22,7 +22,7 @@ use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
 use assert2::check;
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use redis::Commands;
 
 use golem_api_grpc::proto::golem::worker::{

golem-worker-executor-base/tests/guest_languages.rs

@@ -18,7 +18,7 @@ use std::net::SocketAddr;
 
 use chrono::Datelike;
 use golem_wasm_rpc::Value;
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 

golem-worker-executor-base/tests/hot_update.rs

@@ -17,7 +17,7 @@ use assert2::check;
 use async_mutex::Mutex;
 use golem_test_framework::dsl::TestDslUnsafe;
 use golem_wasm_rpc::Value;
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use log::info;
 use std::collections::HashMap;
 use std::net::SocketAddr;

golem-worker-executor-base/tests/transactions.rs

@@ -19,7 +19,7 @@ use golem_test_framework::dsl::{
     drain_connection, stdout_event, stdout_event_starting_with, worker_error_message, TestDslUnsafe,
 };
 use golem_wasm_rpc::Value;
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::sync::{Arc, Mutex};

golem-worker-executor-base/tests/wasi.rs

@@ -25,7 +25,7 @@ use golem_test_framework::dsl::{
     drain_connection, stderr_event, stdout_event, worker_error_message, TestDslUnsafe,
 };
 use golem_wasm_rpc::Value;
-use http_02::{Response, StatusCode};
+use http::{Response, StatusCode};
 use tokio::spawn;
 use tokio::time::Instant;
 use tonic::transport::Body;

golem-worker-service-base/Cargo.toml

@@ -26,7 +26,6 @@ figment = { workspace = true }
 futures = { workspace = true }
 futures-util = { workspace = true }
 http = { workspace = true }
-http_02 = { workspace = true }
 humantime-serde = { workspace = true }
 hyper = { workspace = true }
 lazy_static = { workspace = true }

golem-worker-service-base/src/lib.rs

@@ -12,13 +12,3 @@ pub mod repo;
 pub mod service;
 mod worker_binding;
 pub mod worker_bridge_execution;
-
-pub trait UriBackConversion {
-    fn as_http_02(&self) -> http_02::Uri;
-}
-
-impl UriBackConversion for Uri {
-    fn as_http_02(&self) -> http_02::Uri {
-        self.to_string().parse().unwrap()
-    }
-}

golem-worker-service-base/src/service/component/default.rs

@@ -45,7 +45,7 @@ impl RemoteComponentService {
         Self {
             client: GrpcClient::new(
                 ComponentServiceClient::new,
-                uri.as_http_02(),
+                uri,
                 GrpcClientConfig {
                     retries_on_unavailable: retry_config.clone(),
                     ..Default::default() // TODO

golem-worker-service/Cargo.toml

@@ -32,7 +32,6 @@ figment = { workspace = true }
 futures = { workspace = true }
 futures-util = { workspace = true }
 http = { workspace = true }
-http_02 = { workspace = true }
 humantime-serde = { workspace = true }
 hyper = { workspace = true }
 lazy_static = { workspace = true }