This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 d3d756bf4a Remove `lengthEnvVariable` for `Column` as it never works as expected (#9952) d3d756bf4a is described below commit d3d756bf4ad89e60cc5730ff3d6959a3a51b95e3 Author: kezhenxu94 <kezhenx...@apache.org> AuthorDate: Sat Nov 12 14:33:17 2022 +0800 Remove `lengthEnvVariable` for `Column` as it never works as expected (#9952) --- docs/en/changes/changes.md | 3 ++- .../core/analysis/manual/cache/TopNCacheReadCommand.java | 2 +- .../core/analysis/manual/cache/TopNCacheWriteCommand.java | 2 +- .../analysis/manual/database/TopNDatabaseStatement.java | 2 +- .../oap/server/core/storage/annotation/Column.java | 8 -------- .../oap/server/core/storage/model/StorageModels.java | 14 -------------- 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 5d7bbe0330..534cf5c459 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -105,9 +105,10 @@ * 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. +* 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. * Add component IDs(135, 136, 137) for EventMesh server and client-side plugins. * Bump up Kafka client to 2.8.1 to fix CVE-2021-38153. +* Remove `lengthEnvVariable` for `Column` as it never works as expected. #### UI diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java index 26d01aab99..66eeb7efb3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java @@ -41,7 +41,7 @@ public class TopNCacheReadCommand extends TopN { private String id; @Getter @Setter - @Column(columnName = STATEMENT, length = 2000, lengthEnvVariable = "SW_SLOW_DB_THRESHOLD", storageOnly = true) + @Column(columnName = STATEMENT, length = 2000, storageOnly = true) private String command; @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java index ca35032eb8..7c061e9a09 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java @@ -42,7 +42,7 @@ public class TopNCacheWriteCommand extends TopN { private String id; @Getter @Setter - @Column(columnName = STATEMENT, length = 2000, lengthEnvVariable = "SW_SLOW_DB_THRESHOLD", storageOnly = true) + @Column(columnName = STATEMENT, length = 2000, storageOnly = true) private String command; @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java index 284c25c6b4..d158455242 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java @@ -41,7 +41,7 @@ public class TopNDatabaseStatement extends TopN { private String id; @Getter @Setter - @Column(columnName = STATEMENT, length = 2000, lengthEnvVariable = "SW_SLOW_DB_THRESHOLD", storageOnly = true) + @Column(columnName = STATEMENT, length = 2000, storageOnly = true) private String statement; @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java index ac150b9b59..91560ba680 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java @@ -69,14 +69,6 @@ public @interface Column { */ int length() default 200; - /** - * The return name of system environment could provide an override value of the length limitation. - * - * @return the variable name of system environment. - * @since 8.2.0 - */ - String lengthEnvVariable() default ""; - /** * Column with data type != {@link ValueDataType#NOT_VALUE} represents this is a value column. Indicate it would be * queried by UI/CLI. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java index b0aee43678..33969f60f2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java @@ -35,7 +35,6 @@ import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase; import org.apache.skywalking.oap.server.core.storage.annotation.Storage; import org.apache.skywalking.oap.server.core.storage.annotation.SuperDataset; import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnMetadata; -import org.apache.skywalking.oap.server.library.util.StringUtil; /** * StorageModels manages all models detected by the core. @@ -154,19 +153,6 @@ public class StorageModels implements IModelManager, ModelCreator, ModelManipula // Use the column#length as the default column length, as read the system env as the override mechanism. // Log the error but don't block the startup sequence. int columnLength = column.length(); - final String lengthEnvVariable = column.lengthEnvVariable(); - if (StringUtil.isNotEmpty(lengthEnvVariable)) { - final String envValue = System.getenv(lengthEnvVariable); - if (StringUtil.isNotEmpty(envValue)) { - try { - columnLength = Integer.parseInt(envValue); - } catch (NumberFormatException e) { - log.error("Model [{}] Column [{}], illegal value {} of column length from system env [{}]", - modelName, column.columnName(), envValue, lengthEnvVariable - ); - } - } - } // SQL Database extension SQLDatabaseExtension sqlDatabaseExtension = new SQLDatabaseExtension();