From 180ca713755eb7958a3430fe4ee33527288e24db Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Tue, 8 Oct 2024 20:59:42 +0800 Subject: [PATCH] Fix checking OTEL DataPointFlags (#12682) --- .../OpenTelemetryMetricRequestProcessor.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java index 092bf3f57c..ae60bdbade 100644 --- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java +++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java @@ -238,8 +238,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { final Map nodeLabels, final io.opentelemetry.proto.metrics.v1.Metric metric) { if (metric.hasGauge()) { - return metric.getGauge().getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return metric.getGauge().getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Gauge( metric.getName(), mergeLabels( @@ -259,8 +259,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { } if (sum .getAggregationTemporality() == AGGREGATION_TEMPORALITY_DELTA) { - return sum.getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return sum.getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Gauge( metric.getName(), mergeLabels( @@ -273,8 +273,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { )); } if (sum.getIsMonotonic()) { - return sum.getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return sum.getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Counter( metric.getName(), mergeLabels( @@ -286,8 +286,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { point.getTimeUnixNano() / 1000000 )); } else { - return sum.getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return sum.getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Gauge( metric.getName(), mergeLabels( @@ -301,8 +301,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { } } if (metric.hasHistogram()) { - return metric.getHistogram().getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return metric.getHistogram().getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Histogram( metric.getName(), mergeLabels( @@ -319,8 +319,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { )); } if (metric.hasExponentialHistogram()) { - return metric.getExponentialHistogram().getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return metric.getExponentialHistogram().getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Histogram( metric.getName(), mergeLabels( @@ -340,8 +340,8 @@ public class OpenTelemetryMetricRequestProcessor implements Service { )); } if (metric.hasSummary()) { - return metric.getSummary().getDataPointsList().stream().filter(point -> point.getFlags() - != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) + return metric.getSummary().getDataPointsList().stream().filter(point -> + (point.getFlags() & DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) != DataPointFlags.FLAG_NO_RECORDED_VALUE_VALUE) .map(point -> new Summary( metric.getName(), mergeLabels(