Merge branch 'master' into feature/instancedep

apache · Nov 27, 2019 · a70adc8 · a70adc8
2 parents 5f9b585 + 0020b03
commit a70adc8
Show file tree

Hide file tree

Showing 21 changed files with 582 additions and 12 deletions.
diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml
@@ -16,7 +16,7 @@
 
 name: docker-ci
 
-on: [push]
+on: [push, pull_request]
 env:
   SKIP_TEST: true
   DOCKER_DIR: ./docker

diff --git a/CHANGES.md b/CHANGES.md
@@ -62,6 +62,7 @@ Release Notes.
 - BugFix: endpoint grouping rules may be not unique (#3510)
 - Add feature to control the maximum agent log files (#3475)
 - Agent support custom properties. (#3367)
+- Add Light4j plugin (#3323)
 
 #### Document
 - Remove travis badge (#3763)

diff --git a/Jenkinsfile-Agent-Test-2 b/Jenkinsfile-Agent-Test-2
@@ -67,7 +67,7 @@ pipeline {
                 sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build'
             }
         }
-        stage('Test Cases Report (146)') {
+        stage('Test Cases Report (170)') {
             steps {
                 echo "Test Cases Report"
             }
@@ -105,6 +105,12 @@ pipeline {
                                 sh 'bash test/plugin/run.sh dubbo-2.7.x-scenario'
                             }
                         }
+
+                        stage('okhttp 3.0.x-3.14.x (34)') {
+                            steps {
+                                sh 'bash test/plugin/run.sh okhttp-scenario'
+                            }
+                        }
                     }
                 }
 

diff --git a/Jenkinsfile-Agent-Test-3 b/Jenkinsfile-Agent-Test-3
@@ -67,7 +67,7 @@ pipeline {
                 sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build'
             }
         }
-        stage('Test Cases Report (160)') {
+        stage('Test Cases Report (161)') {
             steps {
                 echo "Test Cases Report"
             }
@@ -122,7 +122,7 @@ pipeline {
                             }
                         }
 
-                        stage('grpc 1.0.0-1.9.0 (21)') {
+                        stage('grpc 1.6.0-1.25.0 (22)') {
                             steps {
                                 sh 'bash test/plugin/run.sh grpc-scenario'
                             }

diff --git a/LICENSE b/LICENSE
@@ -222,8 +222,8 @@ The text of each license is the standard Apache 2.0 license.
    proto files from lyft/protoc-gen-validate: https://github.com/lyft/protoc-gen-validate Apache 2.0
    proto files from gogo/googleapis: https://github.com/gogo/googleapis Apache 2.0
    mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
-
-
+   svg files from skywalking-ui/src/assets/icons: https://github.com/google/material-design-icons Apache 2.0
+    
 ========================================================================
 BSD licenses
 ========================================================================

diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
@@ -423,7 +423,7 @@ lodash	4.17.15:	https://github.com/lodash/lodash	MIT
 Apache 2.0 licenses
 ========================================
 echarts	4.1.0:	https://github.com/apache/incubator-echarts	Apache-2.0
-
+Material Icons 3.0.1 https://github.com/google/material-design-icons Apache-2.0
 ========================================
 BSD licenses
 ========================================

diff --git a/...niffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java b/...niffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -168,7 +168,8 @@ public static class Logging {
         public static String FILE_NAME = "skywalking-api.log";
 
         /**
-         * Log files directory. Default is blank string, means, use "system.out" to output logs.
+         * Log files directory. Default is blank string, means, use "{theSkywalkingAgentJarDir}/logs  " to output logs. 
+         * {theSkywalkingAgentJarDir} is the directory where the skywalking agent jar file is located.
          *
          * Ref to {@link WriterFactory#getLogWriter()}
          */

diff --git a/docs/en/guides/Plugin-test.md b/docs/en/guides/Plugin-test.md
@@ -187,7 +187,7 @@ as the version number, it will be changed in the test for every version.
 
 **Take following test cases as examples**
 * [dubbo-2.7.x with JVM-container](../../../test/plugin/scenarios/dubbo-2.7.x-scenario/configuration.yml)
-* [jetty with Tomcat-container](../../../test/plugin/scenarios/jetty-scenario/configuration.yml)
+* [jetty with JVM-container](../../../test/plugin/scenarios/jetty-scenario/configuration.yml)
 * [gateway with runningMode](../../../test/plugin/scenarios/gateway-scenario/configuration.yml)
 * [canal with docker-compose](../../../test/plugin/scenarios/canal-scenario/configuration.yml)
 
@@ -630,13 +630,14 @@ canal 1.0.24-1.1.2 | 5 | 214.05
 
 
 ### Workload 2
-#### Group 1 (2906.54s)
+#### Group 1 (3936.54s)
 scenario name | versions | elapsed time (sec)
 ---|---|---
 spring-tx 4.x+ | 10 | 555.00
 spring 4.3.x-5.2.x | 54 | 1769.32
 dubbo 2.5.x-2.6.x | 10 | 367.23
 dubbo 2.7.x | 4 | 214.99
+okhttp 3.0.x-3.14.x | 34 | 1030
 
 #### Group 2 (2550.66s)
 scenario name | versions | elapsed time (sec)
@@ -661,6 +662,7 @@ scenario name | versions | elapsed time (sec)
 ---|---|---
 spring async 4.3.x-5.1.x | 35 | 967.70
 mongodb 3.4.0-3.11.1 | 17 | 1465.63
+grcp 1.6.0-1.25.0 | 25 | 627.00
 
 ### Workload 4
 #### Group 1 (2463.00s)

diff --git a/docs/en/setup/service-agent/java-agent/README.md b/docs/en/setup/service-agent/java-agent/README.md
@@ -93,7 +93,7 @@ property key | Description | Default |
 `logging.level`|The log level. Default is debug.|`DEBUG`|
 `logging.file_name`|Log file name.|`skywalking-api.log`|
 `logging.output`| Log output. Default is FILE. Use CONSOLE means output to stdout. |`FILE`|
-`logging.dir`|Log files directory. Default is blank string, means, use "system.out" to output logs.|`""`|
+`logging.dir`|Log files directory. Default is blank string, means, use "{theSkywalkingAgentJarDir}/logs  " to output logs. {theSkywalkingAgentJarDir} is the directory where the skywalking agent jar file is located |`""`|
 `logging.pattern `|logging format. There are all conversion specifiers: <br>&nbsp;&nbsp;* `%level` means log level. <br>&nbsp;&nbsp;*  `%timestamp` means now of time with format `yyyy-MM-dd HH:mm:ss:SSS`.<br>&nbsp;&nbsp;*   `%thread` means name of current thread.<br>&nbsp;&nbsp;*   `%msg` means some message which user logged. <br>&nbsp;&nbsp;*  `%class` means SimpleName of TargetClass. <br>&nbsp;&nbsp;*  `%throwable` means a throwable which user called. <br>&nbsp;&nbsp;*  `%agent_name` means `agent.service_name`  |`%level %timestamp %thread %class : %msg %throwable`|
 `logging.max_file_size`|The max size of log file. If the size is bigger than this, archive the current file, and write into a new file.|`300 * 1024 * 1024`|
 `logging.max_history_files`|The max history log files. When rollover happened, if log files exceed this number,then the oldest file will be delete. Negative or zero means off, by default.|`-1`|

diff --git a/skywalking-ui b/skywalking-ui
diff --git a/test/plugin/runner-helper/src/main/resources/docker-compose.template b/test/plugin/runner-helper/src/main/resources/docker-compose.template
@@ -38,7 +38,9 @@ services:
             - ${env}
         </#list>
         </#if>
+        <#if start_script??>
             - SCENARIO_START_SCRIPT=${start_script}
+        </#if>
             - SCENARIO_NAME=${scenario_name}
             - SCENARIO_VERSION=${scenario_version}
             - SCENARIO_ENTRY_SERVICE=${entry_service}

diff --git a/test/plugin/scenarios/okhttp-scenario/bin/startup.sh b/test/plugin/scenarios/okhttp-scenario/bin/startup.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+home="$(cd "$(dirname $0)"; pwd)"
+
+java -jar ${agent_opts} ${home}/../libs/okhttp-scenario.jar &
diff --git a/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml b/test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml
@@ -0,0 +1,119 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+registryItems:
+  applications:
+  - {okhttp-scenario: nq 0}
+  instances:
+  - {okhttp-scenario: 1}
+  operationNames:
+  - okhttp-scenario: [/case/receiveContext-0, /okhttp-case/case/receiveContext-0,/case/healthCheck, /case/okhttp-case, /case/receiveContext-1]
+  heartbeat: []
+segmentItems:
+- applicationCode: okhttp-scenario
+  segmentSize: ge 5
+  segments:
+  - segmentId: not null
+    spans:
+    - operationName: Async/okhttp-case/case/receiveContext-0
+      operationId: 0
+      parentSpanId: 0
+      spanId: 1
+      spanLayer: null
+      startTime: nq 0
+      endTime: nq 0
+      componentId: 0
+      componentName: null
+      isError: false
+      spanType: Local
+      peer: null
+      peerId: 0
+    - operationName: /case/okhttp-case
+      operationId: 0
+      parentSpanId: -1
+      spanId: 0
+      spanLayer: Http
+      startTime: nq 0
+      endTime: nq 0
+      componentId: 14
+      componentName: null
+      isError: false
+      spanType: Entry
+      peer: null
+      peerId: 0
+      tags:
+      - {key: url, value: 'http://localhost:8080/okhttp-case/case/okhttp-case'}
+      - {key: http.method, value: GET}
+  - segmentId: not null
+    spans:
+    - operationName: /case/receiveContext-0
+      operationId: 0
+      parentSpanId: -1
+      spanId: 0
+      spanLayer: Http
+      startTime: nq 0
+      endTime: nq 0
+      componentId: 14
+      componentName: null
+      isError: false
+      spanType: Entry
+      peer: null
+      peerId: 0
+      tags:
+      - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'}
+      - {key: http.method, value: GET}
+      refs:
+      - {parentEndpointId: 0, parentEndpoint: /okhttp-case/case/receiveContext-0, networkAddressId: 0, entryEndpointId: 0, refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: nq 0, parentServiceInstanceId: nq 0, networkAddress: '127.0.0.1:8080', entryEndpoint: /case/okhttp-case, entryServiceInstanceId: nq 0}
+  - segmentId: not null
+    spans:
+    - operationName: /case/receiveContext-1
+      operationId: 0
+      parentSpanId: -1
+      spanId: 0
+      spanLayer: Http
+      startTime: nq 0
+      endTime: nq 0
+      componentId: 14
+      componentName: null
+      isError: false
+      spanType: Entry
+      peer: null
+      peerId: 0
+      tags:
+      - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-1'}
+      - {key: http.method, value: GET}
+      refs:
+      - {parentEndpointId: 0, parentEndpoint: /okhttp-case/case/receiveContext-0, networkAddressId: 0, entryEndpointId: 0, refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: nq 0, parentServiceInstanceId: nq 0, networkAddress: '127.0.0.1:8080', entryEndpoint: /case/okhttp-case, entryServiceInstanceId: nq 0}
+  - segmentId: not null
+    spans:
+    - operationName: /okhttp-case/case/receiveContext-0
+      operationId: 0
+      parentSpanId: -1
+      spanId: 0
+      spanLayer: Http
+      startTime: nq 0
+      endTime: nq 0
+      componentId: 12
+      componentName: null
+      isError: false
+      spanType: Exit
+      peer: 127.0.0.1:8080
+      peerId: 0
+      tags:
+      - {key: http.method, value: GET}
+      - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'}
+      refs:
+      - {parentEndpointId: 0, parentEndpoint: /case/okhttp-case, networkAddressId: 0, entryEndpointId: 0, refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: nq 0, parentServiceInstanceId: nq 0, networkAddress: '', entryEndpoint: /case/okhttp-case, entryServiceInstanceId: nq 0}
diff --git a/test/plugin/scenarios/okhttp-scenario/configuration.yml b/test/plugin/scenarios/okhttp-scenario/configuration.yml
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+type: jvm
+entryService: http://localhost:8080/okhttp-case/case/okhttp-case
+healthCheck: http://localhost:8080/okhttp-case/case/healthCheck
+startScript: ./bin/startup.sh
+framework: OKHttp3