You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/11/18 13:49:31 UTC
[skywalking] branch otel-istio updated (51251d5 -> b3a6ba6)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch otel-istio
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 51251d5 Merge branch 'otel-istio' of github.com:apache/skywalking into otel-istio
add 00b23cf Create indices on boot
add d6c9926 Add the plugin for microsoft mssql-jdbc (#5856)
add b3a6ba6 Merge remote-tracking branch 'origin/master' into otel-istio
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.1.yaml | 1 +
CHANGES.md | 3 +-
...lJtdsURLParser.java => MssqlJdbcURLParser.java} | 32 ++---
.../jdbc/connectionurl/parser/URLParser.java | 3 +
.../pom.xml | 12 +-
.../define/AbstractConnectionInstrumentation.java | 2 +-
.../jdbc/define/ConnectionInstrumentation.java} | 11 +-
.../mssql/jdbc}/define/DriverInstrumentation.java | 6 +-
.../src/main/resources/skywalking-plugin.def | 4 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../setup/service-agent/java-agent/Plugin-list.md | 3 +-
.../service-agent/java-agent/Supported-list.md | 1 +
.../skywalking/oap/meter/analyzer/Analyzer.java | 145 ++++++++++++---------
.../skywalking/oap/meter/analyzer/dsl/DSL.java | 2 +-
.../oap/meter/analyzer/dsl/Expression.java | 31 +++--
.../analyzer/dsl/ExpressionParsingContext.java | 93 +++++++++++++
...ngType.java => ExpressionParsingException.java} | 8 +-
.../skywalking/oap/meter/analyzer/dsl/Result.java | 12 +-
.../oap/meter/analyzer/dsl/SampleFamily.java | 75 ++++++-----
.../oap/meter/analyzer/dsl/ArithmeticTest.java | 14 +-
.../oap/meter/analyzer/dsl/BasicTest.java | 18 +--
...gFilterTest.java => ExpressionParsingTest.java} | 42 +++---
.../oap/meter/analyzer/dsl/FunctionTest.java | 6 +-
.../oap/meter/analyzer/dsl/TagFilterTest.java | 2 +-
.../src/main/resources/application.yml | 2 +-
.../main/resources/fetcher-prom-rules/self.yaml | 30 ++---
.../otel-oc-rules/istio-controlplane.yaml | 4 -
.../src/main/resources/otel-oc-rules/oap.yaml | 39 +++---
.../resources/ui-initialized-templates/istio.yml | 11 --
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 6 +-
.../configuration.yml | 4 +-
.../pom.xml | 13 +-
.../src/main/assembly/assembly.xml | 2 +-
.../skywalking/apm/testcase/mssql/Application.java | 0
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 0
.../skywalking/apm/testcase/mssql/SQLExecutor.java | 15 ++-
.../testcase/mssql/controller/CaseController.java | 2 +-
.../src/main/resources/application.yaml | 2 +-
.../src/main/resources/jdbc.properties | 2 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 9 +-
42 files changed, 393 insertions(+), 277 deletions(-)
copy apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/{MssqlJtdsURLParser.java => MssqlJdbcURLParser.java} (82%)
copy apm-sniffer/apm-sdk-plugin/{mssql-jtds-1.x-plugin => mssql-jdbc-plugin}/pom.xml (84%)
copy apm-sniffer/apm-sdk-plugin/{mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1 => mssql-jdbc-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jdbc}/define/AbstractConnectionInstrumentation.java (98%)
copy apm-sniffer/apm-sdk-plugin/{h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java => mssql-jdbc-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jdbc/define/ConnectionInstrumentation.java} (69%)
copy apm-sniffer/apm-sdk-plugin/{mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2 => mssql-jdbc-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jdbc}/define/DriverInstrumentation.java (85%)
copy apm-sniffer/apm-sdk-plugin/{canal-1.x-plugin => mssql-jdbc-plugin}/src/main/resources/skywalking-plugin.def (82%)
create mode 100644 oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionParsingContext.java
copy oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/{DownsamplingType.java => ExpressionParsingException.java} (79%)
copy oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/{TagFilterTest.java => ExpressionParsingTest.java} (59%)
copy test/plugin/scenarios/{baidu-brpc-scenario => mssql-jdbc-scenario}/bin/startup.sh (92%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/config/expectedData.yaml (96%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/configuration.yml (86%)
copy test/plugin/scenarios/{mysql-scenario => mssql-jdbc-scenario}/pom.xml (92%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/src/main/java/org/apache/skywalking/apm/testcase/mssql/Application.java (100%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java (100%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/src/main/java/org/apache/skywalking/apm/testcase/mssql/SQLExecutor.java (92%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/src/main/java/org/apache/skywalking/apm/testcase/mssql/controller/CaseController.java (98%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/mssql-jdbc-scenario}/src/main/resources/application.yaml (92%)
copy test/plugin/scenarios/{mssql-jtds-scenario => mssql-jdbc-scenario}/src/main/resources/jdbc.properties (92%)
copy test/plugin/scenarios/{zookeeper-scenario => mssql-jdbc-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{avro-scenario => mssql-jdbc-scenario}/support-version.list (91%)