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

Add self observability metrics for otel handler (#12598)

This commit is contained in:
kezhenxu94 2024-09-06 22:01:22 +08:00 committed by GitHub
parent 9d0cb9e28e
commit 78483991b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 278 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/changes/changes.md
View File

@ -58,6 +58,7 @@
* Fix the compatibility with Grafana 11 when using label_values query variables.
* Nacos as config server and cluster coordinator supports configuration contextPath.
* Update the endpoint name format to `<Method>:<Path>` in eBPF Access Log Receiver.
* Add self-observability metrics for OpenTelemetry receiver.
#### UI

24
oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
View File

@ -27,6 +27,7 @@ import io.opentelemetry.proto.common.v1.KeyValue;
import io.opentelemetry.proto.logs.v1.LogRecord;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.Getter;
import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogDataBody;
@ -39,6 +40,10 @@ import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import org.apache.skywalking.oap.server.receiver.otel.Handler;
import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics;
import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator;
import org.apache.skywalking.oap.server.telemetry.api.MetricsTag;
import java.util.Map;
import java.util.stream.Collectors;
@ -54,6 +59,17 @@ public class OpenTelemetryLogHandler
private ILogAnalyzerService logAnalyzerService;
@Getter(lazy = true)
private final MetricsCreator metricsCreator = manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
@Getter(lazy = true)
private final HistogramMetrics processHistogram = getMetricsCreator().createHistogramMetric(
"otel_logs_latency",
"The latency to process the logs request",
MetricsTag.EMPTY_KEY,
MetricsTag.EMPTY_VALUE
);
@Override
public String type() {
return "otlp-logs";
@ -87,9 +103,11 @@ public class OpenTelemetryLogHandler
.getScopeLogsList()
.stream()
.flatMap(it -> it.getLogRecordsList().stream())
.forEach(
logRecord ->
doAnalysisQuietly(service, layer, serviceInstance, logRecord));
.forEach(logRecord -> {
try (final var timer = getProcessHistogram().createTimer()) {
doAnalysisQuietly(service, layer, serviceInstance, logRecord);
}
});
responseObserver.onNext(ExportLogsServiceResponse.getDefaultInstance());
responseObserver.onCompleted();
});

19
oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
View File

