You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/11/10 16:31:15 UTC
[skywalking] branch master updated: Fix max length to 512 of IDs. (#9947)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 03e8f8a994 Fix max length to 512 of IDs. (#9947)
03e8f8a994 is described below
commit 03e8f8a994c999915b7e06266abab91321cae4e5
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Nov 11 00:30:56 2022 +0800
Fix max length to 512 of IDs. (#9947)
---
docs/en/changes/changes.md | 1 +
.../java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java | 4 ++--
.../oap/server/core/analysis/manual/log/AbstractLogRecord.java | 4 ++--
.../oap/server/core/analysis/manual/segment/SegmentRecord.java | 4 ++--
.../org/apache/skywalking/oap/server/core/analysis/topn/TopN.java | 2 +-
.../server/core/browser/manual/errorlog/BrowserErrorLogRecord.java | 4 ++--
.../server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java | 2 +-
.../skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java | 2 +-
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 8ad0514bc0..7fea9928d8 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -105,6 +105,7 @@
* Support span attached event concept in Zipkin and SkyWalking trace query.
* Support span attached events on Zipkin lens UI.
* Force UTF-8 encoding in `JsonLogHandler` of `kafka-fetcher-plugin`.
+* Fix max length to 512 of entity, instance and endpoint IDs in trace, log, profiling, topN tables(JDBC storages). The value was 200 by default.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java
index dd76b4a8a5..84fe19d8cd 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java
@@ -64,9 +64,9 @@ public class AlarmRecord extends Record {
@Column(columnName = SCOPE)
private int scope;
- @Column(columnName = NAME, storageOnly = true)
+ @Column(columnName = NAME, storageOnly = true, length = 512)
private String name;
- @Column(columnName = ID0, storageOnly = true)
+ @Column(columnName = ID0, storageOnly = true, length = 512)
@BanyanDB.ShardingKey(index = 0)
private String id0;
@Column(columnName = ID1, storageOnly = true)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
index 5bbae2328a..58809b1248 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
@@ -55,12 +55,12 @@ public abstract class AbstractLogRecord extends Record {
private String serviceId;
@Setter
@Getter
- @Column(columnName = SERVICE_INSTANCE_ID)
+ @Column(columnName = SERVICE_INSTANCE_ID, length = 512)
@BanyanDB.ShardingKey(index = 1)
private String serviceInstanceId;
@Setter
@Getter
- @Column(columnName = ENDPOINT_ID)
+ @Column(columnName = ENDPOINT_ID, length = 512)
private String endpointId;
@Setter
@Getter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
index e88f326e76..5e173b8ccf 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
@@ -74,12 +74,12 @@ public class SegmentRecord extends Record {
private String serviceId;
@Setter
@Getter
- @Column(columnName = SERVICE_INSTANCE_ID)
+ @Column(columnName = SERVICE_INSTANCE_ID, length = 512)
@BanyanDB.ShardingKey(index = 1)
private String serviceInstanceId;
@Setter
@Getter
- @Column(columnName = ENDPOINT_ID)
+ @Column(columnName = ENDPOINT_ID, length = 512)
private String endpointId;
@Setter
@Getter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
index 5711951b5c..a10dc44126 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
@@ -44,7 +44,7 @@ public abstract class TopN extends Record implements ComparableStorageData {
private String traceId;
@Getter
@Setter
- @Column(columnName = ENTITY_ID)
+ @Column(columnName = ENTITY_ID, length = 512)
@BanyanDB.ShardingKey(index = 0)
private String entityId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
index 2cae8eca25..782e8d86ca 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
@@ -66,12 +66,12 @@ public class BrowserErrorLogRecord extends Record {
@Setter
@Getter
- @Column(columnName = SERVICE_VERSION_ID)
+ @Column(columnName = SERVICE_VERSION_ID, length = 512)
private String serviceVersionId;
@Setter
@Getter
- @Column(columnName = PAGE_PATH_ID)
+ @Column(columnName = PAGE_PATH_ID, length = 512)
private String pagePathId;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java
index 1265d6effb..95676c1940 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java
@@ -62,7 +62,7 @@ public class EBPFProfilingTaskRecord extends NoneStream {
private String serviceId;
@Column(columnName = PROCESS_LABELS_JSON, length = PROCESS_LABELS_JSON_MAX_LENGTH)
private String processLabelsJson;
- @Column(columnName = INSTANCE_ID)
+ @Column(columnName = INSTANCE_ID, length = 512)
private String instanceId;
@Column(columnName = START_TIME)
private long startTime;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java
index 2f9474d7fc..cb353cb60b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java
@@ -60,7 +60,7 @@ public class ProfileTaskRecord extends NoneStream {
@Column(columnName = SERVICE_ID)
@BanyanDB.ShardingKey(index = 0)
private String serviceId;
- @Column(columnName = ENDPOINT_NAME)
+ @Column(columnName = ENDPOINT_NAME, length = 512)
private String endpointName;
@Column(columnName = TASK_ID)
private String taskId;