You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/09/04 08:56:37 UTC

[skywalking] branch telemetry-ssl updated (ffbc260 -> 527c5e1)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch telemetry-ssl
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from ffbc260  Merge branch 'master' into telemetry-ssl
     add 1473c04  Introduce label system to histogram (#5425)
     add 527c5e1  Merge branch 'master' into telemetry-ssl

No new revisions were added by this update.

Summary of changes:
 docs/en/setup/backend/backend-fetcher.md           |  12 +-
 .../provider/meter/process/MeterBuilder.java       |   2 +-
 .../meter/function/AvgHistogramFunction.java       |  37 +++---
 .../function/AvgHistogramPercentileFunction.java   | 112 ++++++++++++-------
 .../analysis/meter/function/BucketedValues.java    |  16 ++-
 .../analysis/meter/function/HistogramFunction.java |   2 +-
 .../meter/function/PercentileFunction.java         |   2 +-
 .../server/core/analysis/metrics/DataTable.java    |   3 +-
 .../promethues/PrometheusMetricConverter.java      |  93 ++++++++++------
 .../metric/promethues/operation/Operation.java     |   3 +
 .../core/metric/promethues/rule/MetricsRule.java   |   2 +
 .../oap/server/core/query/type/HeatMap.java        |  23 +++-
 ...tionTest.java => AvgHistogramFunctionTest.java} | 124 +++++++++++++--------
 ...ava => AvgHistogramPercentileFunctionTest.java} |  82 ++++----------
 .../meter/function/HistogramFunctionTest.java      |   8 +-
 .../meter/function/PercentileFunctionTest.java     |   4 +-
 .../library/util/prometheus/parser/Context.java    |  41 ++++---
 .../util/prometheus/parser/TextParserTest.java     |  14 +++
 .../src/test/resources/testdata/prometheus.txt     |  24 ++--
 19 files changed, 363 insertions(+), 241 deletions(-)
 copy oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/{HistogramFunctionTest.java => AvgHistogramFunctionTest.java} (72%)
 copy oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/{PercentileFunctionTest.java => AvgHistogramPercentileFunctionTest.java} (67%)