Re: [PR] [fix](metrics) Replace sensitive user emails with placeholder in MetricsTest [doris]

[via GitHub]

morrySnow commented on code in PR #66937:
URL: https://github.com/apache/doris/pull/66937#discussion_r3811798949


##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\"}
 0.0"));
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\",user=\"test_user\"}
 10.0"));
         Assert.assertTrue(metricResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"qing...@lbk.one\"} 20.0"));
-        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_lu@lbk_one"));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
20.0"));
+        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_com"));
 
     }
 
     @Test
     public void 
testPrometheusVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"thomas....@developertools.com")));
+                Lists.newArrayList(new MetricLabel("user", 
"x...@example.com")));
         histogramMetric.update(30L);
         MetricVisitor prometheusVisitor = new PrometheusMetricVisitor();
         prometheusVisitor.visitHistogram(MetricVisitor.FE_PREFIX, 
histogramMetric.getName(),
                 histogramMetric.getHistogram(), histogramMetric.getLabels());
         String prometheusResult = prometheusVisitor.finish();
         Assert.assertTrue(prometheusResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"thomas....@developertools.com\"}
 30.0"));
-        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_liu@developertools_com"));
-        Assert.assertFalse(prometheusResult.contains("user=\"thomas\""));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
30.0"));
+        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_com"));
+        Assert.assertFalse(prometheusResult.contains("user=\"xxx@example\""));
     }
 
     @Test
     public void testJsonVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"qing...@lbk.one")));
+                Lists.newArrayList(new MetricLabel("user", 
"x...@example.com")));
         histogramMetric.update(20L);
         MetricVisitor jsonVisitor = new JsonMetricVisitor();
         jsonVisitor.visitHistogram(MetricVisitor.FE_PREFIX, 
histogramMetric.getName(),
                 histogramMetric.getHistogram(), histogramMetric.getLabels());
         String jsonResult = jsonVisitor.finish();
         
Assert.assertTrue(jsonResult.contains("\"metric\":\"doris_fe_query_latency_ms\""));
-        Assert.assertTrue(jsonResult.contains("\"user\":\"qing...@lbk.one\""));
-        
Assert.assertFalse(jsonResult.contains("\"metric\":\"doris_fe_query_latency_ms_lu@lbk_one\""));
+        
Assert.assertTrue(jsonResult.contains("\"user\":\"x...@example.com\""));
+        
Assert.assertFalse(jsonResult.contains("\"metric\":\"doris_fe_query_latency_ms_com\""));

Review Comment:
   这里也得保留 `@` 和 `.`



##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\"}
 0.0"));
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\",user=\"test_user\"}
 10.0"));
         Assert.assertTrue(metricResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"qing...@lbk.one\"} 20.0"));
-        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_lu@lbk_one"));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
20.0"));
+        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_com"));
 
     }
 
     @Test
     public void 
testPrometheusVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"thomas....@developertools.com")));
+                Lists.newArrayList(new MetricLabel("user", 
"x...@example.com")));
         histogramMetric.update(30L);
         MetricVisitor prometheusVisitor = new PrometheusMetricVisitor();
         prometheusVisitor.visitHistogram(MetricVisitor.FE_PREFIX, 
histogramMetric.getName(),
                 histogramMetric.getHistogram(), histogramMetric.getLabels());
         String prometheusResult = prometheusVisitor.finish();
         Assert.assertTrue(prometheusResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"thomas....@developertools.com\"}
 30.0"));
-        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_liu@developertools_com"));
-        Assert.assertFalse(prometheusResult.contains("user=\"thomas\""));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
30.0"));
+        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_com"));
+        Assert.assertFalse(prometheusResult.contains("user=\"xxx@example\""));
     }
 
     @Test
     public void testJsonVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"qing...@lbk.one")));
+                Lists.newArrayList(new MetricLabel("user", 
"x...@example.com")));

Review Comment:
   这里也得保留 `@` 和 `.`



##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\"}
 0.0"));
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\",user=\"test_user\"}
 10.0"));
         Assert.assertTrue(metricResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"qing...@lbk.one\"} 20.0"));
-        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_lu@lbk_one"));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
20.0"));
+        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_com"));

Review Comment:
   这里也得保留 `@` 和 `.`



##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\"}
 0.0"));
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\",user=\"test_user\"}
 10.0"));
         Assert.assertTrue(metricResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"qing...@lbk.one\"} 20.0"));
-        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_lu@lbk_one"));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
20.0"));
+        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_com"));
 
     }
 
     @Test
     public void 
testPrometheusVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"thomas....@developertools.com")));
+                Lists.newArrayList(new MetricLabel("user", 
"x...@example.com")));
         histogramMetric.update(30L);
         MetricVisitor prometheusVisitor = new PrometheusMetricVisitor();
         prometheusVisitor.visitHistogram(MetricVisitor.FE_PREFIX, 
histogramMetric.getName(),
                 histogramMetric.getHistogram(), histogramMetric.getLabels());
         String prometheusResult = prometheusVisitor.finish();
         Assert.assertTrue(prometheusResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"thomas....@developertools.com\"}
 30.0"));
-        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_liu@developertools_com"));
-        Assert.assertFalse(prometheusResult.contains("user=\"thomas\""));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"x...@example.com\"} 
30.0"));
+        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_com"));

Review Comment:
   这里也得保留 `@` 和 `.`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org