From 5ddf39f65f52a4cb49e193946eb6923c34c02c25 Mon Sep 17 00:00:00 2001 From: manojks1999 <9743manoj@gmail.com> Date: Sun, 27 Oct 2024 23:09:50 +0530 Subject: [PATCH 1/3] Improved Date formatter --- .../csp/sentinel/node/metric/MetricNode.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java index 2f8de6bc2f..437ffe886d 100755 --- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java +++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java @@ -15,9 +15,10 @@ */ package com.alibaba.csp.sentinel.node.metric; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; /** * Metrics data for a specific resource at given {@code timestamp}. @@ -211,11 +212,16 @@ public static MetricNode fromThinString(String line) { * @return string format of this. */ public String toFatString() { - DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); StringBuilder sb = new StringBuilder(32); sb.delete(0, sb.length()); - sb.append(getTimestamp()).append("|"); - sb.append(df.format(new Date(getTimestamp()))).append("|"); + + long timestamp = getTimestamp(); + sb.append(timestamp).append("|"); + + LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()); + sb.append(dateTime.format(formatter)).append("|"); + String legalName = getResource().replaceAll("\\|", "_"); sb.append(legalName).append("|"); sb.append(getPassQps()).append("|"); From 135592d9cf696c168ed314af67466c39c5bfa1f4 Mon Sep 17 00:00:00 2001 From: manojks1999 <9743manoj@gmail.com> Date: Thu, 31 Oct 2024 17:31:41 +0530 Subject: [PATCH 2/3] change in naming conv --- .../com/alibaba/csp/sentinel/node/metric/MetricNode.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java index 437ffe886d..0e15dbb1bd 100755 --- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java +++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java @@ -211,8 +211,10 @@ public static MetricNode fromThinString(String line) { * * @return string format of this. */ + + private static DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + public String toFatString() { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); StringBuilder sb = new StringBuilder(32); sb.delete(0, sb.length()); @@ -220,7 +222,7 @@ public String toFatString() { sb.append(timestamp).append("|"); LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()); - sb.append(dateTime.format(formatter)).append("|"); + sb.append(dateTime.format(df)).append("|"); String legalName = getResource().replaceAll("\\|", "_"); sb.append(legalName).append("|"); From 5ad320c86fdda1b9d831f3bd75701bd9df35890f Mon Sep 17 00:00:00 2001 From: manojks1999 <9743manoj@gmail.com> Date: Thu, 31 Oct 2024 17:37:43 +0530 Subject: [PATCH 3/3] change in datetime format --- .../java/com/alibaba/csp/sentinel/node/metric/MetricNode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java index 0e15dbb1bd..3f234365b6 100755 --- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java +++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/MetricNode.java @@ -213,7 +213,7 @@ public static MetricNode fromThinString(String line) { */ private static DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - + public String toFatString() { StringBuilder sb = new StringBuilder(32); sb.delete(0, sb.length()); @@ -222,7 +222,7 @@ public String toFatString() { sb.append(timestamp).append("|"); LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()); - sb.append(dateTime.format(df)).append("|"); + sb.append(df.format(dateTime)).append("|"); String legalName = getResource().replaceAll("\\|", "_"); sb.append(legalName).append("|");