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

Remove string limitation in Jackson deserializer for ES Client (#13283)

This commit is contained in:
kezhenxu94 2025-06-02 23:13:27 +08:00 committed by GitHub
parent 04648b3fd6
commit 18c802c587
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/changes/changes.md
View File

@ -27,6 +27,7 @@
* Bump up commons-beanutils to 1.11.0.
* Refactor: simplify the `Accept` http header process.
* [Break Change]Storage: Move `event` from metrics to recods.
* Remove string limitation in Jackson deserializer for ElasticSearch client.
#### UI

7
oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java
View File

@ -18,6 +18,8 @@
package org.apache.skywalking.library.elasticsearch;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonFactoryBuilder;
import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.linecorp.armeria.client.ClientFactory;
@ -60,7 +62,10 @@ import org.apache.skywalking.oap.server.library.util.StringUtil;
@Slf4j
@Accessors(fluent = true)
public final class ElasticSearch implements Closeable {
private final ObjectMapper mapper = new ObjectMapper()
private final ObjectMapper mapper = new ObjectMapper(
new JsonFactoryBuilder()
.streamReadConstraints(StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build())
.build())
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

2
test/e2e-v2/cases/lua/Dockerfile.nginx
View File

@ -25,5 +25,5 @@ RUN tar -xf ${SW_AGENT_NGINX_LUA_COMMIT}.tar.gz --strip 1
RUN rm ${SW_AGENT_NGINX_LUA_COMMIT}.tar.gz
RUN luarocks make rockspec/skywalking-nginx-lua-master-0.rockspec
RUN luarocks make --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 rockspec/skywalking-nginx-lua-master-0.rockspec

4
test/e2e-v2/cases/nginx/Dockerfile.nginx
View File

@ -15,5 +15,5 @@
FROM openresty/openresty:1.17.8.2-5-alpine-fat
RUN luarocks install nginx-lua-prometheus
RUN mkdir -p /var/log/nginx/
RUN luarocks --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 install nginx-lua-prometheus
RUN mkdir -p /var/log/nginx/