diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java index 28f32f6ac..f3a3faa0e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java @@ -383,7 +383,7 @@ public class Span implements AbstractSpan { } } if (span.tagsWithInt != null) { - if (tagWithInt != null) { + if (tagWithInt == null) { tagWithInt = new JsonObject(); } for (IntTagItem item : span.tagsWithInt) { diff --git a/docker-compose.yml b/docker-compose.yml index c0164684b..0f07a2151 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,9 @@ services: es-server: image: elasticsearch:5.3 command: "-Enode.name=TestNode -Enetwork.host=0.0.0.0 -Ehttp.cors.enabled=true -Ehttp.cors.allow-origin=* -Ethread_pool.bulk.queue_size=1000 -Ecluster.name=CollectorDBCluster" + environment: + - bootstrap.memory_lock=true + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" expose: - "9200" - "9300"