Skip to content

Commit 274c4a9

Browse files
author
AztecBot
committed
Merge branch 'next' into merge-train/avm
2 parents 78a215d + 32eb09d commit 274c4a9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ci3/aws/ami_id_amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ami-0137463b0495bd43a
1+
ami-04e78caef78d6c15b

ci3/aws/ami_id_arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ami-0df1a9cb8bbd2a6df
1+
ami-01aec194b4807f598

spartan/terraform/gke-cluster/cluster/main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ resource "google_container_cluster" "primary" {
3434
dataset_id = "egress_consumption"
3535
}
3636
}
37+
38+
node_config {
39+
logging_variant = "MAX_THROUGHPUT"
40+
}
3741
}
3842

3943
# Create 2 core node pool with local ssd

yarn-project/foundation/src/log/gcloud-logger-config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ const GOOGLE_CLOUD_TRACE_SAMPLED = 'logging.googleapis.com/trace_sampled';
1313
*/
1414
export const GoogleCloudLoggerConfig = {
1515
messageKey: 'message',
16-
// Same as pino.stdTimeFunctions.isoTime but uses "timestamp" key instead of "time"
17-
timestamp(): string {
18-
return `,"timestamp":"${new Date(Date.now()).toISOString()}"`;
19-
},
2016
formatters: {
2117
log(object: Record<string, unknown>): Record<string, unknown> {
2218
// Add trace context attributes following Cloud Logging structured log format described

0 commit comments

Comments
 (0)