From 9b06f3bfe123b53deb4792f3ede30992da4eb9c9 Mon Sep 17 00:00:00 2001
From: Trevor Porter <trkporter@ucdavis.edu>
Date: Tue, 2 Apr 2024 11:56:32 +0100
Subject: [PATCH] Different key funder job name (#3506)

### Description

- My changes in #3491 / #3492 were kind of accurate - according to
https://github.com/prometheus/pushgateway/issues/65 even using pushAdd
will displace existing metrics. It's all very confusing!
- I tested this with a script that pushed some test metrics to the push
gateway - basically by having the key funder use a different job name
than the mainnet2 one, the metrics each of them push won't conflict with
one another

### Drive-by changes

<!--
Are there any minor or drive-by changes also included?
-->

### Related issues

<!--
- Fixes #[issue number here]
-->

### Backward compatibility

<!--
Are these changes backward compatible? Are there any infrastructure
implications, e.g. changes that would prohibit deploying older commits
using this infra tooling?

Yes/No
-->

### Testing

<!--
What kind of testing have these changes undergone?

None/Manual/Unit Tests
-->
---
 typescript/infra/config/environments/mainnet3/funding.ts    | 2 +-
 typescript/infra/scripts/funding/fund-keys-from-deployer.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/typescript/infra/config/environments/mainnet3/funding.ts b/typescript/infra/config/environments/mainnet3/funding.ts
index 0b5c00ed16..4d91b16832 100644
--- a/typescript/infra/config/environments/mainnet3/funding.ts
+++ b/typescript/infra/config/environments/mainnet3/funding.ts
@@ -9,7 +9,7 @@ import { environment } from './chains';
 export const keyFunderConfig: KeyFunderConfig = {
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-    tag: '7781bce-20240326-173938',
+    tag: 'd94cc52-20240328-104504',
   },
   // We're currently using the same deployer/key funder key as mainnet2.
   // To minimize nonce clobbering we offset the key funder cron
diff --git a/typescript/infra/scripts/funding/fund-keys-from-deployer.ts b/typescript/infra/scripts/funding/fund-keys-from-deployer.ts
index e03fa6a445..821bd29966 100644
--- a/typescript/infra/scripts/funding/fund-keys-from-deployer.ts
+++ b/typescript/infra/scripts/funding/fund-keys-from-deployer.ts
@@ -238,7 +238,7 @@ async function main() {
     failureOccurred ||= await funder.fund();
   }
 
-  await submitMetrics(metricsRegister, 'key-funder');
+  await submitMetrics(metricsRegister, `key-funder-${environment}`);
 
   if (failureOccurred) {
     logger.error('At least one failure occurred when funding');