diff --git a/LICENSE b/LICENSE index 9c690615f9a8e7ae95f3d266e566712114b1c4d0..6be634f4db02c91f2182b94c8d814db4fc360f29 100644 --- a/LICENSE +++ b/LICENSE @@ -285,7 +285,7 @@ in one of these ways: Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. - e) Convey the object code using peer-to-peer transmission, provided + e) Convey the object code using peer_host-to-peer_host transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. @@ -436,7 +436,7 @@ material under section 10. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission +occurring solely as a consequence of using peer_host-to-peer_host transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java index fd971c9cfe7a7ab8571e5a0c1588f123b9bff0c6..e460ef7b77f9bf7450724448183f1b2a15284f0f 100644 --- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java +++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java @@ -4,16 +4,16 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.TypeAdapter; -import com.google.gson.annotations.Expose; import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; - import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.*; -import org.skywalking.apm.trace.TraceId.DistributedTraceIds; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import org.skywalking.apm.trace.tag.BooleanTagItem; import org.skywalking.apm.trace.tag.IntTagItem; import org.skywalking.apm.trace.tag.StringTagItem; @@ -30,7 +30,7 @@ import org.skywalking.apm.util.StringUtil; */ @JsonAdapter(Span.Serializer.class) public class Span { - private static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); + private static Gson SERIALIZATION_GSON = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); private int spanId; private int parentSpanId; @@ -53,10 +53,10 @@ public class Span { private String operationName; /** - * {@link #peer}, {@link #port} and {@link #peers} were part of tags, + * {@link #peer_host}, {@link #port} and {@link #peers} were part of tags, * independence them from tags for better performance and gc. */ - private String peer; + private String peer_host; private int port; @@ -334,8 +334,8 @@ public class Span { return false; } - public String getPeer() { - return peer; + public String getPeerHost() { + return peer_host; } public int getPort() { @@ -346,8 +346,8 @@ public class Span { return peers; } - public void setPeer(String peer) { - this.peer = peer; + public void setPeer_host(String peer_host) { + this.peer_host = peer_host; } public void setPort(int port) { @@ -380,8 +380,8 @@ public class Span { this.writeTags(out, span); - if(span.logs != null) { - out.name("logs").jsonValue(gson.toJson(span.logs)); + if (span.logs != null) { + out.name("logs").jsonValue(SERIALIZATION_GSON.toJson(span.logs)); } out.endObject(); @@ -391,9 +391,9 @@ public class Span { JsonObject tagWithStr = null; JsonObject tagWithInt = null; JsonObject tagWithBool = null; - if (!StringUtil.isEmpty(span.peer)) { + if (!StringUtil.isEmpty(span.peer_host)) { tagWithStr = new JsonObject(); - tagWithStr.addProperty("peer.host", span.peer); + tagWithStr.addProperty("peer.host", span.peer_host); tagWithInt = new JsonObject(); tagWithInt.addProperty("peer.port", span.port); } else if (!StringUtil.isEmpty(span.peers)) { diff --git a/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java b/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java index 612d67653b17cdec1668cbe549986962b5ec4431..e25b3429591432ba750b3d997b7b375402c428e0 100644 --- a/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java +++ b/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java @@ -8,7 +8,6 @@ import org.skywalking.apm.trace.tag.StringTagReader; import org.skywalking.apm.trace.tag.Tags; import java.util.List; -import java.util.Map; /** * Created by wusheng on 2017/2/18. @@ -45,14 +44,14 @@ public class SpanTestCase { Span span1 = new Span(0, "serviceA"); Tags.SPAN_LAYER.asHttp(span1); Tags.COMPONENT.set(span1, "Spring"); - span1.setPeer("127.0.0.1"); + span1.setPeer_host("127.0.0.1"); Tags.ERROR.set(span1, true); Tags.STATUS_CODE.set(span1, 302); Tags.URL.set(span1, "http://127.0.0.1/serviceA"); Tags.DB_STATEMENT.set(span1, "select * from users"); Assert.assertEquals("http", StringTagReader.get(span1, Tags.SPAN_LAYER.SPAN_LAYER_TAG)); - Assert.assertEquals("127.0.0.1", span1.getPeer()); + Assert.assertEquals("127.0.0.1", span1.getPeerHost()); Assert.assertTrue(BooleanTagReader.get(span1, Tags.ERROR)); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java index 687e725d759a060f671c5ba59af1e50c241b7772..0d70a27e4ffae176ad5d2528a588d9dd141e6f47 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java @@ -1,15 +1,13 @@ package org.skywalking.apm.agent.core.context; -import org.skywalking.apm.agent.core.conf.Config; +import java.util.LinkedList; +import java.util.List; import org.skywalking.apm.agent.core.boot.ServiceManager; +import org.skywalking.apm.agent.core.conf.Config; import org.skywalking.apm.agent.core.sampling.SamplingService; import org.skywalking.apm.trace.Span; import org.skywalking.apm.trace.TraceSegment; import org.skywalking.apm.trace.TraceSegmentRef; -import org.skywalking.apm.trace.tag.Tags; - -import java.util.LinkedList; -import java.util.List; /** * {@link TracerContext} maintains the context. @@ -148,12 +146,12 @@ public final class TracerContext { Span span = this.activeSpan(); carrier.setSpanId(span.getSpanId()); carrier.setApplicationCode(Config.Agent.APPLICATION_CODE); - String host = Tags.PEER_HOST.get(span); + String host = span.getPeerHost(); if (host != null) { - Integer port = Tags.PEER_PORT.get(span); + Integer port = span.getPort(); carrier.setPeerHost(host + ":" + port); } else { - carrier.setPeerHost(Tags.PEERS.get(span)); + carrier.setPeerHost(span.getPeers()); } carrier.setDistributedTraceIds(this.segment.getRelatedGlobalTraces()); carrier.setSampled(this.segment.isSampled()); diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java index e60eaa2c8e518728265ebd2a5b2bad36d8b56fd7..e803c29babf013eb4a40d1151c7cca6e40f8ab25 100644 --- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java +++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java @@ -18,8 +18,8 @@ public class DubboSpanGenerator { Tags.COMPONENT.set(span, "Dubbo"); Tags.URL.set(span, "rest://192.168.1.8:20880/default_rpc/org.skywalking.apm.test.persistence.PersistenceService.query(String)"); Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER); - Tags.PEER_HOST.set(span, "192.168.1.8"); - Tags.PEER_PORT.set(span, 20880); + span.setPeer_host("192.168.1.8"); + span.setPort(20880); Tags.SPAN_LAYER.asHttp(span); } @@ -36,7 +36,7 @@ public class DubboSpanGenerator { Tags.COMPONENT.set(span, "Dubbo"); Tags.URL.set(span, "rest://192.168.1.8:20880/default_rpc/org.skywalking.apm.test.persistence.PersistenceService.query(String)"); Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT); - Tags.PEER_HOST.set(span, "10.21.9.35"); + span.setPeer_host("10.21.9.35"); Tags.SPAN_LAYER.asHttp(span); } diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java index e8afc69047d8b17ca8a9ba7a763977b6d0ad6d3d..52f518da43acad9d6e57f2948c94a228ba7ff29d 100644 --- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java +++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java @@ -16,8 +16,8 @@ public class MySQLGenerator { Span span = ContextManager.createSpan("mysql/jdbi/statement/executeQuery"); Tags.COMPONENT.set(span, "Mysql"); Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT); - Tags.PEER_HOST.set(span, "10.5.34.18"); - Tags.PEER_PORT.set(span, 30088); + span.setPeer_host("10.5.34.18"); + span.setPort(30088); Tags.DB_INSTANCE.set(span, "mysql-instance"); Tags.DB_STATEMENT.set(span, "select * from users where user_id = 1"); Tags.DB_TYPE.set(span, "sql"); diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java index c3c85d427c7d39f78e459828c8f9d86b5fcb41d3..6e7adfc26bc879d5976ac67a3bcfe20b5ede7f2f 100644 --- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java +++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java @@ -19,8 +19,8 @@ public class TomcatSpanGenerator { Tags.COMPONENT.set(webSpan, "Tomcat"); Tags.URL.set(webSpan, "http://10.21.9.35/web/serviceA"); Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); - Tags.PEER_HOST.set(webSpan, "10.21.9.35"); - Tags.PEER_PORT.set(webSpan, 80); + webSpan.setPeer_host("10.21.9.35"); + webSpan.setPort(80); Tags.SPAN_LAYER.asHttp(webSpan); } @@ -41,8 +41,8 @@ public class TomcatSpanGenerator { Tags.COMPONENT.set(webSpan, "Tomcat"); Tags.URL.set(webSpan, "http://10.21.9.35/web/unknown"); Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); - Tags.PEER_HOST.set(webSpan, "10.21.9.35"); - Tags.PEER_PORT.set(webSpan, 80); + webSpan.setPeer_host("10.21.9.35"); + webSpan.setPort(80); Tags.SPAN_LAYER.asHttp(webSpan); } @@ -64,8 +64,8 @@ public class TomcatSpanGenerator { Tags.COMPONENT.set(webSpan, "Tomcat"); Tags.URL.set(webSpan, "http://10.21.9.35/web/error/service"); Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); - Tags.PEER_HOST.set(webSpan, "10.21.9.35"); - Tags.PEER_PORT.set(webSpan, 80); + webSpan.setPeer_host("10.21.9.35"); + webSpan.setPort(80); Tags.SPAN_LAYER.asHttp(webSpan); }