You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/04/14 04:41:37 UTC
[skywalking] 01/01: Fix event can't split service ID into 2 parts
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch 8864-bug-event-cant-split-service-id-into-2-parts
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 92b73690cfcf79625d5b55b67cc23d0cc19bdd93
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Thu Apr 14 12:40:41 2022 +0800
Fix event can't split service ID into 2 parts
---
docs/en/changes/changes.md | 2 +-
.../apache/skywalking/oap/server/core/analysis/metrics/Metrics.java | 4 ++--
.../main/java/org/apache/skywalking/oap/server/core/source/Event.java | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a16e14829b..b78f77b71e 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -15,6 +15,7 @@
* Simplify the Kafka Fetch configuration in cluster mode.
* [Breaking Change] Update the eBPF Profiling task to the service level,
please delete index/table: `ebpf_profiling_task`, `process_traffic`.
+* Fix event can't split service ID into 2 parts.
#### UI
@@ -24,4 +25,3 @@
#### Documentation
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/128?closed=1)
-
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java
index 6763a47104..162bd03a79 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java
@@ -102,7 +102,7 @@ public abstract class Metrics extends StreamData implements StorageData, HavingD
if (isMinuteBucket()) {
return timeBucket / 100;
} else {
- throw new IllegalStateException("Current time bucket is not in minute dimensionality");
+ throw new IllegalStateException("Current time bucket is not in minute dimensionality: " + timeBucket);
}
}
@@ -112,7 +112,7 @@ public abstract class Metrics extends StreamData implements StorageData, HavingD
} else if (isHourBucket()) {
return timeBucket / 100;
} else {
- throw new IllegalStateException("Current time bucket is not in minute dimensionality");
+ throw new IllegalStateException("Current time bucket is not in minute dimensionality: " + timeBucket);
}
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
index b2eb20f2e3..67dcf159b3 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
@@ -44,6 +44,7 @@ import static org.apache.skywalking.oap.server.library.util.StringUtil.isNotBlan
@Getter
@Setter
@ScopeDeclaration(id = EVENT, name = "Event", catalog = SERVICE_CATALOG_NAME)
+@ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class)
@Stream(name = Event.INDEX_NAME, scopeId = EVENT, builder = Event.Builder.class, processor = MetricsStreamProcessor.class)
@EqualsAndHashCode(
callSuper = false,