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

Merge branch 'master' into zhangxin/feature/force-enable-plugin

This commit is contained in:
吴晟 Wu Sheng 2017-06-26 20:28:29 +08:00 committed by GitHub
parent ace2e63887 cf2d0c7fff
commit 9efff4bc63
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java
View File

@ -383,7 +383,7 @@ public class Span implements AbstractSpan {
} }
} }
if (span.tagsWithInt != null) { if (span.tagsWithInt != null) {
if (tagWithInt != null) { if (tagWithInt == null) {
tagWithInt = new JsonObject(); tagWithInt = new JsonObject();
} }
for (IntTagItem item : span.tagsWithInt) { for (IntTagItem item : span.tagsWithInt) {

3
docker-compose.yml
View File

@ -30,6 +30,9 @@ services:
es-server: es-server:
image: elasticsearch:5.3 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" 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: expose:
- "9200" - "9200"
- "9300" - "9300"