update log and client options

XiaoMi · Jun 8, 2020 · 8a23cab · 8a23cab
1 parent 1b73958
commit 8a23cab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/src/main/java/com/xiaomi/infra/pegasus/client/ClientOptions.java b/src/main/java/com/xiaomi/infra/pegasus/client/ClientOptions.java
@@ -202,9 +202,8 @@ public Builder asyncWorkers(int asyncWorkers) {
 
     /**
      * Whether to enable performance statistics. If true, the client will periodically report
-     * metrics to local falcon agent (if set falcon as monitoring system) or open
-     * prometheus collector http server. Defaults to {@literal true}, see {@link
-     * #DEFAULT_ENABLE_PERF_COUNTER}.
+     * metrics to local falcon agent (if set falcon as monitoring system) or open prometheus
+     * collector http server. Defaults to {@literal true}, see {@link #DEFAULT_ENABLE_PERF_COUNTER}.
      *
      * @param enablePerfCounter enablePerfCounter
      * @return {@code this}
@@ -215,8 +214,8 @@ public Builder enablePerfCounter(boolean enablePerfCounter) {
     }
 
     /**
-     * set the perf-counter type, now only support falcon and prometheus, Defaults to
-     * {@literal falcon}, see {@link #DEFAULT_PERF_COUNTER_TYPE}
+     * set the perf-counter type, now only support falcon and prometheus, Defaults to {@literal
+     * falcon}, see {@link #DEFAULT_PERF_COUNTER_TYPE}
      *
      * @param perfCounterType perfCounterType
      * @return this
@@ -240,8 +239,8 @@ public Builder perfCounterTags(String perfCounterTags) {
     }
 
     /**
-     * The interval to report metrics to local falcon agent(if set falcon as
-     * monitor system). Defaults to {@literal 10s}, see {@link #DEFAULT_FALCON_PUSH_INTERVAL}.
+     * The interval to report metrics to local falcon agent(if set falcon as monitor system).
+     * Defaults to {@literal 10s}, see {@link #DEFAULT_FALCON_PUSH_INTERVAL}.
      *
      * @param falconPushInterval falconPushInterval
      * @return {@code this}
@@ -338,8 +337,8 @@ public int getAsyncWorkers() {
 
   /**
    * Whether to enable performance statistics. If true, the client will periodically report metrics
-   * to local falcon agent (if set falcon as monitoring system) or open prometheus
-   * collector http server. Defaults to {@literal true}.
+   * to local falcon agent (if set falcon as monitoring system) or open prometheus collector http
+   * server. Defaults to {@literal true}.
    *
    * @return whether to enable performance statistics.
    */
@@ -366,8 +365,8 @@ public String getPerfCounterTags() {
   }
 
   /**
-   * The interval to report metrics to local falcon agent(if set falcon as monitor
-   * system). Defaults to {@literal 10s}.
+   * The interval to report metrics to local falcon agent(if set falcon as monitor system). Defaults
+   * to {@literal 10s}.
    *
    * @return the interval to report metrics to local falcon agent.
    */

diff --git a/src/main/java/com/xiaomi/infra/pegasus/metrics/FalconCollector.java b/src/main/java/com/xiaomi/infra/pegasus/metrics/FalconCollector.java
@@ -53,7 +53,7 @@ public void genJsonsFromMeter(String name, Meter meter, StringBuilder output)
       throws JSONException {
     falconMetric.counterType = "GAUGE";
 
-    falconMetric.metric = name + ".cps-1sec";
+    falconMetric.metric = name + "_cps_1sec";
     falconMetric.tags = getTableTag(name, defaultTags);
     falconMetric.value = meter.getMeanRate();
     oneMetricToJson(falconMetric, output);
@@ -64,13 +64,13 @@ public void genJsonsFromHistogram(String name, Histogram hist, StringBuilder out
     falconMetric.counterType = "GAUGE";
     Snapshot s = hist.getSnapshot();
 
-    falconMetric.metric = name + ".p99";
+    falconMetric.metric = name + "_p99";
     falconMetric.tags = getTableTag(name, defaultTags);
     falconMetric.value = s.get99thPercentile();
     oneMetricToJson(falconMetric, output);
     output.append(',');
 
-    falconMetric.metric = name + ".p999";
+    falconMetric.metric = name + "_p999";
     falconMetric.tags = getTableTag(name, defaultTags);
     falconMetric.value = s.get999thPercentile();
     oneMetricToJson(falconMetric, output);

diff --git a/src/main/java/com/xiaomi/infra/pegasus/metrics/PrometheusCollector.java b/src/main/java/com/xiaomi/infra/pegasus/metrics/PrometheusCollector.java
@@ -67,9 +67,9 @@ private void updateLatencyMetric(
     Map<String, String> labels = getLabel(getTableTag(name, defaultTags));
     Snapshot snapshot = meter.getValue().getSnapshot();
     updateLatencyMetric(
-        formatLatencyMetricName(name, "99th"), snapshot.get99thPercentile(), labels, builder);
+        formatLatencyMetricName(name, "_p99"), snapshot.get99thPercentile(), labels, builder);
     updateLatencyMetric(
-        formatLatencyMetricName(name, "999th"), snapshot.get999thPercentile(), labels, builder);
+        formatLatencyMetricName(name, "_p999"), snapshot.get999thPercentile(), labels, builder);
   }
 
   private void updateLatencyMetric(