kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support the identification of the source host of the metric data in otel-receiver-plugin (#6243)

This commit is contained in:
wankai123 2021-01-22 22:24:19 +08:00 committed by GitHub
parent 100823cb6e
commit 777c670c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -74,6 +74,7 @@ Release Notes.
* Add the implementation of ConfigurationDiscovery on the OAP side.
* Fix bug in `parseInternalErrorCode` where some error codes are never reached.
* OAL supports multiple values when as numeric
* Add node information from the Openensus proto to the labels of the samples, to support the identification of the source of the Metric data.
#### UI
* Fix un-removed tags in trace query.

3
docs/en/setup/backend/backend-receivers.md
View File

@ -182,6 +182,9 @@ receiver-otel:
enabledHandlers: ${SW_OTEL_RECEIVER_ENABLED_HANDLERS:"oc"}
enabledOcRules: ${SW_OTEL_RECEIVER_ENABLED_OC_RULES:"istio-controlplane"}
```
The receiver adds labels with `key = node_identifier_host_name` and `key = node_identifier_pid` to the collected data samples，
and values from `Node.identifier.host_name` and `Node.identifier.pid` defined in opencensus agent proto,
to be the identification of the metric data.
## Meter receiver

33
oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/oc/OCMetricHandler.java
View File

@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.receiver.otel.oc;
import com.google.protobuf.Timestamp;
import io.grpc.stub.StreamObserver;
import io.opencensus.proto.agent.common.v1.Node;
import io.opencensus.proto.agent.metrics.v1.ExportMetricsServiceRequest;
import io.opencensus.proto.agent.metrics.v1.ExportMetricsServiceResponse;
import io.opencensus.proto.agent.metrics.v1.MetricsServiceGrpc;
@ -34,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
import org.apache.skywalking.oap.meter.analyzer.prometheus.PrometheusMetricConverter;
import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
@ -57,11 +59,32 @@ public class OCMetricHandler extends MetricsServiceGrpc.MetricsServiceImplBase i
@Override public StreamObserver<ExportMetricsServiceRequest> export(
StreamObserver<ExportMetricsServiceResponse> responseObserver) {
return new StreamObserver<ExportMetricsServiceRequest>() {
@Override public void onNext(ExportMetricsServiceRequest request) {
private Node node;
private Map<String, String> nodeLabels = new HashMap<>();
@Override
public void onNext(ExportMetricsServiceRequest request) {
if (request.hasNode()) {
node = request.getNode();
nodeLabels.clear();
if (node.hasIdentifier()) {
if (StringUtil.isNotBlank(node.getIdentifier().getHostName())) {
nodeLabels.put("node_identifier_host_name", node.getIdentifier().getHostName());
}
if (node.getIdentifier().getPid() > 0) {
nodeLabels.put("node_identifier_pid", String.valueOf(node.getIdentifier().getPid()));
}
}
}
metrics.forEach(m -> m.toMeter(request.getMetricsList().stream()
.flatMap(metric -> metric.getTimeseriesList().stream().map(timeSeries ->
Tuple.of(metric.getMetricDescriptor(),
buildLabels(metric.getMetricDescriptor().getLabelKeysList(), timeSeries.getLabelValuesList()),
buildLabelsFromNodeInfo(
nodeLabels, buildLabels(
metric.getMetricDescriptor().getLabelKeysList(),
timeSeries.getLabelValuesList()
)
),
timeSeries)))
.flatMap(t -> t._3.getPointsList().stream().map(point -> Tuple.of(t._1, t._2, point)))
.map(Function1.liftTry(t -> {
@ -107,6 +130,12 @@ public class OCMetricHandler extends MetricsServiceGrpc.MetricsServiceImplBase i
return result;
}
private static Map<String, String> buildLabelsFromNodeInfo(Map<String, String> nodeLabels,
Map<String, String> buildLabelsResult) {
buildLabelsResult.putAll(nodeLabels);
return buildLabelsResult;
}
private static Map<Double, Long> buildBuckets(DistributionValue distributionValue) {
Map<Double, Long> result = new HashMap<>();
List<Double> bounds = distributionValue.getBucketOptions().getExplicit().getBoundsList();