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

Limit the length of Event#parameters (#8622)

This commit is contained in:
吴晟 Wu Sheng 2022-03-06 21:35:43 +08:00 committed by GitHub
parent ddde0c9612
commit ff024ce7a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -80,6 +80,7 @@ Release Notes.
* Unify module name `receiver_zipkin` to `receiver-zipkin`, remove `receiver_jaeger` from `application.yaml`.
* Introduce the entity of Process type.
* Set the length of event#parameters to 2000.
* Limit the length of Event#parameters.
#### UI

16
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
View File

@ -19,8 +19,10 @@
package org.apache.skywalking.oap.server.core.source;
import com.google.common.base.Strings;
import java.util.HashMap;
import java.util.Map;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@ -37,8 +39,8 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import static org.apache.skywalking.oap.server.library.util.StringUtil.isNotBlank;
import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.EVENT;
import static org.apache.skywalking.oap.server.library.util.StringUtil.isNotBlank;
@Getter
@Setter
@ -73,6 +75,8 @@ public class Event extends Metrics implements ISource, WithMetadata, LongValueHo
public static final String END_TIME = "end_time";
private static final int PARAMETER_MAX_LENGTH = 2000;
@Override
protected String id0() {
return getUuid();
@ -99,7 +103,7 @@ public class Event extends Metrics implements ISource, WithMetadata, LongValueHo
@Column(columnName = MESSAGE)
private String message;
@Column(columnName = PARAMETERS, storageOnly = true, length = 20000)
@Column(columnName = PARAMETERS, storageOnly = true, length = PARAMETER_MAX_LENGTH)
private String parameters;
@Column(columnName = START_TIME)
@ -146,6 +150,14 @@ public class Event extends Metrics implements ISource, WithMetadata, LongValueHo
return true;
}
/**
* @since 9.0.0 Limit the length of {@link #parameters}
*/
public void setParameters(String parameters) {
this.parameters = parameters == null || parameters.length() <= PARAMETER_MAX_LENGTH ?
parameters : parameters.substring(0, PARAMETER_MAX_LENGTH);
}
@Override
public void calculate() {
}