diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 9837642c0054..abc713277341 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -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 diff --git a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java index de6b7414f77a..4e2b937d42e2 100644 --- a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java +++ b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java @@ -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 @@ @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); diff --git a/test/e2e-v2/cases/lua/Dockerfile.nginx b/test/e2e-v2/cases/lua/Dockerfile.nginx index 2a24f7830483..2500b090f9b6 100644 --- a/test/e2e-v2/cases/lua/Dockerfile.nginx +++ b/test/e2e-v2/cases/lua/Dockerfile.nginx @@ -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 diff --git a/test/e2e-v2/cases/nginx/Dockerfile.nginx b/test/e2e-v2/cases/nginx/Dockerfile.nginx index 75db26438d2c..5a8793041ec6 100644 --- a/test/e2e-v2/cases/nginx/Dockerfile.nginx +++ b/test/e2e-v2/cases/nginx/Dockerfile.nginx @@ -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/ \ No newline at end of file +RUN luarocks --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 install nginx-lua-prometheus +RUN mkdir -p /var/log/nginx/