Skip to content

Commit dc8740d

Browse files
authored
Fix IllegalArgumentException: Incorrect number of labels. (#13429)
1 parent e43c128 commit dc8740d

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

docs/en/changes/changes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
* Bump up netty to 4.2.4.Final.
6464
* Bump up commons-lang to 3.18.0.
6565
* BanyanDB: support group `replicas` and `user/password` for basic authentication.
66+
* BanyanDB: fix Zipkin query missing tag `QUERY`.
67+
* Fix `IllegalArgumentException: Incorrect number of labels`, tags in the `LogReportServiceHTTPHandler` and `LogReportServiceGrpcHandler` inconsistent with `LogHandler`.
6668
* BanyanDB: fix Zipkin query by `annotationQuery`
6769

6870
#### UI

oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/grpc/LogReportServiceGrpcHandler.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,16 @@ public LogReportServiceGrpcHandler(final ModuleManager moduleManager) {
5252
.getService(ILogAnalyzerService.class);
5353

5454
histogram = metricsCreator.createHistogramMetric(
55-
"log_in_latency", "The process latency of log",
56-
new MetricsTag.Keys("protocol"), new MetricsTag.Values("grpc")
55+
"log_in_latency",
56+
"The process latency of log",
57+
new MetricsTag.Keys("protocol", "data_format"),
58+
new MetricsTag.Values("grpc", "protobuf")
5759
);
58-
errorCounter = metricsCreator.createCounter("log_analysis_error_count", "The error number of log analysis",
59-
new MetricsTag.Keys("protocol"), new MetricsTag.Values("grpc")
60+
errorCounter = metricsCreator.createCounter(
61+
"log_analysis_error_count",
62+
"The error number of log analysis",
63+
new MetricsTag.Keys("protocol", "data_format"),
64+
new MetricsTag.Values("grpc", "protobuf")
6065
);
6166
}
6267

oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/rest/LogReportServiceHTTPHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@ public LogReportServiceHTTPHandler(final ModuleManager moduleManager) {
5050

5151
histogram = metricsCreator.createHistogramMetric(
5252
"log_in_latency", "The process latency of log",
53-
new MetricsTag.Keys("protocol"), new MetricsTag.Values("http")
53+
new MetricsTag.Keys("protocol", "data_format"),
54+
new MetricsTag.Values("http", "json")
5455
);
5556
errorCounter = metricsCreator.createCounter(
5657
"log_analysis_error_count", "The error number of log analysis",
57-
new MetricsTag.Keys("protocol"), new MetricsTag.Values("http")
58+
new MetricsTag.Keys("protocol", "data_format"),
59+
new MetricsTag.Values("http", "json")
5860
);
5961
}
6062

0 commit comments

Comments
 (0)