Skip to content

Commit

Permalink
propogate network_params and set network label
Browse files Browse the repository at this point in the history
  • Loading branch information
edobry committed Mar 5, 2025
1 parent 7f48393 commit 88360aa
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 11 deletions.
5 changes: 4 additions & 1 deletion src/batcher/op-batcher/op_batcher_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def launch(
l1_config_env_vars,
gs_batcher_private_key,
batcher_params,
network_params,
observability_helper,
da_server_context,
):
Expand All @@ -63,7 +64,9 @@ def launch(
service = plan.add_service(service_name, config)
service_url = util.make_service_http_url(service)

observability.register_op_service_metrics_job(observability_helper, service)
observability.register_op_service_metrics_job(
observability_helper, service, network_params.network
)

return service_url

Expand Down
6 changes: 2 additions & 4 deletions src/challenger/op-challenger/op_challenger_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ def launch(
interop_params,
observability_helper,
):
challenger_service_name = "{0}".format(service_name)

config = get_challenger_config(
plan,
l2_num,
Expand All @@ -54,10 +52,10 @@ def launch(
observability_helper,
)

challenger_service = plan.add_service(service_name, config)
service = plan.add_service(service_name, config)

observability.register_op_service_metrics_job(
observability_helper, challenger_service
observability_helper, service, network_params.network
)

return "op_challenger"
Expand Down
9 changes: 8 additions & 1 deletion src/el_cl_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,11 @@ def launch(

for metrics_info in [x for x in el_context.el_metrics_info if x != None]:
observability.register_node_metrics_job(
observability_helper, el_context.client_name, "execution", metrics_info
observability_helper,
el_context.client_name,
"execution",
network_params.network,
metrics_info,
)

if rollup_boost_enabled and sequencer_enabled:
Expand Down Expand Up @@ -314,6 +318,7 @@ def launch(
observability_helper,
el_builder_context.client_name,
"execution-builder",
network_params.network,
metrics_info,
)
rollup_boost_image = (
Expand Down Expand Up @@ -365,6 +370,7 @@ def launch(
observability_helper,
cl_context.client_name,
"beacon",
network_params.network,
metrics_info,
{
"supernode": str(cl_context.supernode),
Expand Down Expand Up @@ -397,6 +403,7 @@ def launch(
observability_helper,
cl_builder_context.client_name,
"beacon-builder",
network_params.network,
metrics_info,
{
"supernode": str(cl_builder_context.supernode),
Expand Down
1 change: 0 additions & 1 deletion src/mev/rollup-boost/rollup_boost_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def launch(
engine_rpc_port_num=RPC_PORT_NUM,
rpc_http_url=http_url,
service_name=service_name,
el_metrics_info=None,
)


Expand Down
14 changes: 11 additions & 3 deletions src/observability/observability.star
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,19 @@ def new_metrics_job(
}


def register_op_service_metrics_job(helper, service):
def register_op_service_metrics_job(helper, service, network_name):
register_service_metrics_job(
helper,
service_name=service.name,
network_name=network_name,
endpoint=util.make_service_url_authority(service, METRICS_PORT_ID),
)


def register_service_metrics_job(
helper,
service_name,
network_name,
endpoint,
metrics_path="",
additional_labels={},
Expand All @@ -102,7 +104,7 @@ def register_service_metrics_job(
labels = {
"service": service_name,
"namespace": service_name,
"stack_optimism_io_network": "kurtosis",
"stack_optimism_io_network": network_name,
}
labels.update(additional_labels)

Expand All @@ -119,7 +121,12 @@ def register_service_metrics_job(


def register_node_metrics_job(
helper, client_name, client_type, node_metrics_info, additional_labels={}
helper,
client_name,
client_type,
network_name,
node_metrics_info,
additional_labels={},
):
labels = {
"client_type": client_type,
Expand All @@ -144,6 +151,7 @@ def register_node_metrics_job(
register_service_metrics_job(
helper,
service_name=node_metrics_info[METRICS_INFO_NAME_KEY],
network_name=network_name,
endpoint=node_metrics_info[METRICS_INFO_URL_KEY],
metrics_path=node_metrics_info[METRICS_INFO_PATH_KEY],
additional_labels=labels,
Expand Down
2 changes: 2 additions & 0 deletions src/participant_network.star
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def launch_participant_network(
l1_config_env_vars,
batcher_key,
batcher_params,
network_params,
observability_helper,
da_server_context,
)
Expand Down Expand Up @@ -120,6 +121,7 @@ def launch_participant_network(
proposer_key,
game_factory_address,
proposer_params,
network_params,
observability_helper,
)

Expand Down
5 changes: 4 additions & 1 deletion src/proposer/op-proposer/op_proposer_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def launch(
gs_proposer_private_key,
game_factory_address,
proposer_params,
network_params,
observability_helper,
):
proposer_service_name = "{0}".format(service_name)
Expand All @@ -63,7 +64,9 @@ def launch(
service = plan.add_service(service_name, config)
http_url = util.make_service_http_url(service)

observability.register_op_service_metrics_job(observability_helper, service)
observability.register_op_service_metrics_job(
observability_helper, service, network_params.network
)

return http_url

Expand Down

0 comments on commit 88360aa

Please sign in to comment.