[skywalking-java] branch test/ci/spring6 updated (b3b1ad121a -> bed0fc2bc6)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
omit b3b1ad121a Add Spring 6 to test case
add bed0fc2bc6 Add Spring 6 to test case
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b3b1ad121a)
\
N -- N -- N refs/heads/test/ci/spring6 (bed0fc2bc6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/ci.yaml | 4
.../test/resources/mockito-extensions/org.mockito.plugins.MockMaker | 0
2 files changed, 4 deletions(-)
copy {apm-commons/apm-datacarrier =>
apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
[skywalking-java] branch test/ci/spring6 updated (bed0fc2bc6 -> 456925a822)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit bed0fc2bc6 Add Spring 6 to test case add 456925a822 Add Spring 6 to test case This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bed0fc2bc6) \ N -- N -- N refs/heads/test/ci/spring6 (456925a822) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/skywalking/apm/plugin/undertow/v2x/TracingHandlerTest.java | 2 ++ 1 file changed, 2 insertions(+)
[skywalking-java] branch test/ci/spring6 updated (456925a822 -> a7233a0031)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git discard 456925a822 Add Spring 6 to test case add a7233a0031 Add Spring 6 to test case This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (456925a822) \ N -- N -- N refs/heads/test/ci/spring6 (a7233a0031) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../spring/mvc/commons/interceptor/AbstractMethodInterceptor.java | 2 -- .../apm/plugin/undertow/v2x/RoutingHandlerInterceptorTest.java | 2 ++ test/plugin/scenarios/spring-6.x-scenario/configuration.yml | 2 +- .../scenarios/spring-6.x-scenario/src/main/webapp/WEB-INF/web.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (a7233a0031 -> 8f70eca047)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
omit a7233a0031 Add Spring 6 to test case
add 8f70eca047 Add Spring 6 to test case
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a7233a0031)
\
N -- N -- N refs/heads/test/ci/spring6 (8f70eca047)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker | 0
1 file changed, 0 insertions(+), 0 deletions(-)
copy {apm-commons/apm-datacarrier =>
apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
[skywalking-java] branch test/ci/spring6 updated (8f70eca047 -> 24f89fb362)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit 8f70eca047 Add Spring 6 to test case add 24f89fb362 Add Spring 6 to test case This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8f70eca047) \ N -- N -- N refs/heads/test/ci/spring6 (24f89fb362) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/skywalking/apm/plugin/undertow/v2x/TracingHandlerTest.java | 2 -- pom.xml | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (24f89fb362 -> de48a42c4e)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit 24f89fb362 Add Spring 6 to test case add de48a42c4e Add Spring 6 to test case This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (24f89fb362) \ N -- N -- N refs/heads/test/ci/spring6 (de48a42c4e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGES.md | 5 - .../skywalking/apm/plugin/netty/socketio/NettySocketIOTest.java| 2 -- .../async/define/ResponseExtractorFutureInstrumentation.java | 7 +++ .../resttemplate/async/define/RestTemplateInstrumentation.java | 7 +++ .../resttemplate/sync/define/RestTemplateInstrumentation.java | 7 +++ .../apm/plugin/undertow/v2x/RoutingHandlerInterceptorTest.java | 2 -- 6 files changed, 25 insertions(+), 5 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (de48a42c4e -> 7a080d43cf)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit de48a42c4e Add Spring 6 to test case add 7a080d43cf Add Spring 6 to test case This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (de48a42c4e) \ N -- N -- N refs/heads/test/ci/spring6 (7a080d43cf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/plugins-jdk17-test.1.yaml | 2 +- .../apache/skywalking/apm/plugin/netty/socketio/NettySocketIOTest.java | 2 ++ .../async/define/ResponseExtractorFutureInstrumentation.java| 2 +- .../spring/resttemplate/async/define/RestTemplateInstrumentation.java | 2 +- .../spring/resttemplate/sync/define/RestTemplateInstrumentation.java| 2 +- 5 files changed, 6 insertions(+), 4 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (7a080d43cf -> b21e059377)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 7a080d43cf Add Spring 6 to test case add b21e059377 Try fix Spring 6 test No new revisions were added by this update. Summary of changes: .../mvc/v5/define/reactive/AbstractSpring5ReactiveInstrumentation.java | 3 +-- .../v5/define/reactive/AbstractSpring5ReactiveInstrumentationV2.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (b21e059377 -> 486585972b)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
from b21e059377 Try fix Spring 6 test
add 486585972b Revert spring 3-5 witness class, add witness class for
spring 5 only
No new revisions were added by this update.
Summary of changes:
.../spring/mvc/v3/define/AbstractSpring3Instrumentation.java | 6 ++
.../spring/mvc/v4/define/AbstractSpring4Instrumentation.java | 10 +-
.../v4/define/ControllerForLowVersionInstrumentation.java| 12 +---
.../define/RestControllerForLowVersionInstrumentation.java | 12 +---
.../spring/mvc/v4/define/RestControllerInstrumentation.java | 12 +---
.../spring/mvc/v5/define/AbstractSpring5Instrumentation.java | 2 +-
.../reactive/AbstractSpring5ReactiveInstrumentation.java | 6 ++
.../reactive/AbstractSpring5ReactiveInstrumentationV2.java | 6 ++
.../mvc-annotation-6.x-plugin/pom.xml| 3 +--
.../reactive/AbstractReactiveControllerInstrumentation.java | 2 +-
...tion.java => AbstractSpring6ReactiveInstrumentation.java} | 4 ++--
...V2.java => AbstractSpring6ReactiveInstrumentationV2.java} | 4 ++--
.../reactive/InvocableHandlerMethodInstrumentation.java | 2 +-
13 files changed, 34 insertions(+), 47 deletions(-)
rename
apm-sniffer/optional-plugins/optional-spring-plugins/mvc-annotation-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v6/define/reactive/{AbstractSpring5ReactiveInstrumentation.java
=> AbstractSpring6ReactiveInstrumentation.java} (90%)
rename
apm-sniffer/optional-plugins/optional-spring-plugins/mvc-annotation-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v6/define/reactive/{AbstractSpring5ReactiveInstrumentationV2.java
=> AbstractSpring6ReactiveInstrumentationV2.java} (90%)
[skywalking-java] branch test/ci/spring6 updated (486585972b -> 8a19e5eb9c)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 486585972b Revert spring 3-5 witness class, add witness class for spring 5 only add 8a19e5eb9c Fix Spring 6 test case No new revisions were added by this update. Summary of changes: test/plugin/scenarios/spring-6.x-scenario/configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-java] branch test/ci/spring6 updated (8a19e5eb9c -> b3166ff7fd)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git discard 8a19e5eb9c Fix Spring 6 test case add b3166ff7fd Fix Spring 6 test case This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8a19e5eb9c) \ N -- N -- N refs/heads/test/ci/spring6 (b3166ff7fd) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-java] branch test/ci/spring6 updated (b3166ff7fd -> eb62ecd222)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
from b3166ff7fd Fix Spring 6 test case
add eb62ecd222 Address review comments
No new revisions were added by this update.
Summary of changes:
apm-commons/apm-datacarrier/pom.xml| 4 +-
apm-sniffer/apm-agent-core/pom.xml | 105 +++--
apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml| 28 ++
apm-sniffer/apm-sdk-plugin/pom.xml | 40 +++-
.../define/AbstractControllerInstrumentation.java | 2 +-
...on.java => AbstractSpring6Instrumentation.java} | 2 +-
.../v6/define/HandlerMethodInstrumentation.java| 2 +-
apm-sniffer/optional-plugins/pom.xml | 9 +-
pom.xml| 74 +--
.../src/main/resources/archetype-resources/pom.xml | 3 +-
test/plugin/scenarios/cxf-scenario/pom.xml | 12 +--
test/plugin/scenarios/ehcache-2.x-scenario/pom.xml | 3 +-
.../exception-checker-tomcat-scenario/pom.xml | 3 +-
test/plugin/scenarios/guava-cache-scenario/pom.xml | 3 +-
.../scenarios/httpclient-3.x-scenario/pom.xml | 3 +-
.../scenarios/httpclient-4.3.x-scenario/pom.xml| 3 +-
.../scenarios/netty-socketio-scenario/pom.xml | 3 +-
.../plugin/scenarios/resteasy-4.x-scenario/pom.xml | 3 +-
.../scenarios/resttemplate-4.x-scenario/pom.xml| 3 +-
.../retransform-class-tomcat-scenario/pom.xml | 3 +-
.../plugin/scenarios/spring-3.0.x-scenario/pom.xml | 3 +-
.../plugin/scenarios/spring-3.1.x-scenario/pom.xml | 3 +-
.../plugin/scenarios/spring-4.1.x-scenario/pom.xml | 3 +-
.../plugin/scenarios/spring-4.3.x-scenario/pom.xml | 6 +-
test/plugin/scenarios/spring-6.x-scenario/pom.xml | 6 +-
.../plugin/scenarios/spring-async-scenario/pom.xml | 3 +-
.../scenarios/spring-scheduled-scenario/pom.xml| 6 +-
test/plugin/scenarios/struts2.3-scenario/pom.xml | 3 +-
test/plugin/scenarios/struts2.5-scenario/pom.xml | 3 +-
test/plugin/scenarios/tomcat-10x-scenario/pom.xml | 3 +-
30 files changed, 111 insertions(+), 236 deletions(-)
rename
apm-sniffer/optional-plugins/optional-spring-plugins/mvc-annotation-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v6/define/{AbstractSpring5Instrumentation.java
=> AbstractSpring6Instrumentation.java} (95%)
[skywalking-java] branch test/ci/spring6 updated (eb62ecd222 -> f281e3b2f7)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit eb62ecd222 Address review comments add f281e3b2f7 Address review comments This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (eb62ecd222) \ N -- N -- N refs/heads/test/ci/spring6 (f281e3b2f7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-java] branch test/ci/spring6 updated (f281e3b2f7 -> d5fa5dfd49)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit f281e3b2f7 Address review comments add d5fa5dfd49 Address review comments This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f281e3b2f7) \ N -- N -- N refs/heads/test/ci/spring6 (d5fa5dfd49) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/actions/build/action.yml | 4 ++-- pom.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (d5fa5dfd49 -> a2f3889faf)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from d5fa5dfd49 Address review comments add a2f3889faf doc No new revisions were added by this update. Summary of changes: docs/en/setup/service-agent/java-agent/Optional-plugins.md | 3 ++- docs/en/setup/service-agent/java-agent/Supported-list.md | 10 +- 2 files changed, 7 insertions(+), 6 deletions(-)
[skywalking-java] branch test/ci/spring6 updated (a2f3889faf -> 7df72749e6)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci/spring6 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git omit a2f3889faf doc add 7df72749e6 doc This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a2f3889faf) \ N -- N -- N refs/heads/test/ci/spring6 (7df72749e6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: docs/en/setup/service-agent/java-agent/Supported-list.md | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[skywalking-java] branch docker created (now 9da5982df8)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch docker in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at 9da5982df8 Fix wrong JDK version when publish Docker snapshot This branch includes the following new commits: new 9da5982df8 Fix wrong JDK version when publish Docker snapshot The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking-java] 01/01: Fix wrong JDK version when publish Docker snapshot
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch docker
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 9da5982df88486c2d6c802bb345eee38cb221581
Author: kezhenxu94
AuthorDate: Tue Jan 31 19:41:36 2023 +0800
Fix wrong JDK version when publish Docker snapshot
---
.github/workflows/publish-docker.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index ad6cb921a5..ba088e3c89 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- main
+ - docker
env:
SKIP_TEST: true
@@ -41,6 +42,10 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-publish-docker-${{
hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-publish-docker-
+ - uses: actions/setup-java@v2
+with:
+ distribution: temurin
+ java-version: 17
- name: Build Agent
run: make build
- uses: actions/upload-artifact@v2
[skywalking-java] branch docker updated (9da5982df8 -> 6a2cd27282)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch docker in repository https://gitbox.apache.org/repos/asf/skywalking-java.git discard 9da5982df8 Fix wrong JDK version when publish Docker snapshot new 6a2cd27282 Fix wrong JDK version when publish Docker snapshot This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9da5982df8) \ N -- N -- N refs/heads/docker (6a2cd27282) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/publish-docker.yaml | 1 - 1 file changed, 1 deletion(-)
[skywalking-java] 01/01: Fix wrong JDK version when publish Docker snapshot
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch docker
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 6a2cd27282b5f08367caa1d46769fc0b705c6c8a
Author: kezhenxu94
AuthorDate: Tue Jan 31 20:12:53 2023 +0800
Fix wrong JDK version when publish Docker snapshot
---
.github/workflows/publish-docker.yaml | 4
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index ad6cb921a5..96b90d3fd4 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -41,6 +41,10 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-publish-docker-${{
hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-publish-docker-
+ - uses: actions/setup-java@v2
+with:
+ distribution: temurin
+ java-version: 17
- name: Build Agent
run: make build
- uses: actions/upload-artifact@v2
[skywalking-java] branch main updated: Fix wrong JDK version when publish Docker snapshot (#446)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 0233de Fix wrong JDK version when publish Docker snapshot (#446)
0233de is described below
commit 0233de444caf28492b4d9066ecc7b874658b
Author: kezhenxu94
AuthorDate: Tue Jan 31 21:07:23 2023 +0800
Fix wrong JDK version when publish Docker snapshot (#446)
---
.github/workflows/publish-docker.yaml | 4
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index ad6cb921a5..96b90d3fd4 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -41,6 +41,10 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-publish-docker-${{
hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-publish-docker-
+ - uses: actions/setup-java@v2
+with:
+ distribution: temurin
+ java-version: 17
- name: Build Agent
run: make build
- uses: actions/upload-artifact@v2
[skywalking] branch master updated: Avoid Antlr dependencies' versions might be different in compile time and runtime (#10339)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new b8e4a025aa Avoid Antlr dependencies' versions might be different in
compile time and runtime (#10339)
b8e4a025aa is described below
commit b8e4a025aa8987d448009f6251b244a6d8dfbd0d
Author: kezhenxu94
AuthorDate: Sat Feb 4 15:26:49 2023 +0800
Avoid Antlr dependencies' versions might be different in compile time and
runtime (#10339)
---
.licenserc.yaml| 2 +-
apm-webapp/pom.xml | 10 +---
dist-material/release-docs/LICENSE | 38 +---
docs/en/changes/changes.md | 3 +
oap-server-bom/pom.xml | 14 ++---
oap-server/oal-grammar/pom.xml | 5 --
.../configuration-etcd/pom.xml | 13
oap-server/server-starter/pom.xml | 15 -
pom.xml| 70 --
9 files changed, 47 insertions(+), 123 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index ec0af00052..ec5b7f5184 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -102,7 +102,7 @@ dependency:
version: 2.13.4
license: Apache-2.0
- name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
- version: 2.13.2
+ version: 2.14.1
license: Apache-2.0
- name: com.graphql-java:graphql-java-extended-scalars
version: 18.1
diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index 59861f8e7c..bb3db65ae9 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -29,8 +29,8 @@
jar
-1.8
UTF-8
+
1.12.1
${project.parent.basedir}/skywalking-ui
@@ -95,14 +95,6 @@
skywalking-webapp
-
-maven-compiler-plugin
-
-${compiler.version}
-${compiler.version}
-${project.build.sourceEncoding}
-
-
com.github.eirslett
frontend-maven-plugin
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index 9d20c83729..a536ad7c0b 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -210,23 +210,23 @@ The following components are provided under the
Apache-2.0 License. See project
The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/pgv-java-stub/0.6.13
Apache-2.0
https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/protoc-gen-validate/0.6.13
Apache-2.0
-
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.7.1
Apache-2.0
+
https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.8.0
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-api/1.4.2
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/1.4.2
Apache-2.0
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-common/1.4.2
Apache-2.0
https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client/1.8.0
Apache-2.0
https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-core/1.8.0
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.13.4
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.13.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.13.4
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.13.3
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.13.4.1
Apache-2.0
-
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.13.3
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.14.1
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.14.1
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.14.1
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.12.0
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.9.5
Apache-2.0
+
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.1
Apache-2.0
https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.12.0
Apache-2.0
+
https://mvnrepository.co
[skywalking-python] branch master updated: Add kafka prefix to kakfa topic names (#277)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new e0c97ba Add kafka prefix to kakfa topic names (#277)
e0c97ba is described below
commit e0c97ba2c34e2ad00c0b44a154e33b85bde16cfa
Author: SheltonZSL <113407151+shelton...@users.noreply.github.com>
AuthorDate: Sun Feb 5 21:18:19 2023 -0500
Add kafka prefix to kakfa topic names (#277)
---
CHANGELOG.md| 1 +
docs/en/setup/Configuration.md | 1 +
skywalking/config.py| 11 ++-
tests/e2e/case/kafka/docker-compose.yml | 4 +++-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 095af31..72deb73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
- Add Greenlet profiler (#246)
- Add test and support for Python Slim base images (#249)
- Add support for the tags of Virtual Cache for Redis (#263)
+ - Add a new configuration `kafka_namespace` to prefix the kafka topic names
(#277)
- Plugins:
- Add aioredis, aiormq, amqp, asyncpg, aio-pika, kombu RMQ plugins (#230
Missing test coverage)
diff --git a/docs/en/setup/Configuration.md b/docs/en/setup/Configuration.md
index 248d002..9a5a572 100644
--- a/docs/en/setup/Configuration.md
+++ b/docs/en/setup/Configuration.md
@@ -23,6 +23,7 @@ export SW_AGENT_YourConfiguration=YourValue
| service_instance | SW_AGENT_SERVICE_INSTANCE | |
str(uuid.uuid1()).replace('-', '') | The name of this particular awesome Python
service instance |
| namespace | SW_AGENT_NAMESPACE | | | The agent namespace of
the Python service (available as tag and the suffix of service name) |
| kafka_bootstrap_servers | SW_AGENT_KAFKA_BOOTSTRAP_SERVERS | |
localhost:9092 | A list of host/port pairs to use for establishing the initial
connection to your Kafka cluster. It is in the form of
host1:port1,host2:port2,... (used for Kafka reporter protocol) |
+| kafka_namespace | SW_AGENT_KAFKA_NAMESPACE | | | The kafka
namespace specified by OAP side SW_NAMESPACE, prepends the following kafka
topic names with a `-`. |
| kafka_topic_management | SW_AGENT_KAFKA_TOPIC_MANAGEMENT | |
skywalking-managements | Specifying Kafka topic name for service instance
reporting and registering, this should be in sync with OAP |
| kafka_topic_segment | SW_AGENT_KAFKA_TOPIC_SEGMENT | |
skywalking-segments | Specifying Kafka topic name for Tracing data, this should
be in sync with OAP |
| kafka_topic_log | SW_AGENT_KAFKA_TOPIC_LOG | | skywalking-logs
| Specifying Kafka topic name for Log data, this should be in sync with OAP |
diff --git a/skywalking/config.py b/skywalking/config.py
index 4d14d5b..1bc3c0a 100644
--- a/skywalking/config.py
+++ b/skywalking/config.py
@@ -59,6 +59,8 @@ namespace: str = os.getenv('SW_AGENT_NAMESPACE', '')
# A list of host/port pairs to use for establishing the initial connection to
your Kafka cluster.
# It is in the form of host1:port1,host2:port2,... (used for Kafka reporter
protocol)
kafka_bootstrap_servers: str = os.getenv('SW_AGENT_KAFKA_BOOTSTRAP_SERVERS',
'localhost:9092')
+# The kafka namespace specified by OAP side SW_NAMESPACE, prepends the
following kafka topic names with a `-`.
+kafka_namespace: str = os.getenv('SW_AGENT_KAFKA_NAMESPACE', '')
# Specifying Kafka topic name for service instance reporting and registering,
this should be in sync with OAP
kafka_topic_management: str = os.getenv('SW_AGENT_KAFKA_TOPIC_MANAGEMENT',
'skywalking-managements')
# Specifying Kafka topic name for Tracing data, this should be in sync with OAP
@@ -222,13 +224,20 @@ def finalize_name() -> None:
"""
This function concatenates the serviceName according to
Java agent's implementation.
-TODO: add kafka namespace prefix and cluster concept
+TODO: add cluster concept
Ref https://github.com/apache/skywalking-java/pull/123
"""
global service_name
if namespace:
service_name = f'{service_name}|{namespace}'
+global kafka_topic_management, kafka_topic_meter, kafka_topic_log,
kafka_topic_segment
+if kafka_namespace:
+kafka_topic_management = f'{kafka_namespace}-{kafka_topic_management}'
+kafka_topic_meter = f'{kafka_namespace}-{kafka_topic_meter}'
+kafka_topic_log = f'{kafka_namespace}-{kafka_topic_log}'
+kafka_topic_segment = f'{kafka_namespace}-{kafka_topic_segment}'
+
def finalize_regex() -> None:
"""
diff --git a/tests/e2e/case/kafka/docker-compose.yml
b/tests/e2e/case/kafka/docker-compose.yml
index ca16506..552e50e 100644
--- a/
[skywalking] branch master updated: Add missing tcp throughput metrics (#10356)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 974cecb67f Add missing tcp throughput metrics (#10356)
974cecb67f is described below
commit 974cecb67f5238e9017347affb4380897011ae47
Author: kezhenxu94
AuthorDate: Tue Feb 7 18:38:54 2023 +0800
Add missing tcp throughput metrics (#10356)
---
docs/en/changes/changes.md| 1 +
.../aop/server/receiver/mesh/TelemetryDataDispatcher.java | 8
2 files changed, 9 insertions(+)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index d138685d9b..4762334a20 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -89,6 +89,7 @@
* Add aws-firehose-receiver to support collecting AWS CloudWatch
metric(OpenTelemetry format)
* Avoid Antlr dependencies' versions might be different in compile time and
runtime.
* Now `PrometheusMetricConverter#escapedName` also support converting `/` to
`_`.
+* Add missing TCP throughput metrics.
UI
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
index 9059622ab3..11cdf191ac 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -224,6 +224,8 @@ public class TelemetryDataDispatcher {
service.getSideCar().setInternalErrorCode(metrics.getInternalErrorCode());
service.getSideCar().setInternalRequestLatencyNanos(metrics.getInternalRequestLatencyNanos());
service.getSideCar().setInternalResponseLatencyNanos(metrics.getInternalResponseLatencyNanos());
+service.setReceivedBytes(metrics.getReceivedBytes());
+service.setSentBytes(metrics.getSentBytes());
SOURCE_RECEIVER.receive(service);
}
@@ -267,6 +269,8 @@ public class TelemetryDataDispatcher {
serviceRelation.getSideCar().setInternalErrorCode(metrics.getInternalErrorCode());
serviceRelation.getSideCar().setInternalRequestLatencyNanos(metrics.getInternalRequestLatencyNanos());
serviceRelation.getSideCar().setInternalResponseLatencyNanos(metrics.getInternalResponseLatencyNanos());
+serviceRelation.setReceivedBytes(metrics.getReceivedBytes());
+serviceRelation.setSentBytes(metrics.getSentBytes());
SOURCE_RECEIVER.receive(serviceRelation);
}
@@ -298,6 +302,8 @@ public class TelemetryDataDispatcher {
serviceInstance.getSideCar().setInternalErrorCode(metrics.getInternalErrorCode());
serviceInstance.getSideCar().setInternalRequestLatencyNanos(metrics.getInternalRequestLatencyNanos());
serviceInstance.getSideCar().setInternalResponseLatencyNanos(metrics.getInternalResponseLatencyNanos());
+serviceInstance.setReceivedBytes(metrics.getReceivedBytes());
+serviceInstance.setSentBytes(metrics.getSentBytes());
SOURCE_RECEIVER.receive(serviceInstance);
}
@@ -374,6 +380,8 @@ public class TelemetryDataDispatcher {
serviceRelation.getSideCar().setInternalErrorCode(metrics.getInternalErrorCode());
serviceRelation.getSideCar().setInternalRequestLatencyNanos(metrics.getInternalRequestLatencyNanos());
serviceRelation.getSideCar().setInternalResponseLatencyNanos(metrics.getInternalResponseLatencyNanos());
+serviceRelation.setReceivedBytes(metrics.getReceivedBytes());
+serviceRelation.setSentBytes(metrics.getSentBytes());
SOURCE_RECEIVER.receive(serviceRelation);
}
[skywalking-python] branch master updated: Add loguru support (#276)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-python.git The following commit(s) were added to refs/heads/master by this push: new 20ce46a Add loguru support (#276) 20ce46a is described below commit 20ce46a4532ea31da1cca93887d71360003255ea Author: Jedore AuthorDate: Wed Feb 8 10:31:51 2023 +0800 Add loguru support (#276) --- CHANGELOG.md | 1 + docs/en/setup/Configuration.md | 4 +- docs/en/setup/Plugins.md | 1 + docs/en/setup/advanced/LogReporter.md| 2 +- poetry.lock | 36 +++- pyproject.toml | 1 + skywalking/config.py | 2 + skywalking/plugins/sw_loguru.py | 227 +++ tests/plugin/data/sw_loguru/__init__.py | 16 ++ tests/plugin/data/sw_loguru/docker-compose.yml | 69 +++ tests/plugin/data/sw_loguru/expected.data.yml| 181 ++ tests/plugin/data/sw_loguru/services/__init__.py | 16 ++ tests/plugin/data/sw_loguru/services/consumer.py | 32 tests/plugin/data/sw_loguru/services/provider.py | 52 ++ tests/plugin/data/sw_loguru/test_loguru.py | 36 15 files changed, 672 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72deb73..1f2f5ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Add test and support for Python Slim base images (#249) - Add support for the tags of Virtual Cache for Redis (#263) - Add a new configuration `kafka_namespace` to prefix the kafka topic names (#277) + - Add log reporter support for loguru (#276) - Plugins: - Add aioredis, aiormq, amqp, asyncpg, aio-pika, kombu RMQ plugins (#230 Missing test coverage) diff --git a/docs/en/setup/Configuration.md b/docs/en/setup/Configuration.md index 9a5a572..24ee266 100644 --- a/docs/en/setup/Configuration.md +++ b/docs/en/setup/Configuration.md @@ -68,8 +68,8 @@ export SW_AGENT_YourConfiguration=YourValue | log_reporter_max_buffer_size | SW_AGENT_LOG_REPORTER_MAX_BUFFER_SIZE | | 1 | The maximum queue backlog size for sending log data to backend, logs beyond this are silently dropped. | | log_reporter_level | SW_AGENT_LOG_REPORTER_LEVEL | | WARNING | This config specifies the logger levels of concern, any logs with a level below the config will be ignored. | | log_reporter_ignore_filter | SW_AGENT_LOG_REPORTER_IGNORE_FILTER | | False | This config customizes whether to ignore the application-defined logger filters, if `True`, all logs are reported disregarding any filter rules. | -| log_reporter_formatted | SW_AGENT_LOG_REPORTER_FORMATTED | | True | If `True`, the log reporter will transmit the logs as formatted. Otherwise, puts logRecord.msg and logRecord.args into message content and tags(`argument.n`), respectively. Along with an `exception` tag if an exception was raised. | -| log_reporter_layout | SW_AGENT_LOG_REPORTER_LAYOUT | | %(asctime)s [%(threadName)s] %(levelname)s %(name)s - %(message)s | The log reporter formats the logRecord message based on the layout given. | +| log_reporter_formatted | SW_AGENT_LOG_REPORTER_FORMATTED | | True | If `True`, the log reporter will transmit the logs as formatted. Otherwise, puts logRecord.msg and logRecord.args into message content and tags(`argument.n`), respectively. Along with an `exception` tag if an exception was raised. Only applies to logging module. | +| log_reporter_layout | SW_AGENT_LOG_REPORTER_LAYOUT | | %(asctime)s [%(threadName)s] %(levelname)s %(name)s - %(message)s | The log reporter formats the logRecord message based on the layout given. Only applies to logging module. | | cause_exception_depth | SW_AGENT_CAUSE_EXCEPTION_DEPTH | | 10 | This configuration is shared by log reporter and tracer. This config limits agent to report up to `limit` stacktrace, please refer to [Python traceback]( https://docs.python.org/3/library/traceback.html#traceback.print_tb) for more explanations. | ### Meter Reporter Configurations | Configuration | Environment Variable | Type | Default Value | Description | diff --git a/docs/en/setup/Plugins.md b/docs/en/setup/Plugins.md index 5740829..23df62e 100644 --- a/docs/en/setup/Plugins.md +++ b/docs/en/setup/Plugins.md @@ -30,6 +30,7 @@ or a limitation of SkyWalking auto-instrumentation (welcome to contribute!) | [http_server](https://docs.python.org/3/library/http.server.html) | Python >=3.7 - ['*']; | `sw_http_server` | | [werkzeug](https://werkzeug.palletsprojects.com/) | Python >=3.7 - ['1.0.1', '2.0']; | `sw_http_server` | | [kafka-python](https://kafka-python.readthedocs.io) | Python >=3.7 - ['2.0']; | `sw_kafka` | +| [loguru](https://pypi.org/project/lo
[skywalking-python] branch master updated: Periodically report instance properties (#279)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new d756d69 Periodically report instance properties (#279)
d756d69 is described below
commit d756d69b1529e83c26e86a8bb1cf6f97a41f642c
Author: Superskyyy (AWAY, busy graduating | Debug 人)
AuthorDate: Fri Feb 10 02:39:40 2023 -0500
Periodically report instance properties (#279)
---
CHANGELOG.md | 1 +
Makefile | 2 +-
docs/en/setup/Configuration.md | 5 +-
skywalking/agent/__init__.py | 32 +---
skywalking/agent/protocol/__init__.py| 31 +++-
skywalking/agent/protocol/grpc.py| 7 +-
skywalking/agent/protocol/http.py| 19 +++--
skywalking/agent/protocol/kafka.py | 12 ++-
skywalking/client/__init__.py| 105 +--
skywalking/client/grpc.py| 26 +++
skywalking/client/http.py| 27 ++-
skywalking/client/kafka.py | 14 ++--
skywalking/config.py | 32 ++--
tests/e2e/base/docker-compose.base.yml | 1 +
tests/e2e/case/expected/service-instance.yml | 25 ---
tools/config_doc_gen.py | 4 +-
16 files changed, 213 insertions(+), 130 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f2f5ab..35106d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
- Avoid reporting meaningless tracecontext with logs when there's no active
span, UI will now show empty traceID (#272)
- Fix exception handler in profile_context (#273)
- Add namespace suffix to service name (#275)
+ - Add periodical instance property report to prevent data loss (#279)
- Docs:
- New documentation on how to test locally (#222)
diff --git a/Makefile b/Makefile
index 6012402..ea6ebd0 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ endif
.PHONY: env
env: poetry gen
- poetry install
+ poetry install --all-extras
poetry run pip install --upgrade pip
.PHONY: poetry poetry-fallback
diff --git a/docs/en/setup/Configuration.md b/docs/en/setup/Configuration.md
index 24ee266..d9f28d9 100644
--- a/docs/en/setup/Configuration.md
+++ b/docs/en/setup/Configuration.md
@@ -36,8 +36,9 @@ export SW_AGENT_YourConfiguration=YourValue
| Configuration | Environment Variable | Type | Default Value | Description |
| : | : | : | : |
: |
| heartbeat_period | SW_AGENT_HEARTBEAT_PERIOD | | 30 | The
agent will exchange heartbeat message with SkyWalking OAP backend every
`period` seconds |
-| service_instance_property_report_factor |
SW_AGENT_SERVICE_INSTANCE_PROPERTY_REPORT_FACTOR | | 10 | The
agent will report service instance properties every `factor * heartbeat period`
seconds default: 10*30 = 300 seconds (TODO) |
-| experimental_fork_support | SW_AGENT_EXPERIMENTAL_FORK_SUPPORT | | False | The agent will try to restart itself in any os.fork()-ed
child process. Important note: it's not suitable for large numbered,
short-lived processes such as multiprocessing.Pool, as each one will introduce
overhead and create numerous instances in SkyWalking dashboard in format of
`service_instance-child-` (TODO) |
+| collector_properties_report_period_factor |
SW_AGENT_COLLECTOR_PROPERTIES_REPORT_PERIOD_FACTOR | | 10 | The
agent will report service instance properties every `factor * heartbeat period`
seconds default: 10*30 = 300 seconds |
+| instance_properties_json | SW_AGENT_INSTANCE_PROPERTIES_JSON |
| | A custom JSON string to be reported as service instance properties, e.g.
`{"key": "value"}` |
+| experimental_fork_support | SW_AGENT_EXPERIMENTAL_FORK_SUPPORT | | False | The agent will try to restart itself in any os.fork()-ed
child process. Important Note: it's not suitable for short-lived processes as
each one will introduce overhead and create a new instance in SkyWalking
dashboard in format of `service_instance-child-` (TODO) |
| queue_timeout | SW_AGENT_QUEUE_TIMEOUT | | 1 | DANGEROUS -
This option controls the interval of each bulk report from telemetry data
queues Do not modify unless you have evaluated its impact given your service
load. |
### SW_PYTHON Auto Instrumentation CLI
| Configuration | Environment Variable | Type | Default Value | Description |
diff --git a/skywalking/agent/__init__.py b/skywalking/agent/__init__.py
index a8fb212..9d61487 100644
--- a/skywalking/agent/__init__.py
+++ b/skywalking/agent/__init__.py
@@ -16,7 +16,6 @@
#
import atexit
-import os
from queue import Queue, Full
from threading import Thread, Event
from typing import TYPE_CHECKING
@@ -61,7 +60,7
[skywalking] 01/01: Add Istio 1.17 to test matrix
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 4dce3822396066166c1fd94bf523b5a0ff2d1992 Author: kezhenxu94 AuthorDate: Thu Feb 16 08:14:04 2023 +0800 Add Istio 1.17 to test matrix --- .github/workflows/skywalking.yaml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 9c02556851..fe6e025d68 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -597,6 +597,11 @@ jobs: env: | ISTIO_VERSION=1.16.0 KUBERNETES_VERSION=20 + - name: Istio Metrics Service 1.17.0 +config: test/e2e-v2/cases/istio/metrics/e2e.yaml +env: | + ISTIO_VERSION=1.17.0 + KUBERNETES_VERSION=20 - name: Satellite config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml @@ -726,6 +731,8 @@ jobs: kubernetes: 20 - istio: 1.16.0 kubernetes: 20 + - istio: 1.17.0 +kubernetes: 20 steps: - uses: actions/checkout@v3
[skywalking] branch kezhenxu94-patch-1 created (now 4dce382239)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 4dce382239 Add Istio 1.17 to test matrix This branch includes the following new commits: new 4dce382239 Add Istio 1.17 to test matrix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch master updated: Refactor http-based alarm plugins and extract common logic to `HttpAlarmCallback` (#10401)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new feaf49390c Refactor http-based alarm plugins and extract common logic to `HttpAlarmCallback` (#10401) feaf49390c is described below commit feaf49390c2dc1728d6a3e74248cad41f3ac2df3 Author: kezhenxu94 AuthorDate: Fri Feb 17 09:52:53 2023 +0800 Refactor http-based alarm plugins and extract common logic to `HttpAlarmCallback` (#10401) --- dist-material/release-docs/LICENSE | 2 +- docs/en/changes/changes.md | 1 + oap-server/server-alarm-plugin/pom.xml | 4 - .../oap/server/core/alarm/provider/AlarmCore.java | 16 +-- .../core/alarm/provider/WebhookCallback.java | 86 +++--- .../provider/dingtalk/DingtalkHookCallback.java| 106 - .../provider/discord/DiscordHookCallback.java | 83 +++-- .../alarm/provider/feishu/FeishuHookCallback.java | 123 +-- .../provider/pagerduty/PagerDutyHookCallback.java | 98 +++- .../alarm/provider/slack/SlackhookCallback.java| 100 .../alarm/provider/wechat/WechatHookCallback.java | 88 +++--- .../alarm/provider/welink/WeLinkHookCallback.java | 130 ++--- .../core/alarm/provider/WebhookCallbackTest.java | 3 +- .../dingtalk/DingtalkHookCallbackTest.java | 4 +- .../provider/feishu/FeishuHookCallbackTest.java| 6 +- .../pagerduty/PagerDutyHookCallbackTest.java | 2 +- .../provider/wechat/WechatHookCallbackTest.java| 2 +- .../provider/welink/WeLinkHookCallbackTest.java| 2 +- .../oap/server/core/alarm/AlarmCallback.java | 2 +- .../oap/server/core/alarm/HttpAlarmCallback.java | 61 ++ 20 files changed, 257 insertions(+), 662 deletions(-) diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index f3cdcb31e0..3509c5a742 100644 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -316,7 +316,7 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/org.apache.curator/curator-recipes/4.3.0 Apache-2.0 https://mvnrepository.com/artifact/org.apache.curator/curator-x-discovery/4.3.0 Apache-2.0 https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.3 Apache-2.0 - https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.13 Apache-2.0 + https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.3 Apache-2.0 https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.13 Apache-2.0 https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.13 Apache-2.0 https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients/2.8.1 Apache-2.0 diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index ec75880627..153b33de3c 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -94,6 +94,7 @@ * Refactor `@Column` annotation, swap `Column#name` and `ElasticSearch.Column#columnAlias` and rename `ElasticSearch.Column#columnAlias` to `ElasticSearch.Column#legacyName`. * Add Python HTTPX module component ID(7019). * Migrate tests from junit 4 to junit 5. +* Refactor http-based alarm plugins and extract common logic to `HttpAlarmCallback`. UI diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index 3edb9af612..b9e7320bb3 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -52,10 +52,6 @@ org.mvel mvel2 - -org.apache.httpcomponents -httpclient - com.linecorp.armeria armeria-junit5 diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java index 9ff1014805..5c5bc3da81 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java @@ -18,12 +18,6 @@ package org.apache.skywalking.oap.server.core.alarm.provider; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import org.apache.skywalking.oap.server.core.alarm.AlarmCallback; import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; import
[skywalking-infra-e2e] branch main updated: Automatically pull images before loading into KinD (#10397) (#101)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git
The following commit(s) were added to refs/heads/main by this push:
new f13a7e4 Automatically pull images before loading into KinD (#10397)
(#101)
f13a7e4 is described below
commit f13a7e4d3122a67ee9a643d478421083893e2e85
Author: ethan256
AuthorDate: Fri Feb 17 19:54:05 2023 +0800
Automatically pull images before loading into KinD (#10397) (#101)
---
internal/components/setup/kind.go | 42 ++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/internal/components/setup/kind.go
b/internal/components/setup/kind.go
index 4fe24a4..2ab9923 100644
--- a/internal/components/setup/kind.go
+++ b/internal/components/setup/kind.go
@@ -22,6 +22,7 @@ import (
"bufio"
"bytes"
"context"
+ "errors"
"fmt"
"net/http"
"os"
@@ -29,6 +30,7 @@ import (
"strconv"
"strings"
"sync"
+ "sync/atomic"
"time"
apiv1 "k8s.io/api/admission/v1"
@@ -45,6 +47,8 @@ import (
"k8s.io/kubectl/pkg/scheme"
ctlutil "k8s.io/kubectl/pkg/util"
+ "github.com/docker/docker/api/types"
+ docker "github.com/docker/docker/client"
kind "sigs.k8s.io/kind/cmd/kind/app"
kindcmd "sigs.k8s.io/kind/pkg/cmd"
@@ -73,8 +77,39 @@ type kindPort struct {
waitExpose string // Need to use when expose
}
-//nolint:gocyclo // skip the cyclomatic complexity check here
+// pullImages pull docker images from remote before loading them into KinD
cluster
+func pullImages(images []string) error {
+ cli, err := docker.NewClientWithOpts(docker.FromEnv)
+ if err != nil {
+ return err
+ }
+ defer cli.Close()
+
+ var count int32
+ var wg sync.WaitGroup
+ for _, image := range images {
+ wg.Add(1)
+ go func(image string) {
+ defer wg.Done()
+ out, err := cli.ImagePull(context.Background(), image,
types.ImagePullOptions{})
+ if err != nil {
+ logger.Log.Error("pull image error", "name",
image, "error", err)
+ return
+ }
+ atomic.AddInt32(&count, 1)
+ out.Close()
+ }(image)
+ }
+ wg.Wait()
+ if int(count) != len(images) {
+ return errors.New("can not pull all images")
+ }
+ return nil
+}
+
// KindSetup sets up environment according to e2e.yaml.
+//
+//nolint:gocyclo // skip the cyclomatic complexity check here
func KindSetup(e2eConfig *config.E2EConfig) error {
kindConfigPath = e2eConfig.Setup.GetFile()
@@ -117,6 +152,11 @@ func KindSetup(e2eConfig *config.E2EConfig) error {
// import images
if len(e2eConfig.Setup.Kind.ImportImages) > 0 {
+ // pull images if this image not exist
+ if err := pullImages(e2eConfig.Setup.Kind.ImportImages); err !=
nil {
+ return err
+ }
+
for _, image := range e2eConfig.Setup.Kind.ImportImages {
image = os.ExpandEnv(image)
args := []string{"load", "docker-image", image}
[skywalking-java] branch kezhenxu94-patch-1 created (now 57ba0123e4)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at 57ba0123e4 Bump up Go version for infra e2e and pin e2e version No new revisions were added by this update.
[skywalking-java] branch main updated: Bump up Go version for infra e2e and pin e2e version (#461)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 92af19c20f Bump up Go version for infra e2e and pin e2e version (#461)
92af19c20f is described below
commit 92af19c20fe86c67f55419c23b50b0c31260c414
Author: kezhenxu94
AuthorDate: Wed Feb 22 20:20:27 2023 +0800
Bump up Go version for infra e2e and pin e2e version (#461)
---
.github/workflows/e2e.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 6901a2cd9f..ad1536c3d9 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -58,8 +58,8 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
- go-version: '1.16'
+ go-version: '1.18'
- name: Run E2E Tests
-uses: apache/skywalking-infra-e2e@main
+uses:
apache/skywalking-infra-e2e@c1558dba921a36320f9fdc3d774b66592243589d
with:
e2e-file: ${{ matrix.case.path }}
[skywalking-python] 01/01: Fix Docker build missing required ARG
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git commit e9e5edfe59c8179e5397bf0b106ace0867df62b2 Author: kezhenxu94 AuthorDate: Thu Feb 23 11:45:17 2023 +0800 Fix Docker build missing required ARG --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 349bd0f..bbf4ce1 100644 --- a/Makefile +++ b/Makefile @@ -112,11 +112,11 @@ upload: package .PHONY: build-image build-image: - $(MAKE) -C docker build + $(MAKE) -C docker build AGENT_VERSION=$(VERSION) .PHONY: push-image push-image: - $(MAKE) -C docker push + $(MAKE) -C docker push AGENT_VERSION=$(VERSION) .PHONY: clean # FIXME change to python based so we can run on windows
[skywalking-python] branch kezhenxu94-patch-1 created (now e9e5edf)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git at e9e5edf Fix Docker build missing required ARG This branch includes the following new commits: new e9e5edf Fix Docker build missing required ARG The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking-python] branch kezhenxu94-patch-1 updated (e9e5edf -> cf3ff5e)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git from e9e5edf Fix Docker build missing required ARG add cf3ff5e Fix another typo No new revisions were added by this update. Summary of changes: docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-python] branch kezhenxu94-patch-1 updated (cf3ff5e -> 827a5c8)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git from cf3ff5e Fix another typo add 827a5c8 Fix my typo No new revisions were added by this update. Summary of changes: docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-python] branch kezhenxu94-patch-1 updated (827a5c8 -> 22bf7cf)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git from 827a5c8 Fix my typo add 22bf7cf Update Makefile No new revisions were added by this update. Summary of changes: docker/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
[skywalking-python] branch master updated: Fix Docker build missing required ARG (#291)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new e1ed36b Fix Docker build missing required ARG (#291)
e1ed36b is described below
commit e1ed36bf526dad33bea4edc016b484b14e41193c
Author: kezhenxu94
AuthorDate: Thu Feb 23 15:31:28 2023 +0800
Fix Docker build missing required ARG (#291)
---
Makefile| 4 ++--
docker/Makefile | 6 ++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 349bd0f..bbf4ce1 100644
--- a/Makefile
+++ b/Makefile
@@ -112,11 +112,11 @@ upload: package
.PHONY: build-image
build-image:
- $(MAKE) -C docker build
+ $(MAKE) -C docker build AGENT_VERSION=$(VERSION)
.PHONY: push-image
push-image:
- $(MAKE) -C docker push
+ $(MAKE) -C docker push AGENT_VERSION=$(VERSION)
.PHONY: clean
# FIXME change to python based so we can run on windows
diff --git a/docker/Makefile b/docker/Makefile
index f44cbee..23c655d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -18,7 +18,7 @@ D := docker
P := grpc http kafka
-TARGETS := py3.7 py3.8 py3.9 py3.10 python3.11 py3.7-slim py3.8-slim
py3.9-slim py3.10-slim python3.11-slim
+TARGETS := py3.7 py3.8 py3.9 py3.10 py3.11 py3.7-slim py3.8-slim py3.9-slim
py3.10-slim py3.11-slim
py3.7: BASE_PYTHON_IMAGE = python:3.7
py3.8: BASE_PYTHON_IMAGE = python:3.8
@@ -33,8 +33,6 @@ py3.11-slim: BASE_PYTHON_IMAGE = python:3.11-slim
PUSH_TARGETS := $(TARGETS:%=push-%)
-word-dash = $(word $2,$(subst -, ,$1))
-
build: $(TARGETS)
push: $(PUSH_TARGETS)
@@ -50,7 +48,7 @@ $(TARGETS):
$(PUSH_TARGETS):
- $(eval version := $(call word-dash,$@,2))
+ $(eval version := $(subst push-,,$@))
for p in $(P); do \
$(D) push
apache/skywalking-python:${AGENT_VERSION}-$$p-${version}; \
done
[skywalking] branch bugfix/oal-string-match created (now 5df37e7)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch bugfix/oal-string-match in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 5df37e7 Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes This branch includes the following new commits: new 5df37e7 Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch bugfix/oal-string-match
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 5df37e73df99074373bab9d0e52c87d6217c7d13
Author: kezhenxu94
AuthorDate: Thu Dec 2 17:55:48 2021 +0800
Fix potential NPE in OAL string match and a bug when right-hand-side
variable includes double quotes
---
CHANGES.md | 1 +
.../oap/server/core/analysis/metrics/expression/StringMatch.java| 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index f0f5099..99f87f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -64,6 +64,7 @@ Release Notes.
* Remove `logback` dependencies in IoTDB plugin.
* Fix `StorageModuleElasticsearchProvider` doesn't watch on `trustStorePath`.
* Fix a wrong check about entity if GraphQL at the endpoint relation level.
+* Fix potential NPE in OAL string match and a bug when right-hand-side
variable includes double quotes.
UI
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
index d0b6b01..9f931fb 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
@@ -25,12 +25,12 @@ import
org.apache.skywalking.oap.server.core.analysis.metrics.annotation.FilterM
public class StringMatch {
public boolean match(String left, String right) {
-if (left.startsWith("\"") && left.endsWith("\"")) {
+if (left != null && left.startsWith("\"") && left.endsWith("\"")) {
left = left.substring(1, left.length() - 1);
}
-if (right.startsWith("\"") && right.endsWith("\"")) {
-right = left.substring(1, right.length() - 1);
+if (right != null && right.startsWith("\"") && right.endsWith("\"")) {
+right = right.substring(1, right.length() - 1);
}
return Objects.equals(left, right);
[skywalking] branch bugfix/oal-string-match updated (5df37e7 -> 8f84653)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch bugfix/oal-string-match in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 5df37e7 Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes add e7d6f89 Set the version to 8.10.0, 8.9.0 release is in process. (#8233) add 8f84653 Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5df37e7) \ N -- N -- N refs/heads/bugfix/oal-string-match (8f84653) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGES.md | 77 +- apm-dist/pom.xml | 2 +- apm-protocol/apm-network/pom.xml | 2 +- apm-protocol/pom.xml | 2 +- apm-webapp/pom.xml | 2 +- CHANGES.md => changes/changes-8.9.0.md | 4 -- oap-server-bom/pom.xml | 2 +- oap-server/analyzer/agent-analyzer/pom.xml | 2 +- oap-server/analyzer/event-analyzer/pom.xml | 2 +- oap-server/analyzer/log-analyzer/pom.xml | 2 +- oap-server/analyzer/meter-analyzer/pom.xml | 2 +- oap-server/analyzer/pom.xml| 2 +- oap-server/exporter/pom.xml| 2 +- oap-server/microbench/pom.xml | 9 +-- oap-server/oal-grammar/pom.xml | 2 +- oap-server/oal-rt/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 2 +- .../cluster-consul-plugin/pom.xml | 2 +- .../cluster-etcd-plugin/pom.xml| 2 +- .../cluster-kubernetes-plugin/pom.xml | 2 +- .../cluster-nacos-plugin/pom.xml | 2 +- .../cluster-standalone-plugin/pom.xml | 2 +- .../cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml | 2 +- .../server-configuration/configuration-api/pom.xml | 2 +- .../configuration-apollo/pom.xml | 2 +- .../configuration-consul/pom.xml | 2 +- .../configuration-etcd/pom.xml | 2 +- .../configuration-k8s-configmap/pom.xml| 2 +- .../configuration-nacos/pom.xml| 2 +- .../configuration-zookeeper/pom.xml| 2 +- .../grpc-configuration-sync/pom.xml| 2 +- oap-server/server-configuration/pom.xml| 2 +- oap-server/server-core/pom.xml | 2 +- .../kafka-fetcher-plugin/pom.xml | 2 +- oap-server/server-fetcher-plugin/pom.xml | 2 +- .../prometheus-fetcher-plugin/pom.xml | 2 +- oap-server/server-health-checker/pom.xml | 2 +- oap-server/server-library/library-client/pom.xml | 2 +- .../library-datacarrier-queue/pom.xml | 2 +- .../library-elasticsearch-client/pom.xml | 2 +- oap-server/server-library/library-module/pom.xml | 2 +- oap-server/server-library/library-server/pom.xml | 2 +- oap-server/server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- .../query-graphql-plugin/pom.xml | 2 +- .../pom.xml| 2 +- .../envoy-metrics-receiver-plugin/pom.xml | 2 +- .../otel-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/receiver-proto/pom.xml | 2 +- .../skywalking-browser-receiver-plugin/pom.xml | 2 +- .../skywalking-clr-receiver-plugin/pom.xml | 2 +- .../skywalking-event-receiver-plugin/pom.xml | 2 +- .../skywalking-jvm-receiver-plugin/pom.xml | 2 +- .../skywalking-log-recevier-plugin/pom.xml | 2 +- .../skywalking-management-receiver-plugin/pom.xml | 2 +- .../skywalking-mesh-receiver-plugin/pom.xml| 2 +- .../skywalking-meter-receiver-plugin/pom.xml
[skywalking] branch master updated: Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes (#8234)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new d557f54 Fix potential NPE in OAL string match and a bug when
right-hand-side variable includes double quotes (#8234)
d557f54 is described below
commit d557f547fa93a7fa52e588917ec5186a050b3da3
Author: kezhenxu94
AuthorDate: Thu Dec 2 22:08:40 2021 +0800
Fix potential NPE in OAL string match and a bug when right-hand-side
variable includes double quotes (#8234)
---
CHANGES.md | 1 +
.../oap/server/core/analysis/metrics/expression/StringMatch.java| 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index ea23d75..1c943af 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Release Notes.
OAP Server
+* Fix potential NPE in OAL string match and a bug when right-hand-side
variable includes double quotes.
UI
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
index d0b6b01..9f931fb 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/StringMatch.java
@@ -25,12 +25,12 @@ import
org.apache.skywalking.oap.server.core.analysis.metrics.annotation.FilterM
public class StringMatch {
public boolean match(String left, String right) {
-if (left.startsWith("\"") && left.endsWith("\"")) {
+if (left != null && left.startsWith("\"") && left.endsWith("\"")) {
left = left.substring(1, left.length() - 1);
}
-if (right.startsWith("\"") && right.endsWith("\"")) {
-right = left.substring(1, right.length() - 1);
+if (right != null && right.startsWith("\"") && right.endsWith("\"")) {
+right = right.substring(1, right.length() - 1);
}
return Objects.equals(left, right);
[skywalking] 01/01: Bump up Armeria version to fix CVE
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch cve/armeria in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 6361d1a3bc37dfae27583eeadf148621f02ce2f6 Author: kezhenxu94 AuthorDate: Fri Dec 3 10:22:09 2021 +0800 Bump up Armeria version to fix CVE --- CHANGES.md| 1 + dist-material/release-docs/LICENSE| 2 +- oap-server-bom/pom.xml| 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1c943af..22541f6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Release Notes. OAP Server * Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes. +* Bump up Armeria version to fix CVE. UI diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index dbd92af..037951d 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -324,7 +324,7 @@ The text of each license is the standard Apache 2.0 license. simpleclient_httpserver 0.12.0 from prometheus https://github.com/prometheus/client_java Apache 2.0 jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0 failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0 -Armeria 1.12.0, http://github.com/line/armeria, Apache 2.0 +Armeria 1.13.4, http://github.com/line/armeria, Apache 2.0 Brotli4j 1.6.0, https://github.com/hyperxpro/Brotli4j, Apache 2.0 micrometer 1.7.4, https://github.com/micrometer-metrics/micrometer, Apache 2.0 iotdb-session 0.12.3: https://github.com/apache/iotdb, Apache 2.0 diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index cd80735..96af99e 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -73,7 +73,7 @@ 42.2.18 0.5.3 1.15.3 -1.12.0 +1.13.4 3.0.0 4.4.13 1.21 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index f29d69d..8a059d0 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -7,7 +7,7 @@ antlr4-runtime-4.7.1.jar aopalliance-1.0.jar apollo-client-1.8.0.jar apollo-core-1.8.0.jar -armeria-1.12.0.jar +armeria-1.13.4.jar audience-annotations-0.5.0.jar bcpkix-jdk15on-1.69.jar bcprov-ext-jdk15on-1.69.jar
[skywalking] branch cve/armeria created (now 6361d1a)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/armeria in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 6361d1a Bump up Armeria version to fix CVE This branch includes the following new commits: new 6361d1a Bump up Armeria version to fix CVE The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch cve/armeria updated (6361d1a -> 4089133)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/armeria in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 6361d1a Bump up Armeria version to fix CVE add 4089133 Bump up Armeria version to fix CVE This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6361d1a) \ N -- N -- N refs/heads/cve/armeria (4089133) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: dist-material/release-docs/LICENSE| 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[skywalking] branch master updated: Bump up Armeria version to fix CVE (#8236)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new b353644 Bump up Armeria version to fix CVE (#8236) b353644 is described below commit b3536445bc3e0463950353c46c13371e00a8306b Author: kezhenxu94 AuthorDate: Fri Dec 3 13:09:47 2021 +0800 Bump up Armeria version to fix CVE (#8236) --- CHANGES.md| 1 + dist-material/release-docs/LICENSE| 4 ++-- oap-server-bom/pom.xml| 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1c943af..22541f6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Release Notes. OAP Server * Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes. +* Bump up Armeria version to fix CVE. UI diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index dbd92af..d93a167 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -324,9 +324,9 @@ The text of each license is the standard Apache 2.0 license. simpleclient_httpserver 0.12.0 from prometheus https://github.com/prometheus/client_java Apache 2.0 jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0 failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0 -Armeria 1.12.0, http://github.com/line/armeria, Apache 2.0 +Armeria 1.13.4, http://github.com/line/armeria, Apache 2.0 Brotli4j 1.6.0, https://github.com/hyperxpro/Brotli4j, Apache 2.0 -micrometer 1.7.4, https://github.com/micrometer-metrics/micrometer, Apache 2.0 +micrometer 1.7.6, https://github.com/micrometer-metrics/micrometer, Apache 2.0 iotdb-session 0.12.3: https://github.com/apache/iotdb, Apache 2.0 iotdb-thrift 0.12.3: https://github.com/apache/iotdb, Apache 2.0 service-rpc 0.12.3: https://github.com/apache/iotdb, Apache 2.0 diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index cd80735..96af99e 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -73,7 +73,7 @@ 42.2.18 0.5.3 1.15.3 -1.12.0 +1.13.4 3.0.0 4.4.13 1.21 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index f29d69d..15bcc73 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -7,7 +7,7 @@ antlr4-runtime-4.7.1.jar aopalliance-1.0.jar apollo-client-1.8.0.jar apollo-core-1.8.0.jar -armeria-1.12.0.jar +armeria-1.13.4.jar audience-annotations-0.5.0.jar bcpkix-jdk15on-1.69.jar bcprov-ext-jdk15on-1.69.jar @@ -99,7 +99,7 @@ log4j-over-slf4j-1.7.30.jar log4j-slf4j-impl-2.14.1.jar logging-interceptor-3.13.1.jar lz4-java-1.6.0.jar -micrometer-core-1.7.4.jar +micrometer-core-1.7.6.jar moshi-1.5.0.jar msgpack-core-0.8.16.jar mvel2-2.4.8.Final.jar
[skywalking-python] branch master updated: bugfix: flask + nginx got KeyError: 'REMOTE_PORT' in sw_flask.py plugin (#176)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new f52c493 bugfix: flask + nginx got KeyError: 'REMOTE_PORT' in
sw_flask.py plugin (#176)
f52c493 is described below
commit f52c493875ae8da052a8a560aaabe7c3c8b2e902
Author: vxcoder
AuthorDate: Wed Dec 8 15:17:46 2021 +0800
bugfix: flask + nginx got KeyError: 'REMOTE_PORT' in sw_flask.py plugin
(#176)
---
skywalking/plugins/sw_flask.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/skywalking/plugins/sw_flask.py b/skywalking/plugins/sw_flask.py
index 1db86fc..f0205d4 100644
--- a/skywalking/plugins/sw_flask.py
+++ b/skywalking/plugins/sw_flask.py
@@ -56,7 +56,8 @@ def install():
with span:
span.layer = Layer.Http
span.component = Component.Flask
-span.peer =
f"{req.environ['REMOTE_ADDR']}:{req.environ['REMOTE_PORT']}"
+if all(environ_key in req.environ for environ_key in
('REMOTE_ADDR', 'REMOTE_PORT')):
+span.peer =
f"{req.environ['REMOTE_ADDR']}:{req.environ['REMOTE_PORT']}"
span.tag(TagHttpMethod(method))
span.tag(TagHttpURL(req.url.split('?')[0]))
if config.flask_collect_http_params and req.values:
[skywalking] branch master updated: Upgrade log4j2 to 2.15.0 (#8281)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 74c0f1e Upgrade log4j2 to 2.15.0 (#8281) 74c0f1e is described below commit 74c0f1e439c9c79a430db3a8c15bb87108152303 Author: 吴晟 Wu Sheng AuthorDate: Fri Dec 10 16:29:00 2021 +0800 Upgrade log4j2 to 2.15.0 (#8281) --- CHANGES.md| 4 ++-- oap-server-bom/pom.xml| 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e951e95..be28e3b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,8 @@ Release Notes. Project +* Upgrade log4j2 to 2.15.0 for easing the CVE concern. Officially, unless users open `level=DEBUG` for gRPC/HTTP + handler(s), no security error. OAP Server @@ -16,10 +18,8 @@ Release Notes. UI - Documentation - All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/112?closed=1) -- diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index ebf64dc..3c25735 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -29,7 +29,7 @@ 1.7.30 -2.14.1 +2.15.0 5.2.3 8.0 3.14.9 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 15bcc73..873c499 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -93,10 +93,10 @@ kotlin-reflect-1.1.1.jar kotlin-stdlib-1.1.60.jar libthrift-0.14.1.jar listenablefuture-.0-empty-to-avoid-conflict-with-guava.jar -log4j-api-2.14.1.jar -log4j-core-2.14.1.jar +log4j-api-2.15.0.jar +log4j-core-2.15.0.jar log4j-over-slf4j-1.7.30.jar -log4j-slf4j-impl-2.14.1.jar +log4j-slf4j-impl-2.15.0.jar logging-interceptor-3.13.1.jar lz4-java-1.6.0.jar micrometer-core-1.7.6.jar
[skywalking-showcase] branch main updated: Update OAP to avoid CVE as exposed on demo env (#13)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git The following commit(s) were added to refs/heads/main by this push: new 3ee8f99 Update OAP to avoid CVE as exposed on demo env (#13) 3ee8f99 is described below commit 3ee8f9923e29c542996735464949fd002a31fa70 Author: 吴晟 Wu Sheng AuthorDate: Sun Dec 12 11:15:50 2021 +0800 Update OAP to avoid CVE as exposed on demo env (#13) --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 682e14d..742c980 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,8 +26,8 @@ TAG ?= $(shell git rev-parse --short HEAD) ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0 -SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:b01ee4c983a603476f12a1968d144a983849c8bb -SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:b01ee4c983a603476f12a1968d144a983849c8bb +SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:d3ea14d960ee52f66cc634307999feadea1b91e5 +SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:d3ea14d960ee52f66cc634307999feadea1b91e5 SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:8c5725f2c4c47de6091748c1b4747f0d6047ad8e SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
[skywalking] branch log4j2 created (now d255265)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch log4j2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. at d255265 Bump up log4j2 to 2.17 This branch includes the following new commits: new d255265 Bump up log4j2 to 2.17 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: Bump up log4j2 to 2.17
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch log4j2 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit d2552655b556d50a97eb44cbbe6bf37db163e29e Author: kezhenxu94 AuthorDate: Sat Dec 18 21:54:31 2021 +0800 Bump up log4j2 to 2.17 --- CHANGES.md| 2 +- dist-material/release-docs/LICENSE| 2 +- oap-server-bom/pom.xml| 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e4ffa9d..517a571 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,7 +7,7 @@ Release Notes. Project -* Upgrade log4j2 to 2.16.0 for CVE-2021-44228 and CVE-2021-45046. This CVE only effects on JDK if JDNI is opened in +* Upgrade log4j2 to 2.17.0 for CVE-2021-44228, CVE-2021-45046 and CVE-2021-45105. This CVE only effects on JDK if JNDI is opened in default. Notice, using JVM option `-Dlog4j2.formatMsgNoLookups=true` or setting the `LOG4J_FORMAT_MSG_NO_LOOKUPS=”true”` environment variable also avoids CVEs. diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index e228690..c9f241e 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -249,7 +249,7 @@ The text of each license is the standard Apache 2.0 license. Apache: commons-lang 3.6: https://github.com/apache/commons-lang, Apache 2.0 Apache: commons-text 1.8: https://github.com/apache/commons-text, Apache 2.0 Apache: commons-beanutils 1.9.4: https://github.com/apache/commons-beanutils, Apache 2.0 -Apache: log4j2 2.15.0: https://github.com/apache/logging-log4j2, Apache 2.0 +Apache: log4j2 2.17.0: https://github.com/apache/logging-log4j2, Apache 2.0 Apache: zookeeper 3.5.7: https://github.com/apache/zookeeper, Apache 2.0 Apache: commons-collections 3.2.2: https://github.com/apache/commons-collections, Apache 2.0 Apache: commons-configuration 1.8: https://github.com/apache/commons-configuration, Apache 2.0 diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index bff30c8..a906768 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -29,7 +29,7 @@ 1.7.30 -2.16.0 +2.17.0 5.2.3 8.0 3.14.9 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 8f9f329..e74dbe1 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -93,10 +93,10 @@ kotlin-reflect-1.1.1.jar kotlin-stdlib-1.1.60.jar libthrift-0.14.1.jar listenablefuture-.0-empty-to-avoid-conflict-with-guava.jar -log4j-api-2.16.0.jar -log4j-core-2.16.0.jar +log4j-api-2.17.0.jar +log4j-core-2.17.0.jar log4j-over-slf4j-1.7.30.jar -log4j-slf4j-impl-2.16.0.jar +log4j-slf4j-impl-2.17.0.jar logging-interceptor-3.13.1.jar lz4-java-1.6.0.jar micrometer-core-1.7.6.jar
[skywalking] branch master updated: Bump up log4j2 to 2.17 (#8314)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new a02dd9c Bump up log4j2 to 2.17 (#8314) a02dd9c is described below commit a02dd9c2d152fb45c76b117c7aaa6180a76b4cf5 Author: kezhenxu94 AuthorDate: Sat Dec 18 22:40:38 2021 +0800 Bump up log4j2 to 2.17 (#8314) --- CHANGES.md| 2 +- dist-material/release-docs/LICENSE| 2 +- oap-server-bom/pom.xml| 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e4ffa9d..517a571 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,7 +7,7 @@ Release Notes. Project -* Upgrade log4j2 to 2.16.0 for CVE-2021-44228 and CVE-2021-45046. This CVE only effects on JDK if JDNI is opened in +* Upgrade log4j2 to 2.17.0 for CVE-2021-44228, CVE-2021-45046 and CVE-2021-45105. This CVE only effects on JDK if JNDI is opened in default. Notice, using JVM option `-Dlog4j2.formatMsgNoLookups=true` or setting the `LOG4J_FORMAT_MSG_NO_LOOKUPS=”true”` environment variable also avoids CVEs. diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index e228690..c9f241e 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -249,7 +249,7 @@ The text of each license is the standard Apache 2.0 license. Apache: commons-lang 3.6: https://github.com/apache/commons-lang, Apache 2.0 Apache: commons-text 1.8: https://github.com/apache/commons-text, Apache 2.0 Apache: commons-beanutils 1.9.4: https://github.com/apache/commons-beanutils, Apache 2.0 -Apache: log4j2 2.15.0: https://github.com/apache/logging-log4j2, Apache 2.0 +Apache: log4j2 2.17.0: https://github.com/apache/logging-log4j2, Apache 2.0 Apache: zookeeper 3.5.7: https://github.com/apache/zookeeper, Apache 2.0 Apache: commons-collections 3.2.2: https://github.com/apache/commons-collections, Apache 2.0 Apache: commons-configuration 1.8: https://github.com/apache/commons-configuration, Apache 2.0 diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index bff30c8..a906768 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -29,7 +29,7 @@ 1.7.30 -2.16.0 +2.17.0 5.2.3 8.0 3.14.9 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 8f9f329..e74dbe1 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -93,10 +93,10 @@ kotlin-reflect-1.1.1.jar kotlin-stdlib-1.1.60.jar libthrift-0.14.1.jar listenablefuture-.0-empty-to-avoid-conflict-with-guava.jar -log4j-api-2.16.0.jar -log4j-core-2.16.0.jar +log4j-api-2.17.0.jar +log4j-core-2.17.0.jar log4j-over-slf4j-1.7.30.jar -log4j-slf4j-impl-2.16.0.jar +log4j-slf4j-impl-2.17.0.jar logging-interceptor-3.13.1.jar lz4-java-1.6.0.jar micrometer-core-1.7.6.jar
[skywalking-nginx-lua] branch master updated: draft a new version 0.6.0 (#89)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-nginx-lua.git
The following commit(s) were added to refs/heads/master by this push:
new 0bd2e4f draft a new version 0.6.0 (#89)
0bd2e4f is described below
commit 0bd2e4f588cf2d00feea021f4a6da4d10c277f6a
Author: Daming
AuthorDate: Sun Dec 19 23:43:07 2021 +0800
draft a new version 0.6.0 (#89)
---
rockspec/skywalking-nginx-lua-0.6.0-0.rockspec | 34 ++
1 file changed, 34 insertions(+)
diff --git a/rockspec/skywalking-nginx-lua-0.6.0-0.rockspec
b/rockspec/skywalking-nginx-lua-0.6.0-0.rockspec
new file mode 100644
index 000..6032716
--- /dev/null
+++ b/rockspec/skywalking-nginx-lua-0.6.0-0.rockspec
@@ -0,0 +1,34 @@
+package = "skywalking-nginx-lua"
+version = "0.6.0-0"
+source = {
+ url = "git://github.com/apache/skywalking-nginx-lua",
+ branch = "0.6.0",
+}
+
+description = {
+ summary = "The Nginx Lua agent for Apache SkyWalking",
+ homepage = "https://github.com/apache/skywalking-nginx-lua";,
+ license = "Apache License 2.0"
+}
+
+dependencies = {
+ "lua-resty-http >= 0.15",
+ "lua-resty-jit-uuid >= 0.0.7"
+}
+
+build = {
+ type = "builtin",
+ modules = {
+ ["skywalking.client"] = "lib/skywalking/client.lua",
+ ["skywalking.constants"] = "lib/skywalking/constants.lua",
+ ["skywalking.correlation_context"] =
"lib/skywalking/correlation_context.lua",
+ ["skywalking.management"] = "lib/skywalking/management.lua",
+ ["skywalking.segment_ref"] = "lib/skywalking/segment_ref.lua",
+ ["skywalking.segment"] = "lib/skywalking/segment.lua",
+ ["skywalking.span_layer"] = "lib/skywalking/span_layer.lua",
+ ["skywalking.span"] = "lib/skywalking/span.lua",
+ ["skywalking.tracer"] = "lib/skywalking/tracer.lua",
+ ["skywalking.tracing_context"] = "lib/skywalking/tracing_context.lua",
+ ["skywalking.util"] = "lib/skywalking/util.lua",
+ }
+}
[skywalking] branch webapp/chore created (now 6e346d3)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch webapp/chore in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 6e346d3 Remove unused jars and bump up netty version in webapp This branch includes the following new commits: new 6e346d3 Remove unused jars and bump up netty version in webapp The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: Remove unused jars and bump up netty version in webapp
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch webapp/chore
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 6e346d3602c746f3afa066ac2a92b217df7eb896
Author: kezhenxu94
AuthorDate: Tue Dec 21 12:54:55 2021 +0800
Remove unused jars and bump up netty version in webapp
---
apm-webapp/pom.xml | 15 ---
dist-material/release-docs/LICENSE | 1 -
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index d0055ae..2e5d797 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -39,6 +39,7 @@
1.2.3
2.12.2
1.28
+4.1.68.Final
${project.parent.basedir}/skywalking-ui
@@ -52,6 +53,13 @@
pom
import
+
+io.netty
+netty-bom
+${netty.version}
+import
+pom
+
@@ -75,6 +83,10 @@
com.fasterxml.jackson.core
jackson-databind
+
+org.springframework.boot
+spring-boot-starter-logging
+
@@ -120,9 +132,6 @@
skywalking-webapp
-
-
-
maven-compiler-plugin
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index c9f241e..a74ee36 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -320,7 +320,6 @@ The text of each license is the standard Apache 2.0 license.
slf4j-api 1.7.30: http://www.slf4j.org, Apache 2.0
mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
okio 1.17.2: https://github.com/square/okio Apache 2.0
-caffeine 2.6.2: https://github.com/ben-manes/caffeine Apache 2.0
simpleclient_httpserver 0.12.0 from prometheus
https://github.com/prometheus/client_java Apache 2.0
jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0
failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0
[skywalking] branch master updated: Remove unused jars and bump up netty version in webapp (#8317)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 5da205b Remove unused jars and bump up netty version in webapp (#8317)
5da205b is described below
commit 5da205ba9bd99a06f3726619a2ef542349eb1bab
Author: kezhenxu94
AuthorDate: Tue Dec 21 13:39:37 2021 +0800
Remove unused jars and bump up netty version in webapp (#8317)
---
apm-webapp/pom.xml | 15 ---
dist-material/release-docs/LICENSE | 1 -
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index d0055ae..2e5d797 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -39,6 +39,7 @@
1.2.3
2.12.2
1.28
+4.1.68.Final
${project.parent.basedir}/skywalking-ui
@@ -52,6 +53,13 @@
pom
import
+
+io.netty
+netty-bom
+${netty.version}
+import
+pom
+
@@ -75,6 +83,10 @@
com.fasterxml.jackson.core
jackson-databind
+
+org.springframework.boot
+spring-boot-starter-logging
+
@@ -120,9 +132,6 @@
skywalking-webapp
-
-
-
maven-compiler-plugin
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index c9f241e..a74ee36 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -320,7 +320,6 @@ The text of each license is the standard Apache 2.0 license.
slf4j-api 1.7.30: http://www.slf4j.org, Apache 2.0
mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
okio 1.17.2: https://github.com/square/okio Apache 2.0
-caffeine 2.6.2: https://github.com/ben-manes/caffeine Apache 2.0
simpleclient_httpserver 0.12.0 from prometheus
https://github.com/prometheus/client_java Apache 2.0
jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0
failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0
[skywalking] branch chore/maven-wraooer created (now f7b854b)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch chore/maven-wraooer in repository https://gitbox.apache.org/repos/asf/skywalking.git. at f7b854b Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements and ARM more native support This branch includes the following new commits: new f7b854b Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements and ARM more native support The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements and ARM more native support
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch chore/maven-wraooer
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f7b854b7ec43188ba128b21d34db18c123641f98
Author: kezhenxu94
AuthorDate: Tue Dec 21 14:53:50 2021 +0800
Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements
and ARM more native support
---
.mvn/wrapper/MavenWrapperDownloader.java | 117 ---
.mvn/wrapper/maven-wrapper.properties| 21 +-
CHANGES.md | 4 ++
LICENSE | 2 +-
mvnw | 18 +++--
mvnw.cmd | 30
6 files changed, 53 insertions(+), 139 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index 187216f..000
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed 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.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-private static final String WRAPPER_VERSION = "0.5.5";
-/**
- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
- */
-private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/";
-+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-/**
- * Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
- * use instead of the default one.
- */
-private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-".mvn/wrapper/maven-wrapper.properties";
-
-/**
- * Path where the maven-wrapper.jar will be saved to.
- */
-private static final String MAVEN_WRAPPER_JAR_PATH =
-".mvn/wrapper/maven-wrapper.jar";
-
-/**
- * Name of the property which should be used to override the default
download url for the wrapper.
- */
-private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-public static void main(String args[]) {
-System.out.println("- Downloader started");
-File baseDirectory = new File(args[0]);
-System.out.println("- Using base directory: " +
baseDirectory.getAbsolutePath());
-
-// If the maven-wrapper.properties exists, read it and check if it
contains a custom
-// wrapperUrl parameter.
-File mavenWrapperPropertyFile = new File(baseDirectory,
MAVEN_WRAPPER_PROPERTIES_PATH);
-String url = DEFAULT_DOWNLOAD_URL;
-if(mavenWrapperPropertyFile.exists()) {
-FileInputStream mavenWrapperPropertyFileInputStream = null;
-try {
-mavenWrapperPropertyFileInputStream = new
FileInputStream(mavenWrapperPropertyFile);
-Properties mavenWrapperProperties = new Properties();
-
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-url =
mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-} catch (IOException e) {
-System.out.println("- ERROR loading '" +
MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-} finally {
-try {
-if(mavenWrapperPropertyFileInputStream != null) {
-mavenWrapperPropertyFileInputStream.close();
-}
-} catch (IOException e) {
-// Ignore ...
-}
-}
-}
-System.out.println("- Downloading from: " + url);
-
-File outputFile = new File(baseDirectory.getAbsolutePath(),
MAVEN_WRAPPER_JAR_PATH);
-if(!outputFile.getParentFile().exists()) {
-if(!outputFile.getParentFile().mkdirs()) {
-System.out.println(
-"- ERROR creating output directory '" +
outputFile.getParentFile().getAbsolutePath() + "'");
-}
-}
-System.out.printl
[skywalking-website] branch master updated: Update index.md
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-website.git The following commit(s) were added to refs/heads/master by this push: new d505001 Update index.md d505001 is described below commit d50500102f779dedeecc70fefeab26b8c126c46c Author: kezhenxu94 AuthorDate: Tue Dec 21 16:06:31 2021 +0800 Update index.md --- .../index.md | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/content/blog/2021-12-21-better-observability-for-chaos-engineering/index.md b/content/blog/2021-12-21-better-observability-for-chaos-engineering/index.md index 8f8939c..dd87b48 100644 --- a/content/blog/2021-12-21-better-observability-for-chaos-engineering/index.md +++ b/content/blog/2021-12-21-better-observability-for-chaos-engineering/index.md @@ -1,11 +1,7 @@ --- -slug: /better-observability-for-chaos-engineering title: 'Chaos Mesh + SkyWalking: Better Observability for Chaos Engineering' +date: 2021-11-29 author: Ningxuan Wang -author_title: Chaos Mesh Contributor -author_url: https://github.com/FingerLeader -author_image_url: https://avatars.githubusercontent.com/u/43462394?v=4 -image: /img/chaos-mesh-skywalking-banner.png tags: [Chaos Mesh, Chaos Engineering, Tutorial] --- @@ -102,4 +98,4 @@ By combining SkyWalking and Chaos Mesh, you can clearly observe when and to what Chaos Mesh has grown a lot in 2021 thanks to the unremitting efforts of all PingCAP engineers and community contributors. In order to continue to upgrade our support for our wide variety of users and learn more about users’ experience in Chaos Engineering, we’d like to invite you to take[ this survey](https://www.surveymonkey.com/r/X77BCNM) and give us your valuable feedback. -If you want to know more about Chaos Mesh, you’re welcome to join [the Chaos Mesh community on GitHub](https://github.com/chaos-mesh) or our [Slack discussions](https://slack.cncf.io/) (#project-chaos-mesh). If you find any bugs or missing features when using Chaos Mesh, you can submit your pull requests or issues to our [GitHub repository](https://github.com/chaos-mesh/chaos-mesh). \ No newline at end of file +If you want to know more about Chaos Mesh, you’re welcome to join [the Chaos Mesh community on GitHub](https://github.com/chaos-mesh) or our [Slack discussions](https://slack.cncf.io/) (#project-chaos-mesh). If you find any bugs or missing features when using Chaos Mesh, you can submit your pull requests or issues to our [GitHub repository](https://github.com/chaos-mesh/chaos-mesh).
[skywalking] branch master updated: Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements and ARM more native support (#8320)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e74adec Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for
performance improvements and ARM more native support (#8320)
e74adec is described below
commit e74adec05fd8a93ee945bcc4a3c7fcbb3761c5c7
Author: kezhenxu94
AuthorDate: Tue Dec 21 16:09:44 2021 +0800
Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements
and ARM more native support (#8320)
---
.mvn/wrapper/MavenWrapperDownloader.java | 117 ---
.mvn/wrapper/maven-wrapper.properties| 21 +-
CHANGES.md | 4 ++
LICENSE | 2 +-
mvnw | 18 +++--
mvnw.cmd | 30
6 files changed, 53 insertions(+), 139 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index 187216f..000
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed 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.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-private static final String WRAPPER_VERSION = "0.5.5";
-/**
- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
- */
-private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/";
-+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-/**
- * Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
- * use instead of the default one.
- */
-private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-".mvn/wrapper/maven-wrapper.properties";
-
-/**
- * Path where the maven-wrapper.jar will be saved to.
- */
-private static final String MAVEN_WRAPPER_JAR_PATH =
-".mvn/wrapper/maven-wrapper.jar";
-
-/**
- * Name of the property which should be used to override the default
download url for the wrapper.
- */
-private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-public static void main(String args[]) {
-System.out.println("- Downloader started");
-File baseDirectory = new File(args[0]);
-System.out.println("- Using base directory: " +
baseDirectory.getAbsolutePath());
-
-// If the maven-wrapper.properties exists, read it and check if it
contains a custom
-// wrapperUrl parameter.
-File mavenWrapperPropertyFile = new File(baseDirectory,
MAVEN_WRAPPER_PROPERTIES_PATH);
-String url = DEFAULT_DOWNLOAD_URL;
-if(mavenWrapperPropertyFile.exists()) {
-FileInputStream mavenWrapperPropertyFileInputStream = null;
-try {
-mavenWrapperPropertyFileInputStream = new
FileInputStream(mavenWrapperPropertyFile);
-Properties mavenWrapperProperties = new Properties();
-
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-url =
mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-} catch (IOException e) {
-System.out.println("- ERROR loading '" +
MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-} finally {
-try {
-if(mavenWrapperPropertyFileInputStream != null) {
-mavenWrapperPropertyFileInputStream.close();
-}
-} catch (IOException e) {
-// Ignore ...
-}
-}
-}
-System.out.println("- Downloading from: " + url);
-
-File outputFile = new File(baseDirectory.getAbsolutePath(),
MAVEN_WRAPPER_JAR_PATH);
-if(!outputFile.getParentFile().exists()) {
-if(!outputFile.getParent
[skywalking] branch master updated: Fix `Can't split endpoint id into 2 parts` bug for endpoint ID in the mesh's TCP case. (#8327)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 8a322e8 Fix `Can't split endpoint id into 2 parts` bug for endpoint
ID in the mesh's TCP case. (#8327)
8a322e8 is described below
commit 8a322e85596abf5c1412237ff044543e0d71b7da
Author: 吴晟 Wu Sheng
AuthorDate: Thu Dec 23 09:56:33 2021 +0800
Fix `Can't split endpoint id into 2 parts` bug for endpoint ID in the
mesh's TCP case. (#8327)
---
CHANGES.md | 6 --
.../aop/server/receiver/mesh/TelemetryDataDispatcher.java | 5 -
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index c7c2676..11530c0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,8 +7,8 @@ Release Notes.
Project
-* Upgrade log4j2 to 2.17.0 for CVE-2021-44228, CVE-2021-45046 and
CVE-2021-45105. This CVE only effects on JDK if JNDI is opened in
- default. Notice, using JVM option `-Dlog4j2.formatMsgNoLookups=true` or
setting
+* Upgrade log4j2 to 2.17.0 for CVE-2021-44228, CVE-2021-45046 and
CVE-2021-45105. This CVE only effects on JDK if JNDI
+ is opened in default. Notice, using JVM option
`-Dlog4j2.formatMsgNoLookups=true` or setting
the `LOG4J_FORMAT_MSG_NO_LOOKUPS=”true”` environment variable also avoids
CVEs.
* Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements
and ARM more native support.
@@ -18,6 +18,8 @@ Release Notes.
* Bump up Armeria version to fix CVE.
* Polish ETCD cluster config environment variables.
* Add the analysis of metrics in Satellite MetricsService.
+* Fix `Can't split endpoint id into 2 parts` bug for endpoint ID. In the TCP
in service mesh observability, endpoint
+ name doesn't exist in TCP traffic.
UI
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
index d3a3558..bf839c9 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -21,7 +21,6 @@ package org.apache.skywalking.aop.server.receiver.mesh;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.network.servicemesh.v3.Protocol;
import org.apache.skywalking.apm.network.servicemesh.v3.ServiceMeshMetric;
-import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.NodeType;
@@ -37,6 +36,7 @@ import
org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation;
import org.apache.skywalking.oap.server.core.source.ServiceRelation;
import org.apache.skywalking.oap.server.core.source.SourceReceiver;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
+import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics;
import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics;
@@ -226,6 +226,9 @@ public class TelemetryDataDispatcher {
}
private static void toEndpoint(ServiceMeshMetric.Builder metrics, long
minuteTimeBucket) {
+if (StringUtil.isEmpty(metrics.getEndpoint())) {
+return;
+}
Endpoint endpoint = new Endpoint();
endpoint.setTimeBucket(minuteTimeBucket);
endpoint.setName(metrics.getEndpoint());
[skywalking] branch cve/h2 created (now b74c247)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. at b74c247 Upgrade H2 version to 2.0.202, to avoid false negative report from security scanning tools This branch includes the following new commits: new b74c247 Upgrade H2 version to 2.0.202, to avoid false negative report from security scanning tools The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: Upgrade H2 version to 2.0.202, to avoid false negative report from security scanning tools
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit b74c247ab66350ffc8a3ff9f07cdef52af5a5978 Author: kezhenxu94 AuthorDate: Thu Dec 23 10:44:29 2021 +0800 Upgrade H2 version to 2.0.202, to avoid false negative report from security scanning tools --- CHANGES.md| 1 + dist-material/release-docs/LICENSE| 2 +- oap-server-bom/pom.xml| 2 +- test/e2e-v2/java-test-service/pom.xml | 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 11530c0..7754039 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,7 @@ Release Notes. * Add the analysis of metrics in Satellite MetricsService. * Fix `Can't split endpoint id into 2 parts` bug for endpoint ID. In the TCP in service mesh observability, endpoint name doesn't exist in TCP traffic. +* Upgrade H2 version to 2.0.202, to avoid false negative report from security scanning tools. UI diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index a74ee36..a3c4cd0 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -381,7 +381,7 @@ MPL 2.0 licenses The following components are provided under a MPL 2.0 license. See project link for details. The text of each license is also included at licenses/LICENSE-[project].txt. -H2 Database 1.4.196: http://www.h2database.com/html/main.html , MPL 2.0 or EPL 1.0 +H2 Database 2.0.202: http://www.h2database.com/html/main.html , MPL 2.0 or EPL 1.0 CC0-1.0 licenses diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index a906768..d8fc50c 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -34,7 +34,7 @@ 8.0 3.14.9 4.5.13 -1.4.196 +2.0.202 2.10.5 3.5.7 28.1-jre diff --git a/test/e2e-v2/java-test-service/pom.xml b/test/e2e-v2/java-test-service/pom.xml index c87e67d..1a3784e 100644 --- a/test/e2e-v2/java-test-service/pom.xml +++ b/test/e2e-v2/java-test-service/pom.xml @@ -48,7 +48,7 @@ 5.6.0 2.9.7 30.1.1-jre -1.4.199 +2.0.202 8.0.13 1.18.20 2.4.1 diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index e74dbe1..d2e3e78 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -55,7 +55,7 @@ gson-2.8.6.jar gson-fire-1.8.5.jar guava-28.1-jre.jar guice-4.1.0.jar -h2-1.4.196.jar +h2-2.0.202.jar httpasyncclient-4.1.3.jar httpclient-4.5.13.jar httpcore-4.4.13.jar
[skywalking] branch cve/h2 updated (b74c247 -> 3db82ee)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard b74c247 Upgrade H2 version to 2.0.202, to avoid false negative report from security scanning tools add 3db82ee Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b74c247) \ N -- N -- N refs/heads/cve/h2 (3db82ee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGES.md| 2 +- .../server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 11 ++- 2 files changed, 11 insertions(+), 2 deletions(-)
[skywalking] branch cve/h2 updated (3db82ee -> 438062f)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 3db82ee Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 438062f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3db82ee) \ N -- N -- N refs/heads/cve/h2 (438062f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch cve/h2 updated (438062f -> 1ca93c4)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 438062f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 1ca93c4 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (438062f) \ N -- N -- N refs/heads/cve/h2 (1ca93c4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking] branch cve/h2 updated (1ca93c4 -> 2d27bf5)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 1ca93c4 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 2d27bf5 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1ca93c4) \ N -- N -- N refs/heads/cve/h2 (2d27bf5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 19 +++ .../storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-)
[skywalking] branch cve/h2 updated (2d27bf5 -> ec1823d)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. omit 2d27bf5 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add ec1823d Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2d27bf5) \ N -- N -- N refs/heads/cve/h2 (ec1823d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 8 +++- .../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 24 +++--- .../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 7 ++- 3 files changed, 34 insertions(+), 5 deletions(-)
[skywalking] branch cve/h2 updated (ec1823d -> 95e9bc8)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard ec1823d Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 95e9bc8 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ec1823d) \ N -- N -- N refs/heads/cve/h2 (95e9bc8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 14 +++-- .../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 36 ++ .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 8 + .../plugin/jdbc/h2/dao/H2TableInstaller.java | 23 ++ .../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 7 ++--- 5 files changed, 26 insertions(+), 62 deletions(-)
[skywalking] branch cve/h2 updated (95e9bc8 -> d0c7911)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 95e9bc8 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add d0c7911 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (95e9bc8) \ N -- N -- N refs/heads/cve/h2 (d0c7911) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 4 .../oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 2 -- 2 files changed, 6 deletions(-)
[skywalking] branch cve/h2 updated (d0c7911 -> ba72175)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard d0c7911 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add ba72175 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d0c7911) \ N -- N -- N refs/heads/cve/h2 (ba72175) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 2 -- 1 file changed, 2 deletions(-)
[skywalking] branch cve/h2 updated (ba72175 -> 34a6d54)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard ba72175 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 34a6d54 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ba72175) \ N -- N -- N refs/heads/cve/h2 (34a6d54) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/skywalking/e2e/User.java | 2 ++ 1 file changed, 2 insertions(+)
[skywalking] branch cve/h2 updated (34a6d54 -> 7714776)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 34a6d54 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 7714776 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (34a6d54) \ N -- N -- N refs/heads/cve/h2 (7714776) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 6 +++--- .../storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 8 .../server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 2 +- .../storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 14 +++--- .../storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-)
[skywalking] branch cve/h2 updated (7714776 -> ea8b54d)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 7714776 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add ea8b54d Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7714776) \ N -- N -- N refs/heads/cve/h2 (ea8b54d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 4 ++-- .../storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 8 .../server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 2 +- .../storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 14 +++--- 4 files changed, 14 insertions(+), 14 deletions(-)
[skywalking] branch cve/h2 updated (ea8b54d -> 988294f)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard ea8b54d Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 988294f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ea8b54d) \ N -- N -- N refs/heads/cve/h2 (988294f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 2 +- .../oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 8 .../oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 2 +- .../server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
[skywalking] branch cve/h2 updated (988294f -> 0b2d4dc)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 988294f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 0b2d4dc Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (988294f) \ N -- N -- N refs/heads/cve/h2 (0b2d4dc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../storage/plugin/jdbc/h2/H2StorageConfig.java| 18 .../storage/plugin/jdbc/h2/H2StorageProvider.java | 17 +-- .../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 23 --- .../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java| 2 +- .../plugin/jdbc/h2/dao/H2ManagementDAO.java| 10 +-- .../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 27 + .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 9 -- .../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 9 +++--- .../plugin/jdbc/h2/dao/H2TableInstaller.java | 29 +- .../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 12 .../jdbc/h2/dao/H2UITemplateManagementDAO.java | 9 -- .../jdbc/mysql/MySQLAggregationQueryDAO.java | 4 +-- .../plugin/jdbc/mysql/MySQLStorageConfig.java | 34 +- .../plugin/jdbc/mysql/MySQLStorageProvider.java| 19 +--- .../plugin/jdbc/mysql/MySQLTableInstaller.java | 5 ++-- .../jdbc/postgresql/PostgreSQLStorageConfig.java | 5 .../jdbc/postgresql/PostgreSQLStorageProvider.java | 11 +++ .../plugin/jdbc/tidb/TiDBStorageProvider.java | 18 18 files changed, 129 insertions(+), 132 deletions(-)
[skywalking] branch cve/h2 updated (0b2d4dc -> 32eb9dc)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve/h2 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 0b2d4dc Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 32eb9dc Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0b2d4dc) \ N -- N -- N refs/heads/cve/h2 (32eb9dc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../storage/plugin/jdbc/h2/H2StorageProvider.java | 35 +++-- .../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java| 8 ++-- .../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 8 ++-- .../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 11 -- .../jdbc/h2/dao/H2NetworkAddressAliasDAO.java | 6 ++- .../plugin/jdbc/h2/dao/H2NoneStreamDAO.java| 10 +++-- .../storage/plugin/jdbc/h2/dao/H2RecordDAO.java| 45 +++--- .../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 9 ++--- .../plugin/jdbc/h2/dao/H2TraceQueryDAO.java| 18 - .../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 7 ++-- .../plugin/jdbc/mysql/MySQLLogQueryDAO.java| 4 +- .../plugin/jdbc/mysql/MySQLStorageProvider.java| 29 +++--- .../plugin/jdbc/mysql/MySQLTraceQueryDAO.java | 5 +-- .../jdbc/postgresql/PostgreSQLStorageProvider.java | 39 +++ .../jdbc/postgresql/PostgreSQLTableInstaller.java | 7 ++-- .../dao/PostgreSQLAggregationQueryDAO.java | 6 ++- .../postgresql/dao/PostgreSQLAlarmQueryDAO.java| 7 ++-- .../jdbc/postgresql/dao/PostgreSQLLogQueryDAO.java | 8 ++-- .../postgresql/dao/PostgreSQLMetricsQueryDAO.java | 5 ++- .../postgresql/dao/PostgreSQLTraceQueryDAO.java| 8 ++-- .../plugin/jdbc/tidb/TiDBStorageProvider.java | 27 - 21 files changed, 126 insertions(+), 176 deletions(-)
[skywalking] branch h2/cve created (now d4d676f)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch h2/cve in repository https://gitbox.apache.org/repos/asf/skywalking.git. at d4d676f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This branch includes the following new commits: new d4d676f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: Upgrade H2 version to 2.0.202 to fix CVE-2021-23463
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch h2/cve
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit d4d676f950fc87317d744cdee13b80e37c9afeb6
Author: kezhenxu94
AuthorDate: Thu Dec 23 19:02:41 2021 +0800
Upgrade H2 version to 2.0.202 to fix CVE-2021-23463
---
CHANGES.md | 1 +
dist-material/release-docs/LICENSE | 2 +-
oap-server-bom/pom.xml | 2 +-
.../server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 9 +
.../oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 6 +++---
.../oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 1 +
.../src/main/java/org/apache/skywalking/e2e/User.java| 2 ++
test/e2e-v2/java-test-service/pom.xml| 2 +-
tools/dependencies/known-oap-backend-dependencies.txt| 2 +-
9 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 11530c0..79b4a64 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Release Notes.
* Add the analysis of metrics in Satellite MetricsService.
* Fix `Can't split endpoint id into 2 parts` bug for endpoint ID. In the TCP
in service mesh observability, endpoint
name doesn't exist in TCP traffic.
+* Upgrade H2 version to 2.0.202 to fix CVE-2021-23463.
UI
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index a74ee36..a3c4cd0 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -381,7 +381,7 @@ MPL 2.0 licenses
The following components are provided under a MPL 2.0 license. See project
link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
-H2 Database 1.4.196: http://www.h2database.com/html/main.html , MPL 2.0 or
EPL 1.0
+H2 Database 2.0.202: http://www.h2database.com/html/main.html , MPL 2.0 or
EPL 1.0
CC0-1.0 licenses
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index a906768..d8fc50c 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -34,7 +34,7 @@
8.0
3.14.9
4.5.13
-1.4.196
+2.0.202
2.10.5
3.5.7
28.1-jre
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
index d686cc5..97fddf5 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
@@ -61,8 +61,9 @@ public class H2AggregationQueryDAO implements
IAggregationQueryDAO {
});
}
sql.append(" group by ").append(Metrics.ENTITY_ID);
-sql.append(") as T order by value ")
- .append(metrics.getOrder().equals(Order.ASC) ? "asc" : "desc")
+sql.append(") as T order by ")
+ .append(valueColumnName)
+ .append(metrics.getOrder().equals(Order.ASC) ? " asc" : " desc")
.append(" limit ")
.append(metrics.getTopN());
List topNEntities = new ArrayList<>();
@@ -72,7 +73,7 @@ public class H2AggregationQueryDAO implements
IAggregationQueryDAO {
while (resultSet.next()) {
SelectedRecord topNEntity = new SelectedRecord();
topNEntity.setId(resultSet.getString(Metrics.ENTITY_ID));
-topNEntity.setValue(resultSet.getString("value"));
+topNEntity.setValue(resultSet.getString("result"));
topNEntities.add(topNEntity);
}
} catch (SQLException e) {
@@ -85,7 +86,7 @@ public class H2AggregationQueryDAO implements
IAggregationQueryDAO {
StringBuilder sql = new StringBuilder();
sql.append("select * from (select avg(")
.append(valueColumnName)
-.append(") value,")
+.append(") result,")
.append(Metrics.ENTITY_ID)
.append(" from ")
.append(metricsName)
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java
b/oap-server/serve
[skywalking] branch h2/cve updated (d4d676f -> 060cce3)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch h2/cve in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard d4d676f Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add 060cce3 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d4d676f) \ N -- N -- N refs/heads/h2/cve (060cce3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../server/core/storage/annotation/ValueColumnMetadata.java| 10 -- .../oap/server/core/storage/model/StorageModels.java | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
[skywalking] branch h2/cve updated (060cce3 -> dd5425d)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch h2/cve in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 060cce3 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add dd5425d Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (060cce3) \ N -- N -- N refs/heads/h2/cve (dd5425d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../server/core/storage/annotation/ValueColumnMetadata.java| 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
[skywalking] branch h2/cve updated (dd5425d -> cebd626)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch h2/cve in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard dd5425d Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add cebd626 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (dd5425d) \ N -- N -- N refs/heads/h2/cve (cebd626) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../oap/server/core/storage/annotation/ValueColumnMetadata.java | 2 -- 1 file changed, 2 deletions(-)
[skywalking] branch h2/cve updated (cebd626 -> a05aec7)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch h2/cve in repository https://gitbox.apache.org/repos/asf/skywalking.git. from cebd626 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 add a05aec7 Update CHANGES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 1 + 1 file changed, 1 insertion(+)
[skywalking] branch master updated: Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 (#8332)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 8fa4eb7 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 (#8332)
8fa4eb7 is described below
commit 8fa4eb7d75d82858931fc741d309b6091731309d
Author: kezhenxu94
AuthorDate: Thu Dec 23 21:37:00 2021 +0800
Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 (#8332)
---
CHANGES.md | 2 ++
dist-material/release-docs/LICENSE | 2 +-
oap-server-bom/pom.xml | 2 +-
.../server/core/storage/annotation/ValueColumnMetadata.java | 12 +---
.../oap/server/core/storage/model/StorageModels.java | 1 +
.../storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java| 9 +
.../server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 6 +++---
.../server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java | 1 +
.../src/main/java/org/apache/skywalking/e2e/User.java| 2 ++
test/e2e-v2/java-test-service/pom.xml| 2 +-
tools/dependencies/known-oap-backend-dependencies.txt| 2 +-
11 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 11530c0..9593314 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,8 @@ Release Notes.
* Add the analysis of metrics in Satellite MetricsService.
* Fix `Can't split endpoint id into 2 parts` bug for endpoint ID. In the TCP
in service mesh observability, endpoint
name doesn't exist in TCP traffic.
+* Upgrade H2 version to 2.0.202 to fix CVE-2021-23463.
+* Extend column name override mechanism working for `ValueColumnMetadata`.
UI
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index a74ee36..a3c4cd0 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -381,7 +381,7 @@ MPL 2.0 licenses
The following components are provided under a MPL 2.0 license. See project
link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
-H2 Database 1.4.196: http://www.h2database.com/html/main.html , MPL 2.0 or
EPL 1.0
+H2 Database 2.0.202: http://www.h2database.com/html/main.html , MPL 2.0 or
EPL 1.0
CC0-1.0 licenses
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index a906768..d8fc50c 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -34,7 +34,7 @@
8.0
3.14.9
4.5.13
-1.4.196
+2.0.202
2.10.5
3.5.7
28.1-jre
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnMetadata.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnMetadata.java
index 67b2318..d9c0bde 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnMetadata.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnMetadata.java
@@ -32,7 +32,8 @@ import
org.apache.skywalking.oap.server.core.query.sql.Function;
public enum ValueColumnMetadata {
INSTANCE;
-private Map mapping = new HashMap<>();
+private final Map mapping = new HashMap<>();
+private final HashMap columnNameOverrideRule = new
HashMap<>();
/**
* Register the new metadata for the given model name.
@@ -46,11 +47,16 @@ public enum ValueColumnMetadata {
mapping.putIfAbsent(modelName, new ValueColumn(valueCName, dataType,
function, defaultValue, scopeId));
}
+public void overrideColumnName(String oldName, String newName) {
+columnNameOverrideRule.put(oldName, newName);
+}
+
/**
* Fetch the value column name of the given metrics name.
*/
public String getValueCName(String metricsName) {
-return findColumn(metricsName).valueCName;
+final String valueCName = findColumn(metricsName).valueCName;
+return columnNameOverrideRule.getOrDefault(valueCName, valueCName);
}
/**
@@ -88,7 +94,7 @@ public enum ValueColumnMetadata {
@Getter
@RequiredArgsConstructor
-public class ValueColumn {
+public static class ValueColumn {
private final String valueCName;
private final Column.ValueDataType dataType;
private final Function function;
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
index 2413c3e..6c9e496 100644
---
[skywalking-website] 01/01: Test ci
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit e07124c0726aced92b1e63b3b1ee9c88327344b2 Author: kezhenxu94 AuthorDate: Mon Dec 27 16:46:51 2021 +0800 Test ci --- .github/workflows/deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e652db7..bd8935f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - test/ci schedule: - cron: '0 10 * * *' # Daily build at 18:00 (+08:00)
[skywalking-website] branch test/ci created (now e07124c)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. at e07124c Test ci This branch includes the following new commits: new e07124c Test ci The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking-website] branch test/ci updated: Upgrade H2 version to 2.0.202 to fix CVE-2021-23463
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git The following commit(s) were added to refs/heads/test/ci by this push: new 4457f09 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 4457f09 is described below commit 4457f0910e808841c0c7a4f5365a63a60cad85b2 Author: kezhenxu94 AuthorDate: Mon Dec 27 16:52:31 2021 +0800 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 --- doc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc.sh b/doc.sh index 47eb3a3..e8cebab 100755 --- a/doc.sh +++ b/doc.sh @@ -2,13 +2,14 @@ set -o errexit set -x +git config --system core.longpaths true + repo=$1 repoUrl=$2 commitId=$3 localPath=$4 menuFileName=$5 - if [ ! -d "./tmp" ]; then mkdir ./tmp fi
[skywalking-website] branch test/ci updated (4457f09 -> e07124c)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 4457f09 Upgrade H2 version to 2.0.202 to fix CVE-2021-23463 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/test/ci (e07124c) \ O -- O -- O (4457f09) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: doc.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[skywalking-website] 01/01: Test ci
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 1ca4bafa4a44b1ee7d22d02c7d7cc67901d5baba Author: kezhenxu94 AuthorDate: Mon Dec 27 16:46:51 2021 +0800 Test ci --- .github/workflows/deploy.yaml | 1 + doc.sh| 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e652db7..bd8935f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - test/ci schedule: - cron: '0 10 * * *' # Daily build at 18:00 (+08:00) diff --git a/doc.sh b/doc.sh index 47eb3a3..953f8fb 100755 --- a/doc.sh +++ b/doc.sh @@ -2,13 +2,14 @@ set -o errexit set -x +git config core.longpaths true + repo=$1 repoUrl=$2 commitId=$3 localPath=$4 menuFileName=$5 - if [ ! -d "./tmp" ]; then mkdir ./tmp fi
[skywalking-website] branch test/ci updated (e07124c -> 1ca4baf)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard e07124c Test ci new 1ca4baf Test ci This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e07124c) \ N -- N -- N refs/heads/test/ci (1ca4baf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[skywalking-website] branch test/ci updated (1ca4baf -> 262360c)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 1ca4baf Test ci new 262360c Test ci This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1ca4baf) \ N -- N -- N refs/heads/test/ci (262360c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[skywalking-website] 01/01: Test ci
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 262360c0f4822e208e08d9ea7998b0b7032566a4 Author: kezhenxu94 AuthorDate: Mon Dec 27 16:46:51 2021 +0800 Test ci --- .github/workflows/deploy.yaml | 1 + doc.sh| 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e652db7..bd8935f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - test/ci schedule: - cron: '0 10 * * *' # Daily build at 18:00 (+08:00) diff --git a/doc.sh b/doc.sh index 47eb3a3..670a10e 100755 --- a/doc.sh +++ b/doc.sh @@ -2,13 +2,15 @@ set -o errexit set -x +git config --global http.postBuffer 524288000 +git config --global https.postBuffer 524288000 + repo=$1 repoUrl=$2 commitId=$3 localPath=$4 menuFileName=$5 - if [ ! -d "./tmp" ]; then mkdir ./tmp fi
[skywalking-website] branch test/ci updated (262360c -> 0cc4258)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 262360c Test ci new 0cc4258 Test ci This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (262360c) \ N -- N -- N refs/heads/test/ci (0cc4258) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[skywalking-website] 01/01: Test ci
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 0cc4258be99567dff7d5f42d0209f7a19c21b71f Author: kezhenxu94 AuthorDate: Mon Dec 27 16:46:51 2021 +0800 Test ci --- .github/workflows/deploy.yaml | 1 + doc.sh| 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e652db7..bd8935f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - test/ci schedule: - cron: '0 10 * * *' # Daily build at 18:00 (+08:00) diff --git a/doc.sh b/doc.sh index 47eb3a3..670a10e 100755 --- a/doc.sh +++ b/doc.sh @@ -2,13 +2,15 @@ set -o errexit set -x +git config --global http.postBuffer 524288000 +git config --global https.postBuffer 524288000 + repo=$1 repoUrl=$2 commitId=$3 localPath=$4 menuFileName=$5 - if [ ! -d "./tmp" ]; then mkdir ./tmp fi
[skywalking-website] branch test/ci updated (0cc4258 -> 143cb4f)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 0cc4258 Test ci new 143cb4f Test ci This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0cc4258) \ N -- N -- N refs/heads/test/ci (143cb4f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc.sh | 1 - 1 file changed, 1 deletion(-)
[skywalking-website] 01/01: Test ci
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/ci in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 143cb4f044dbd6a9a1258d07a25e36b2d6b1577a Author: kezhenxu94 AuthorDate: Mon Dec 27 16:46:51 2021 +0800 Test ci --- .github/workflows/deploy.yaml | 1 + doc.sh| 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e652db7..bd8935f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - test/ci schedule: - cron: '0 10 * * *' # Daily build at 18:00 (+08:00) diff --git a/doc.sh b/doc.sh index 47eb3a3..3ab4148 100755 --- a/doc.sh +++ b/doc.sh @@ -2,13 +2,14 @@ set -o errexit set -x +git config --global http.postBuffer 524288000 + repo=$1 repoUrl=$2 commitId=$3 localPath=$4 menuFileName=$5 - if [ ! -d "./tmp" ]; then mkdir ./tmp fi
[skywalking] branch dependencies created (now 7127354)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch dependencies in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 7127354 Bump up log4j to 2.17.1 No new revisions were added by this update.
[skywalking] branch dependencies updated (7127354 -> 58a44f8)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch dependencies in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 7127354 Bump up log4j to 2.17.1 add 58a44f8 Update known-oap-backend-dependencies.txt No new revisions were added by this update. Summary of changes: tools/dependencies/known-oap-backend-dependencies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch master updated: Sync proto buffers files from upstream Envoy (#8434)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 810d840 Sync proto buffers files from upstream Envoy (#8434)
810d840 is described below
commit 810d8400275c8d9f9763fae8a81b920962e01e9c
Author: kezhenxu94
AuthorDate: Mon Jan 17 10:51:08 2022 +0800
Sync proto buffers files from upstream Envoy (#8434)
Related https://github.com/envoyproxy/envoy/pull/18955
---
CHANGES.md| 3 ++-
.../proto/envoy/data/accesslog/v3/accesslog.proto | 19 +--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0d83362..9faad2a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,8 @@ Release Notes.
* Follow protocol grammar fix `GCPhrase -> GCPhase`.
* Set layer to mesh relation.
* Add `FAAS` to SpanLayer.
-* Support ZGC GC time and count metric collecting
+* Support ZGC GC time and count metric collecting.
+* Sync proto buffers files from upstream Envoy (Related to
https://github.com/envoyproxy/envoy/pull/18955).
UI
diff --git
a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v3/accesslog.proto
b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v3/accesslog.proto
index af7edab..a10dfb6 100644
---
a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v3/accesslog.proto
+++
b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v3/accesslog.proto
@@ -17,6 +17,7 @@ import "validate/validate.proto";
option java_package = "io.envoyproxy.envoy.data.accesslog.v3";
option java_outer_classname = "AccesslogProto";
option java_multiple_files = true;
+option go_package =
"github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3;accesslogv3";
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: gRPC access logs]
@@ -79,7 +80,7 @@ message ConnectionProperties {
}
// Defines fields that are shared by all Envoy access logs.
-// [#next-free-field: 22]
+// [#next-free-field: 23]
message AccessLogCommon {
option (udpa.annotations.versioning).previous_message_type =
"envoy.data.accesslog.v2.AccessLogCommon";
@@ -183,10 +184,15 @@ message AccessLogCommon {
// state serialized to any message other than `google.protobuf.Any` it will
be packed into
// `google.protobuf.Any`.
map filter_state_objects = 21;
+
+ // A list of custom tags, which annotate logs with additional information.
+ // To configure this value, users should configure
+ // :ref:`custom_tags
`.
+ map custom_tags = 22;
}
// Flags indicating occurrences during request/response processing.
-// [#next-free-field: 24]
+// [#next-free-field: 27]
message ResponseFlags {
option (udpa.annotations.versioning).previous_message_type =
"envoy.data.accesslog.v2.ResponseFlags";
@@ -275,6 +281,15 @@ message ResponseFlags {
// Indicates that request or connection exceeded the downstream connection
duration.
bool duration_timeout = 23;
+
+ // Indicates there was an HTTP protocol error in the upstream response.
+ bool upstream_protocol_error = 24;
+
+ // Indicates no cluster was found for the request.
+ bool no_cluster_found = 25;
+
+ // Indicates overload manager terminated the request.
+ bool overload_manager = 26;
}
// Properties of a negotiated TLS connection.
[skywalking-java] branch main updated: Remove mesos from readme (#94)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-java.git The following commit(s) were added to refs/heads/main by this push: new b7bb3f8 Remove mesos from readme (#94) b7bb3f8 is described below commit b7bb3f818b9c534b89f10ebcab51bde8cc332a6d Author: 吴晟 Wu Sheng AuthorDate: Mon Jan 17 19:19:27 2022 +0800 Remove mesos from readme (#94) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 151972f..38de6ff 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Apache SkyWalking Java Agent SkyWalking-Java: The Java Agent for Apache SkyWalking, which provides the native tracing/metrics/logging abilities for Java projects. -SkyWalking: an APM(application performance monitor) system, especially designed for microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures. +SkyWalking: an APM(application performance monitor) system, especially designed for microservices, cloud native and container-based (Docker and Kubernetes) architectures. # Documentation - [Official documentation](https://skywalking.apache.org/docs/#JavaAgent)
