Merge remote-tracking branch 'origin/systeminfo' into systeminfo

apache · Nov 19, 2019 · cf72a47 · cf72a47
2 parents 75a3896 + 1977fdd
commit cf72a47
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 19 deletions.
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
@@ -250,7 +250,7 @@ The text of each license is the standard Apache 2.0 license.
     LMAX Ltd.(disruptor) 3.3.6: https://github.com/LMAX-Exchange/disruptor , Apache 2.0
     Eclipse (Jetty) 3.3.6: https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0
     SnakeYAML 1.18: http://www.snakeyaml.org , Apache 2.0
-    Joda-Time 2.9.9: http://www.joda.org/joda-time/ , Apache 2.0
+    Joda-Time 2.10.5: http://www.joda.org/joda-time/ , Apache 2.0
     Joda-Convert 1.2: http://www.joda.org/joda-convert/ , Apache 2.0
     Spring Framework 4.3.14.RELEASE: https://github.com/spring-projects/spring-framework, Apache 2.0
     Spring Boot 1.5.10: https://spring.io/, Apache 2.0

diff --git a/docs/README.md b/docs/README.md
@@ -17,6 +17,7 @@ you are facing a problem, check here first.
 In addition, you might find these links interesting:
 
 - The latest and old releases are all available at [Apache SkyWalking release page](http://skywalking.apache.org/downloads/). The change logs are [here](../CHANGES.md).
+- Up-to-date overview of SkyWalking module [call flow](https://sourcespy.com/github/skywalking/xx-omcalls-.html) and [hierarchy](https://sourcespy.com/github/skywalking/xx-omhierarchy-.html) including ability to analize each module individually.
 - You can find the speaking schedules at Conf, online videos and articles about SkyWalking in [Community resource catalog](https://github.com/OpenSkywalking/Community).
 Also, if you have some related to us, welcome to submit a pull request to add.
 - We’re always looking for help improving our documentation and codes, so please don’t hesitate to [file an issue](https://github.com/apache/skywalking/issues/new) 

diff --git a/docs/en/concepts-and-designs/service-mesh-probe.md b/docs/en/concepts-and-designs/service-mesh-probe.md
@@ -12,7 +12,7 @@ such as A/B testing, canary releases, rate limiting, access control, and end-to-
 Istio is a very typical Service Mesh design and implementor. It defines **Control Panel** and **Data Panel**,
 which are wide used. Here is Istio Architecture:
 
-<img src="https://istio.io/docs/concepts/what-is-istio/arch.svg"/>
+![Istio Architecture](https://istio.io/docs/ops/architecture/arch.svg)
 
 Service Mesh probe can choose to collect data from **Control Panel** or **Data Panel**. In Istio, 
 it means collecting telemetry data from Mixer(Control Panel) or Envoy sidecar(Data Panel). Underlying

diff --git a/docs/powered-by.md b/docs/powered-by.md
@@ -2,7 +2,7 @@
 This page documents an **alphabetical list** of institutions that are using Apache SkyWalking for research and production,
 or providing commercial products including Apache SkyWalking.
 
-
+1. 17173.com https://www.17173.com/
 1. 300.cn 中企动力科技股份有限公司 http://www.300.cn/
 1. 360jinrong.net 360金融 https://www.360jinrong.net/
 1. 4399.com 四三九九网络股份有限公司. http://www.4399.com/
@@ -33,6 +33,7 @@ or providing commercial products including Apache SkyWalking.
 1. Dianfubao.com 垫富宝 https://www.dianfubao.com/
 1. Echplus.com 北京易诚互动网络技术有限公司 http://www.echplus.com/
 1. Eqxiu.com. 北京中网易企秀科技有限公司 http://www.eqxiu.com/
+1. fangdd.com 房多多 https://www.fangdd.com
 1. fullgoal.com.cn 富国基金管理有限公司 https://www.fullgoal.com.cn/
 1. GTrace System. (No company provided) 
 1. GSX Techedu Inc. 跟谁学 https://www.genshuixue.com
@@ -62,6 +63,7 @@ or providing commercial products including Apache SkyWalking.
 1. Mobanker.com 上海前隆信息科技有限公司  http://www.mobanker.com/
 1. Mxnavi. 沈阳美行科技有限公司 http://www.mxnavi.com/
 1. Moji 墨叽（深圳）科技有限公司 https://www.mojivip.com
+1. MINSHENG FinTech 民生科技有限责任公司 http://www.mskj.com/
 1. Mypharma.com 北京融贯电子商务有限公司 https://www.mypharma.com
 1. NetEase 网易 https://www.163.com/
 1. Osacart in WeChat app 广州美克曼尼电子商务有限公司

diff --git a/oap-server/pom.xml b/oap-server/pom.xml
@@ -63,7 +63,7 @@
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <commons-io.version>2.6</commons-io.version>
         <elasticsearch.version>6.3.2</elasticsearch.version>
-        <joda-time.version>2.9.9</joda-time.version>
+        <joda-time.version>2.10.5</joda-time.version>
         <kubernetes.version>4.0.0</kubernetes.version>
         <hikaricp.version>3.1.0</hikaricp.version>
         <zipkin.version>2.9.1</zipkin.version>

diff --git a/.../oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java b/.../oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
@@ -18,13 +18,25 @@
 
 package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener.endpoint;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 import org.apache.skywalking.apm.network.common.KeyStringValuePair;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.SpanLayer;
+import org.apache.skywalking.apm.network.language.agent.UniqueId;
 import org.apache.skywalking.apm.util.StringUtil;
-import org.apache.skywalking.oap.server.core.*;
+import org.apache.skywalking.oap.server.core.Const;
+import org.apache.skywalking.oap.server.core.CoreModule;
 import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
-import org.apache.skywalking.oap.server.core.cache.*;
-import org.apache.skywalking.oap.server.core.source.*;
+import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache;
+import org.apache.skywalking.oap.server.core.cache.NetworkAddressInventoryCache;
+import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache;
+import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache;
+import org.apache.skywalking.oap.server.core.source.DatabaseSlowStatement;
+import org.apache.skywalking.oap.server.core.source.DetectPoint;
+import org.apache.skywalking.oap.server.core.source.EndpointRelation;
+import org.apache.skywalking.oap.server.core.source.RequestType;
+import org.apache.skywalking.oap.server.core.source.SourceReceiver;
 import org.apache.skywalking.oap.server.library.module.ModuleManager;
 import org.apache.skywalking.oap.server.receiver.trace.provider.DBLatencyThresholdsAndWatcher;
 import org.apache.skywalking.oap.server.receiver.trace.provider.TraceServiceModuleConfig;
@@ -40,10 +52,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 import static java.util.Objects.nonNull;
 
 /**
@@ -179,13 +187,13 @@ public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI
             for (KeyStringValuePair tag : spanDecorator.getAllTags()) {
                 if (SpanTags.DB_STATEMENT.equals(tag.getKey())) {
                     String sqlStatement = tag.getValue();
-                    if (!StringUtil.isEmpty(sqlStatement) && sqlStatement.length() > config.getMaxSlowSQLLength()) {
-                        statement.setStatement(sqlStatement.substring(0,config.getMaxSlowSQLLength()));
-                    }
-                    else {
+                    if (StringUtil.isEmpty(sqlStatement)) {
+                        statement.setStatement("[No statement]/" + sourceBuilder.getDestEndpointName());
+                    } else if (sqlStatement.length() > config.getMaxSlowSQLLength()) {
+                        statement.setStatement(sqlStatement.substring(0, config.getMaxSlowSQLLength()));
+                    } else {
                         statement.setStatement(sqlStatement);
                     }
-
                 } else if (SpanTags.DB_TYPE.equals(tag.getKey())) {
                     String dbType = tag.getValue();
                     DBLatencyThresholdsAndWatcher thresholds = config.getDbLatencyThresholdsAndWatcher();

diff --git a/oap-server/server-starter/src/main/resources/component-libraries.yml b/oap-server/server-starter/src/main/resources/component-libraries.yml
@@ -327,6 +327,15 @@ Koa:
   id: 4004
   languages: Node.js
 
+# Golang components
+# [5000, 6000) for Golang agent
+ServiceCombMesher:
+  id: 5001
+  languages: Golang
+ServiceCombServiceCenter:
+  id: 5002
+  languages: Golang
+
 # Component Server mapping defines the server display names of some components
 # e.g.
 # Jedis is a client library in Java for Redis server

diff --git a/skywalking-ui b/skywalking-ui
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -83,7 +83,7 @@ jetty-util-9.4.2.v20170220.jar
 jline-0.9.94.jar
 jna-4.5.1.jar
 joda-convert-1.2.jar
-joda-time-2.9.9.jar
+joda-time-2.10.5.jar
 jopt-simple-4.6.jar
 json-flattener-0.6.0.jar
 jsr305-1.3.9.jar