fix: pass in list for metrics for el clients (#129)

kurtosis-tech · Sep 20, 2023 · dead526 · dead526
1 parent 566bcfc
commit dead526
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star
@@ -96,7 +96,7 @@ def launch(
 
 	jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)
 
-	metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
+	metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
 	besu_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)
 
 	return el_client_context.new_el_client_context(
@@ -109,7 +109,7 @@ def launch(
 		ENGINE_HTTP_RPC_PORT_NUM,
 		jwt_secret,
 		service_name,
-		besu_metrics_info,
+		[besu_metrics_info],
 	)
 
 

diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star
@@ -94,7 +94,7 @@ def launch(
 
 	jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)
 
-	metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
+	metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
 	erigon_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)
 
 	return el_client_context.new_el_client_context(
@@ -107,7 +107,7 @@ def launch(
 		ENGINE_RPC_PORT_NUM,
 		jwt_secret,
 		service_name,
-		erigon_metrics_info
+		[erigon_metrics_info]
 	)
 
 

diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star
@@ -107,7 +107,7 @@ def launch(
 
 	# TODO: Passing empty string for metrics_url for now https://github.com/kurtosis-tech/eth-network-package/issues/127
 	# metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
-	ethjs_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, "")
+	ethjs_metrics_info = None
 
 	return el_client_context.new_el_client_context(
 		"ethereumjs",
@@ -119,7 +119,7 @@ def launch(
 		ENGINE_RPC_PORT_NUM,
 		jwt_secret,
 		service_name,
-		ethjs_metrics_info,
+		[ethjs_metrics_info],
 	)
 
 def get_config(

diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star
@@ -114,7 +114,7 @@ def launch(
 
 	jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)
 
-	metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
+	metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
 	geth_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)
 
 	return el_client_context.new_el_client_context(
@@ -127,7 +127,7 @@ def launch(
 		ENGINE_RPC_PORT_NUM,
 		jwt_secret,
 		service_name,
-		geth_metrics_info,
+		[geth_metrics_info],
 	)
 
 def get_config(

diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star
@@ -94,7 +94,7 @@ def launch(
 
 	jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)
 
-	metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
+	metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
 	nethermind_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)
 
 	return el_client_context.new_el_client_context(
@@ -108,7 +108,7 @@ def launch(
 		ENGINE_RPC_PORT_NUM,
 		jwt_secret,
 		service_name,
-		nethermind_metrics_info,
+		[nethermind_metrics_info],
 	)
 
 

diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star
@@ -100,7 +100,7 @@ def launch(
 
 	jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)
 
-	metric_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
+	metric_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
 	reth_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metric_url)
 
 	return el_client_context.new_el_client_context(
@@ -113,7 +113,7 @@ def launch(
 		ENGINE_RPC_PORT_NUM,
 		jwt_secret,
 		service_name,
-		reth_metrics_info,
+		[reth_metrics_info],
 	)
 
 def get_config(