...
 
Commits (3)
    https://gitcode.net/apache/skywalking/-/commit/155d2311114125a3f36e11526ab763f316585bb3 Support process Sum metrics with AGGREGATION_TEMPORALITY_DELTA case (#10410) 2023-02-20T07:18:36+08:00 叶梦飞 70845636+mufiye@users.noreply.github.com https://gitcode.net/apache/skywalking/-/commit/af3889b47eabc8e63ce54c5415d6ec6c4528c53a Bump up BanyanDB 0.3.0 client. (#10406) 2023-02-20T09:18:41+08:00 吴晟 Wu Sheng wu.sheng@foxmail.com https://gitcode.net/apache/skywalking/-/commit/327333a0a306c7337a1445ea78ea9771d69f36ff Update firehose receiver doc to introduce requirement for proxy (#10416) 2023-02-20T21:20:22+08:00 pg.yang pg.yang@hotmail.com
......@@ -98,6 +98,7 @@
* Migrate tests from junit 4 to junit 5.
* Refactor http-based alarm plugins and extract common logic to `HttpAlarmCallback`.
* Support Amazon Simple Storage Service (Amazon S3) metrics monitoring
* Support process Sum metrics with AGGREGATION_TEMPORALITY_DELTA case
#### UI
......@@ -128,6 +129,7 @@
* Fix: remove duplicate popup message for query result.
* Add logo for HTTPX.
* Refactor: optimize the attached events visualization in the trace widget.
* Update BanyanDB client to 0.3.0.
#### Documentation
......
......@@ -23,4 +23,4 @@ CloudWatch metrics with S3 --> CloudWatch Metric Stream (OpenTelemetry formart)
## Notice
1. Only OpenTelemetry format is supported (refer to [Metric streams output formats](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-metric-streams-formats.html))
2. Only HTTPS could be accepted, you could directly enable TLS and set the receiver to listen 443, or put the receiver behind a gateway with HTTPS (refer to [Amazon Kinesis Data Firehose Delivery Stream HTTP Endpoint Delivery Specifications](https://docs.aws.amazon.com/firehose/latest/dev/httpdeliveryrequestresponse.html))
2. A proxy(e.g. Nginx, Envoy) is required in front of OAP's Firehose receiver to accept HTTPS requests from AWS Firehose through port `443` (refer to [Amazon Kinesis Data Firehose Delivery Stream HTTP Endpoint Delivery Specifications](https://docs.aws.amazon.com/firehose/latest/dev/httpdeliveryrequestresponse.html).
......@@ -72,7 +72,7 @@
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
<banyandb-java-client.version>0.3.0-rc1</banyandb-java-client.version>
<banyandb-java-client.version>0.3.0</banyandb-java-client.version>
<kafka-clients.version>2.8.1</kafka-clients.version>
<spring-kafka-test.version>2.4.6.RELEASE</spring-kafka-test.version>
</properties>
......
......@@ -48,7 +48,8 @@ import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Metric;
import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Summary;
import org.apache.skywalking.oap.server.receiver.otel.OtelMetricReceiverConfig;
import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE;
import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA;
import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_UNSPECIFIED;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
......@@ -180,9 +181,23 @@ public class OpenTelemetryMetricRequestProcessor implements Service {
if (metric.hasSum()) {
final Sum sum = metric.getSum();
if (sum
.getAggregationTemporality() != AGGREGATION_TEMPORALITY_CUMULATIVE) {
.getAggregationTemporality() == AGGREGATION_TEMPORALITY_UNSPECIFIED) {
return Stream.empty();
}
if (sum
.getAggregationTemporality() == AGGREGATION_TEMPORALITY_DELTA) {
return sum.getDataPointsList().stream()
.map(point -> new Gauge(
metric.getName(),
mergeLabels(
nodeLabels,
buildLabels(point.getAttributesList())
),
point.hasAsDouble() ? point.getAsDouble()
: point.getAsInt(),
point.getTimeUnixNano() / 1000000
));
}
if (sum.getIsMonotonic()) {
return sum.getDataPointsList().stream()
.map(point -> new Counter(
......
......@@ -23,6 +23,6 @@ SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=b670c41d94a82ddefcf466d54bab5c492d88d772
SW_ROVER_COMMIT=8550199e98c9f5a4b2058878a0a899ffb73fe461
SW_BANYANDB_COMMIT=1c19243df23f8350ea5c1542fd914c49e8698960
SW_BANYANDB_COMMIT=1cc0a42bc41dca9b8f4e1b3c4fd13b283f24f817
SW_CTL_COMMIT=0883266bfaa36612927b69e35781b64ea181758d