Skip to content

Remove string limitation in Jackson deserializer for ES Client #13283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 2 commits into from
Jun 2, 2025
Merged

Remove string limitation in Jackson deserializer for ES Client #13283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b45ba
Remove string limitation in Jackson deserializer for ElasticSearch cl…
kezhenxu94 Jun 2, 2025
6d0d876
lua
kezhenxu94 Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/en/changes/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion ...earch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion test/e2e-v2/cases/lua/Dockerfile.nginx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions test/e2e-v2/cases/nginx/Dockerfile.nginx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Loading