From 6081f7f7b16bb616fc3df037b7f1a80ada357bd8 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Mon, 26 Jun 2017 11:26:24 +0800 Subject: [PATCH 1/2] fix lost tags --- .../java/org/skywalking/apm/agent/core/context/trace/Span.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From a556e6ef7c43ca23a600e93aa38cd18eee9a1dc9 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Mon, 26 Jun 2017 11:29:27 +0800 Subject: [PATCH 2/2] fix skywalking container start failure --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) 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"