@ -25,6 +25,7 @@ import io.opentelemetry.proto.common.v1.KeyValue;
import io.opentelemetry.proto.metrics.v1.Sum;
import io.opentelemetry.proto.metrics.v1.SummaryDataPoint;
import io.vavr.Function1;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
@ -42,6 +43,10 @@ import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Histogra
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 org.apache.skywalking.oap.server.telemetry.TelemetryModule;
import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics;
import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator;
import org.apache.skywalking.oap.server.telemetry.api.MetricsTag;
import java.io.IOException;
import java.util.HashMap;
@ -73,7 +78,19 @@ public class OpenTelemetryMetricRequestProcessor implements Service {
.build();
private List<PrometheusMetricConverter> converters;
@Getter(lazy = true)
private final MetricsCreator metricsCreator = manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
@Getter(lazy = true)
private final HistogramMetrics processHistogram = getMetricsCreator().createHistogramMetric(
"otel_metrics_latency",
"The latency to process the metrics request",
MetricsTag.EMPTY_KEY,
MetricsTag.EMPTY_VALUE
);
public void processMetricsRequest(final ExportMetricsServiceRequest requests) {
try (final var unused = getProcessHistogram().createTimer()) {
requests.getResourceMetricsList().forEach(request -> {
if (log.isDebugEnabled()) {
log.debug("Resource attributes: {}", request.getResource().getAttributesList());
@ -105,7 +122,7 @@ public class OpenTelemetryMetricRequestProcessor implements Service {
"Convert OTEL metric to prometheus metric"
)))));
});
}
}
public void start() throws ModuleStartException {

22
oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
View File

@ -30,6 +30,7 @@ import io.opentelemetry.proto.common.v1.KeyValue;
import io.opentelemetry.proto.resource.v1.Resource;
import io.opentelemetry.proto.trace.v1.ScopeSpans;
import io.opentelemetry.proto.trace.v1.Status;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
@ -40,6 +41,10 @@ import org.apache.skywalking.oap.server.receiver.otel.Handler;
import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule;
import org.apache.skywalking.oap.server.receiver.zipkin.SpanForwardService;
import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverModule;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics;
import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator;
import org.apache.skywalking.oap.server.telemetry.api.MetricsTag;
import zipkin2.Endpoint;
import zipkin2.Span;
@ -64,6 +69,17 @@ public class OpenTelemetryTraceHandler
private final ModuleManager manager;
private SpanForwardService forwardService;
@Getter(lazy = true)
private final MetricsCreator metricsCreator = manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
@Getter(lazy = true)
private final HistogramMetrics processHistogram = getMetricsCreator().createHistogramMetric(
"otel_spans_latency",
"The latency to process the span request",
MetricsTag.EMPTY_KEY,
MetricsTag.EMPTY_VALUE
);
@Override
public String type() {
return "otlp-traces";
@ -80,13 +96,14 @@ public class OpenTelemetryTraceHandler
@Override
public void export(ExportTraceServiceRequest request, StreamObserver<ExportTraceServiceResponse> responseObserver) {
final ArrayList<Span> result = new ArrayList<>();
try (final var unused = getProcessHistogram().createTimer()) {
request.getResourceSpansList().forEach(resourceSpans -> {
final Resource resource = resourceSpans.getResource();
final List<ScopeSpans> scopeSpansList = resourceSpans.getScopeSpansList();
if (resource.getAttributesCount() == 0 && scopeSpansList.size() == 0) {
return;
}
final Map<String, String> resourceTags = convertAttributeToMap(resource.getAttributesList());
String serviceName = extractZipkinServiceName(resourceTags);
if (StringUtil.isEmpty(serviceName)) {
@ -106,8 +123,9 @@ public class OpenTelemetryTraceHandler
log.warn("convert span error, discarding the span: {}", e.getMessage());
}
});
getForwardService().send(result);
}
responseObserver.onNext(ExportTraceServiceResponse.getDefaultInstance());
responseObserver.onCompleted();
}

27
oap-server/server-starter/src/main/resources/otel-rules/oap.yaml
View File

@ -37,15 +37,17 @@ metricsRules:
- name: instance_jvm_memory_bytes_used
exp: jvm_memory_bytes_used.sum(['service', 'host_name'])
- name: instance_jvm_gc_count
exp: "jvm_gc_collection_seconds_count.tagMatch('gc', 'PS Scavenge|Copy|ParNew|G1 Young Generation|PS MarkSweep|MarkSweepCompact|ConcurrentMarkSweep|G1 Old Generation')
exp: >
jvm_gc_collection_seconds_count.tagMatch('gc', 'PS Scavenge|Copy|ParNew|G1 Young Generation|PS MarkSweep|MarkSweepCompact|ConcurrentMarkSweep|G1 Old Generation')
.sum(['service', 'host_name', 'gc']).increase('PT1M')
.tag({tags -> if (tags['gc'] == 'PS Scavenge' || tags['gc'] == 'Copy' || tags['gc'] == 'ParNew' || tags['gc'] == 'G1 Young Generation') {tags.gc = 'young_gc_count'} })
.tag({tags -> if (tags['gc'] == 'PS MarkSweep' || tags['gc'] == 'MarkSweepCompact' || tags['gc'] == 'ConcurrentMarkSweep' || tags['gc'] == 'G1 Old Generation') {tags.gc = 'old_gc_count'} })"
.tag({tags -> if (tags['gc'] == 'PS MarkSweep' || tags['gc'] == 'MarkSweepCompact' || tags['gc'] == 'ConcurrentMarkSweep' || tags['gc'] == 'G1 Old Generation') {tags.gc = 'old_gc_count'} })
- name: instance_jvm_gc_time
exp: "(jvm_gc_collection_seconds_sum * 1000).tagMatch('gc', 'PS Scavenge|Copy|ParNew|G1 Young Generation|PS MarkSweep|MarkSweepCompact|ConcurrentMarkSweep|G1 Old Generation')
exp: >
(jvm_gc_collection_seconds_sum * 1000).tagMatch('gc', 'PS Scavenge|Copy|ParNew|G1 Young Generation|PS MarkSweep|MarkSweepCompact|ConcurrentMarkSweep|G1 Old Generation')
.sum(['service', 'host_name', 'gc']).increase('PT1M')
.tag({tags -> if (tags['gc'] == 'PS Scavenge' || tags['gc'] == 'Copy' || tags['gc'] == 'ParNew' || tags['gc'] == 'G1 Young Generation') {tags.gc = 'young_gc_time'} })
.tag({tags -> if (tags['gc'] == 'PS MarkSweep' || tags['gc'] == 'MarkSweepCompact' || tags['gc'] == 'ConcurrentMarkSweep' || tags['gc'] == 'G1 Old Generation') {tags.gc = 'old_gc_time'} })"
.tag({tags -> if (tags['gc'] == 'PS MarkSweep' || tags['gc'] == 'MarkSweepCompact' || tags['gc'] == 'ConcurrentMarkSweep' || tags['gc'] == 'G1 Old Generation') {tags.gc = 'old_gc_time'} })
- name: instance_trace_count
exp: trace_in_latency_count.sum(['service', 'host_name']).increase('PT1M')
- name: instance_trace_latency_percentile
@ -59,8 +61,9 @@ metricsRules:
- name: instance_mesh_analysis_error_count
exp: mesh_analysis_error_count.sum(['service', 'host_name']).increase('PT1M')
- name: instance_metrics_aggregation
exp: "metrics_aggregation.tagEqual('dimensionality', 'minute').sum(['service', 'host_name', 'level']).increase('PT1M')
.tag({tags -> if (tags['level'] == '1') {tags.level = 'L1 aggregation'} }).tag({tags -> if (tags['level'] == '2') {tags.level = 'L2 aggregation'} })"
exp: >
metrics_aggregation.tagEqual('dimensionality', 'minute').sum(['service', 'host_name', 'level']).increase('PT1M')
.tag({tags -> if (tags['level'] == '1') {tags.level = 'L1 aggregation'} }).tag({tags -> if (tags['level'] == '2') {tags.level = 'L2 aggregation'} })
- name: instance_persistence_execute_percentile
exp: persistence_timer_bulk_execute_latency.sum(['le', 'service', 'host_name']).increase('PT5M').histogram().histogram_percentile([50,70,90,99])
- name: instance_persistence_prepare_percentile
@ -99,3 +102,15 @@ metricsRules:
exp: k8s_als_drop_count.sum(['service', 'host_name']).increase('PT1M')
- name: instance_k8s_als_latency_percentile
exp: k8s_als_in_latency.sum(['le', 'service', 'host_name']).increase('PT1M').histogram().histogram_percentile([50,70,90,99])
- name: otel_metrics_received
exp: otel_metrics_latency_count.sum(['service', 'host_name']).increase('PT1M')
- name: otel_logs_received
exp: otel_logs_latency_count.sum(['service', 'host_name']).increase('PT1M')
- name: otel_spans_received
exp: otel_spans_latency_count.sum(['service', 'host_name']).increase('PT1M')
- name: otel_metrics_latency_percentile
exp: otel_metrics_latency.sum(['le', 'service', 'host_name']).increase('PT1M').histogram().histogram_percentile([50,70,90,99])
- name: otel_logs_latency_percentile
exp: otel_logs_latency.sum(['le', 'service', 'host_name']).increase('PT1M').histogram().histogram_percentile([50,70,90,99])
- name: otel_spans_latency_percentile
exp: otel_spans_latency.sum(['le', 'service', 'host_name']).increase('PT1M').histogram().histogram_percentile([50,70,90,99])

142
oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json
View File

@ -467,6 +467,148 @@
"expressions": [
"relabels(meter_oap_instance_k8s_als_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
]
},
{
"x": 12,
"y": 13,
"w": 6,
"h": 13,
"i": "19",
"type": "Widget",
"expressions": [
"meter_oap_otel_metrics_received"
],
"graph": {
"type": "Line",
"step": false,
"smooth": false,
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
},
"widget": {
"title": "OpenTelemetry Metrics (Requests / Second)"
},
"metricConfig": [
{
"label": "Received Requests"
}
]
},
{
"x": 12,
"y": 26,
"w": 6,
"h": 13,
"i": "20",
"type": "Widget",
"expressions": [
"meter_oap_otel_logs_received"
],
"graph": {
"type": "Line",
"step": false,
"smooth": false,
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
},
"widget": {
"title": "OpenTelemetry Logs (Requests / Second)"
}
},
{
"x": 0,
"y": 26,
"w": 6,
"h": 13,
"i": "21",
"type": "Widget",
"expressions": [
"meter_oap_otel_spans_received"
],
"graph": {
"type": "Line",
"step": false,
"smooth": false,
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
},
"widget": {
"title": "OpenTelemetry Spans (Requests / Second)"
},
"metricConfig": [
{
"unit": "Requests / Second"
}
]
},
{
"x": 18,
"y": 13,
"w": 6,
"h": 13,
"i": "22",
"type": "Widget",
"expressions": [
"relabels(meter_oap_otel_metrics_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
],
"graph": {
"type": "Line",
"step": false,
"smooth": false,
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
},
"widget": {
"title": "OpenTelemetry Metrics Latency (ms / min)"
}
},
{
"x": 6,
"y": 26,
"w": 6,
"h": 13,
"i": "23",
"type": "Widget",
"expressions": [
"relabels(meter_oap_otel_spans_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
],
"graph": {
"type": "Line",
"step": false,
"smooth": false,
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
},
"widget": {
"title": "OpenTelemetry Spans Latency (ms / min)"
}
},
{
"x": 18,
"y": 26,
"w": 6,
"h": 13,
"i": "24",
"type": "Widget",
"expressions": [
"relabels(meter_oap_otel_logs_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
],
"graph": {
"type": "Line",
"step": false,
"smooth": false,
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
},
"widget": {
"title": "OpenTelemetry Logs Latency (ms / min)"
}
}
]
}