(skywalking) branch revert-11464-jre-21 deleted (was 9d71555a9e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch revert-11464-jre-21 in repository https://gitbox.apache.org/repos/asf/skywalking.git was 9d71555a9e Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch groovy4 updated (7a30503576 -> edff66478f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch groovy4 in repository https://gitbox.apache.org/repos/asf/skywalking.git from 7a30503576 Fix native image CI. add 3cd149a46b Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" (#11516) add edff66478f Merge branch 'master' into groovy4 No new revisions were added by this update. Summary of changes: .github/workflows/publish-docker.yaml | 5 - docs/en/changes/changes.md| 2 -- 2 files changed, 7 deletions(-)
(skywalking) branch master updated: Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" (#11516)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 3cd149a46b Revert "Add eclipse-temurin:21-jre as a new image runtime
(#11464)" (#11516)
3cd149a46b is described below
commit 3cd149a46b69607a6eba8e2336bbb4b65ca1c804
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 23:33:21 2023 +0800
Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" (#11516)
This reverts commit 789df669b02db5725879e50e7c9d3482d0fd7343.
---
.github/workflows/publish-docker.yaml | 5 -
docs/en/changes/changes.md| 2 --
2 files changed, 7 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 1410f39555..78f6cceefd 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,10 +79,5 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
- - name: Build and push docker images based on Java 21
-env:
- SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
- TAG: ${{ env.TAG }}-java21
-run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..38c128d72f 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,8 +5,6 @@
* Add distribution/graal module to make preliminary preparations for
supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
-* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
- eclipse-temurin:21-jre are available for every commit and release.
OAP Server
(skywalking) branch groovy4 updated: Fix native image CI.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch groovy4
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/groovy4 by this push:
new 7a30503576 Fix native image CI.
7a30503576 is described below
commit 7a305035764e4af56f81333fa0f792c325d8e821
Author: Wu Sheng
AuthorDate: Wed Nov 8 22:51:31 2023 +0800
Fix native image CI.
---
.github/workflows/native-image.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/native-image.yaml
b/.github/workflows/native-image.yaml
index c0f303cd76..14e4026549 100644
--- a/.github/workflows/native-image.yaml
+++ b/.github/workflows/native-image.yaml
@@ -17,7 +17,6 @@
name: GraalVM Community Edition build
on:
pull_request:
- push:
concurrency:
group: skywalking-graalvm-${{ github.event.pull_request.number || github.ref
}}
(skywalking) branch groovy4 created (now dbfe35aa00)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch groovy4 in repository https://gitbox.apache.org/repos/asf/skywalking.git at dbfe35aa00 Update Groovy 3 to 4.0.15. This branch includes the following new commits: new dbfe35aa00 Update Groovy 3 to 4.0.15. 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: Update Groovy 3 to 4.0.15.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch groovy4
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit dbfe35aa00666eed9588e65eb3548939480a4e2a
Author: Wu Sheng
AuthorDate: Wed Nov 8 22:31:51 2023 +0800
Update Groovy 3 to 4.0.15.
---
dist-material/release-docs/LICENSE | 2 +-
docs/en/changes/changes.md | 1 +
graal/meter-analyzer-graal-native/pom.xml | 2 +-
oap-server-bom/pom.xml | 4 ++--
oap-server/analyzer/log-analyzer/pom.xml | 2 +-
oap-server/analyzer/meter-analyzer/pom.xml | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index c701cc9e5f..2f5dc1458c 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -340,6 +340,7 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.curator/curator-framework/4.3.0
Apache-2.0
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.groovy/groovy/4.0.15
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.3
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.13
Apache-2.0
@@ -351,7 +352,6 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.yetus/audience-annotations/0.5.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper/3.5.7
Apache-2.0
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper-jute/3.5.7
Apache-2.0
-https://mvnrepository.com/artifact/org.codehaus.groovy/groovy/3.0.8
Apache-2.0
https://mvnrepository.com/artifact/org.freemarker/freemarker/2.3.31
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect/1.7.10
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib/1.7.10
Apache-2.0
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..037c1a2d28 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -7,6 +7,7 @@
* Bump up netty to 4.1.100.
* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
eclipse-temurin:21-jre are available for every commit and release.
+* Update Groovy 3 to 4.0.15.
OAP Server
diff --git a/graal/meter-analyzer-graal-native/pom.xml
b/graal/meter-analyzer-graal-native/pom.xml
index 533793616a..ac83dc1e1e 100644
--- a/graal/meter-analyzer-graal-native/pom.xml
+++ b/graal/meter-analyzer-graal-native/pom.xml
@@ -44,7 +44,7 @@
${project.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 4237dde5c1..7b2975be13 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -61,7 +61,7 @@
2.3.31
3.25.0-GA
0.10.3
-3.0.8
+4.0.15
2.4.8.Final
1.9.4
1.12.0
@@ -488,7 +488,7 @@
${vavr.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
${groovy.version}
diff --git a/oap-server/analyzer/log-analyzer/pom.xml
b/oap-server/analyzer/log-analyzer/pom.xml
index abe621bbd0..cabd78e7e7 100644
--- a/oap-server/analyzer/log-analyzer/pom.xml
+++ b/oap-server/analyzer/log-analyzer/pom.xml
@@ -44,7 +44,7 @@
${project.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
diff --git a/oap-server/analyzer/meter-analyzer/pom.xml
b/oap-server/analyzer/meter-analyzer/pom.xml
index 3af6530b01..f29b8b9e9f 100644
--- a/oap-server/analyzer/meter-analyzer/pom.xml
+++ b/oap-server/analyzer/meter-analyzer/pom.xml
@@ -39,7 +39,7 @@
${project.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
(skywalking) 01/01: Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)"
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch revert-11464-jre-21
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 9d71555a9ef9f43813b855eda7d198bd64617c93
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 21:49:09 2023 +0800
Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)"
This reverts commit 789df669b02db5725879e50e7c9d3482d0fd7343.
---
.github/workflows/publish-docker.yaml | 5 -
docs/en/changes/changes.md| 2 --
2 files changed, 7 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 1410f39555..78f6cceefd 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,10 +79,5 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
- - name: Build and push docker images based on Java 21
-env:
- SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
- TAG: ${{ env.TAG }}-java21
-run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..38c128d72f 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,8 +5,6 @@
* Add distribution/graal module to make preliminary preparations for
supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
-* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
- eclipse-temurin:21-jre are available for every commit and release.
OAP Server
(skywalking) branch revert-11464-jre-21 created (now 9d71555a9e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch revert-11464-jre-21 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 9d71555a9e Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" This branch includes the following new commits: new 9d71555a9e Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" 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 jre-21-test deleted (was 01c9edef6e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git was 01c9edef6e Update Java agent version to 9.1-dev to support JRE21 container. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch jre-21-test updated: Update Java agent version to 9.1-dev to support JRE21 container.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/jre-21-test by this push: new 01c9edef6e Update Java agent version to 9.1-dev to support JRE21 container. 01c9edef6e is described below commit 01c9edef6e3868644c3bee7d37e28be042328419 Author: Wu Sheng AuthorDate: Wed Nov 8 21:12:02 2023 +0800 Update Java agent version to 9.1-dev to support JRE21 container. --- test/e2e-v2/script/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 0e82312f73..3fded11e70 100644 --- a/test/e2e-v2/script/env +++ b/test/e2e-v2/script/env @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SW_AGENT_JAVA_COMMIT=f25e6600b487a440d1104c628f235a122cc7653e +SW_AGENT_JAVA_COMMIT=2bd500b83120527a164f0131155e928894a2ba28 SW_AGENT_SATELLITE_COMMIT=ea27a3f4e126a24775fe12e2aa2695bcb23d99c3 SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa SW_AGENT_NODEJS_COMMIT=2e7560518aff846befd4d6bc815fe5e38c704a11
(skywalking-infra-e2e) branch fix/lint deleted (was 776429e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch fix/lint in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git was 776429e make linter happy The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-infra-e2e) branch main updated: make linter happy (#125)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 1485ae0 make linter happy (#125) 1485ae0 is described below commit 1485ae03f0ad90496ad7626a5ae4a6a73a1f6296 Author: Hoshea Jiang AuthorDate: Wed Nov 8 18:40:52 2023 +0800 make linter happy (#125) --- .golangci.yml | 9 ++--- Makefile | 2 +- cmd/e2e/main.go | 2 +- commands/cleanup/cleanup.go | 2 +- commands/root.go | 2 +- commands/run/run.go | 2 +- commands/trigger/trigger.go | 2 +- commands/version.go | 2 +- internal/components/trigger/http.go | 1 + internal/components/verifier/funcs.go | 2 +- internal/logger/log.go| 2 +- 11 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 91d074d..1e9901e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -36,11 +36,6 @@ linters-settings: goconst: min-len: 2 min-occurrences: 2 - depguard: -list-type: blacklist -include-go-root: true -packages-with-error-messages: - fmt: "logging is allowed only by logutils.Log" misspell: locale: US ignore-words: @@ -98,7 +93,6 @@ linters-settings: linters: enable: - deadcode -- depguard - dogsled - dupl - errcheck @@ -115,7 +109,6 @@ linters: - ineffassign - lll - misspell -- nakedret - staticcheck - stylecheck - typecheck @@ -125,6 +118,8 @@ linters: - whitespace disable: - structcheck +- depguard +- nakedret service: golangci-lint-version: 1.20.x diff --git a/Makefile b/Makefile index bf5deb6..78797b4 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ all: clean lint test build .PHONY: lint lint: - $(GO_LINT) version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin -d "v1.46.2" + $(GO_LINT) version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin -d "v1.55.2" $(GO_LINT) run -v --timeout 5m ./... .PHONY: fix-lint diff --git a/cmd/e2e/main.go b/cmd/e2e/main.go index 0422241..ee599db 100644 --- a/cmd/e2e/main.go +++ b/cmd/e2e/main.go @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// + package main import ( diff --git a/commands/cleanup/cleanup.go b/commands/cleanup/cleanup.go index 3e7079d..fdc5daa 100644 --- a/commands/cleanup/cleanup.go +++ b/commands/cleanup/cleanup.go @@ -1,4 +1,3 @@ -// // Licensed to Apache Software Foundation (ASF) under one or more contributor // license agreements. See the NOTICE file distributed with // this work for additional information regarding copyright @@ -15,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package cleanup import ( diff --git a/commands/root.go b/commands/root.go index 1fec787..31e3c8f 100644 --- a/commands/root.go +++ b/commands/root.go @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// + package commands import ( diff --git a/commands/run/run.go b/commands/run/run.go index fef97d3..a304779 100644 --- a/commands/run/run.go +++ b/commands/run/run.go @@ -1,4 +1,3 @@ -// // Licensed to Apache Software Foundation (ASF) under one or more contributor // license agreements. See the NOTICE file distributed with // this work for additional information regarding copyright @@ -15,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package run import ( diff --git a/commands/trigger/trigger.go b/commands/trigger/trigger.go index ca82261..cb49b54 100644 --- a/commands/trigger/trigger.go +++ b/commands/trigger/trigger.go @@ -1,4 +1,3 @@ -// // Licensed to Apache Software Foundation (ASF) under one or more contributor // license agreements. See the NOTICE file distributed with // this work for additional information regarding copyright @@ -15,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package trigger import ( diff --git a/commands/version.go b/commands/version.go index 0b07316..3ac0062 100644 --- a/commands/version.go +++ b/commands/version.go @@ -14,7 +14,7 @@ // KIND, either express or imp
(skywalking-java) branch wu-sheng-patch-1 deleted (was dcd821a6bd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was dcd821a6bd Update makefile for JRE21 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-java) branch main updated: Add JDK 21 image container (#646)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 2bd500b831 Add JDK 21 image container (#646)
2bd500b831 is described below
commit 2bd500b83120527a164f0131155e928894a2ba28
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 18:13:56 2023 +0800
Add JDK 21 image container (#646)
---
.github/workflows/publish-docker.yaml | 2 +-
CHANGES.md| 1 +
Makefile | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 96b90d3fd4..be696af980 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
-java-version: [ 8, 11, 17 ]
+java-version: [ 8, 11, 17, 21 ]
env:
TAG: ${{ github.sha }}
steps:
diff --git a/CHANGES.md b/CHANGES.md
index 3129731e80..0b38c88c14 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Release Notes.
* Add a netty-http 4.1.x plugin to trace HTTP requests.
* Fix Impala Jdbc URL (including schema without properties) parsing exception.
* Optimize byte-buddy type description performance.
+* Add `eclipse-temurin:21-jre` as another base image.
Documentation
diff --git a/Makefile b/Makefile
index c7e4eb8c3a..4e7e9ca834 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,14 @@ dist: build
# Docker build
-base.all := alpine java8 java11 java17
+base.all := alpine java8 java11 java17 java21
base.each = $(word 1, $@)
base.image.alpine := alpine:3
base.image.java8 := eclipse-temurin:8-jre
base.image.java11 := eclipse-temurin:11-jre
base.image.java17 := eclipse-temurin:17-jre
+base.image.java21 := eclipse-temurin:21-jre
docker.%: PLATFORMS =
docker.%: LOAD_OR_PUSH = --load
(skywalking-java) branch wu-sheng-patch-1 updated (6446218d49 -> dcd821a6bd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 6446218d49 Add JDK 21 image container add dcd821a6bd Update makefile for JRE21 No new revisions were added by this update. Summary of changes: CHANGES.md | 1 + Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
(skywalking-java) 01/01: Add JDK 21 image container
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 6446218d49e69009d8369511b12012f570c688b1
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 17:24:48 2023 +0800
Add JDK 21 image container
---
.github/workflows/publish-docker.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 96b90d3fd4..be696af980 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
-java-version: [ 8, 11, 17 ]
+java-version: [ 8, 11, 17, 21 ]
env:
TAG: ${{ github.sha }}
steps:
(skywalking-java) branch wu-sheng-patch-1 created (now 6446218d49)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at 6446218d49 Add JDK 21 image container This branch includes the following new commits: new 6446218d49 Add JDK 21 image container 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 jre-21-test updated: Upgrade lombok to 1.18.30 for JDK 21 compiling.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/jre-21-test by this push: new a2a5bc727c Upgrade lombok to 1.18.30 for JDK 21 compiling. a2a5bc727c is described below commit a2a5bc727c68e2775d78e1201bc3ba441529473f Author: Wu Sheng AuthorDate: Wed Nov 8 16:46:01 2023 +0800 Upgrade lombok to 1.18.30 for JDK 21 compiling. --- pom.xml | 2 +- test/e2e-v2/java-test-service/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68a10e3780..ac4ad683c6 100755 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 6.18 5.9.2 4.11.0 -1.18.22 +1.18.30 1.53.0 diff --git a/test/e2e-v2/java-test-service/pom.xml b/test/e2e-v2/java-test-service/pom.xml index 9dd474d288..f72b6ce372 100644 --- a/test/e2e-v2/java-test-service/pom.xml +++ b/test/e2e-v2/java-test-service/pom.xml @@ -51,7 +51,7 @@ 30.1.1-jre 2.1.210 8.0.13 -1.18.22 +1.18.30 2.4.1 2.22.0
(skywalking) 01/01: Add eclipse-temurin:21-jre as OAP runtime tests with the Java agent in JRE21 verification cases.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 252a0f63a8751ef84ee9357eb83fac9b01c7b589 Author: Wu Sheng AuthorDate: Wed Nov 8 16:13:21 2023 +0800 Add eclipse-temurin:21-jre as OAP runtime tests with the Java agent in JRE21 verification cases. --- .github/workflows/skywalking.yaml | 4 ++-- docs/en/changes/changes.md| 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 96b3a0736b..eed4b8f69c 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -196,7 +196,7 @@ jobs: timeout-minutes: 30 strategy: matrix: -java-version: [11, 17] +java-version: [11, 17, 21] steps: - uses: actions/checkout@v3 with: @@ -787,7 +787,7 @@ jobs: strategy: fail-fast: false matrix: -java-version: [11, 17] +java-version: [11, 17, 21] steps: - uses: actions/checkout@v3 with: diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index a18840d059..755b16301a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -7,6 +7,7 @@ * Bump up netty to 4.1.100. * Add eclipse-temurin:21-jre as a new image runtime. Now, eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre eclipse-temurin:21-jre are available for every commit and release. +* Add eclipse-temurin:21-jre as OAP runtime tests with the Java agent in JRE21 verification cases. OAP Server
(skywalking) branch jre-21-test created (now 252a0f63a8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git at 252a0f63a8 Add eclipse-temurin:21-jre as OAP runtime tests with the Java agent in JRE21 verification cases. This branch includes the following new commits: new 252a0f63a8 Add eclipse-temurin:21-jre as OAP runtime tests with the Java agent in JRE21 verification cases. 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: Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC related storage (#11511)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 7b01a4ab91 Fix cannot query zipkin traces with `annotationQuery`
parameter in the JDBC related storage (#11511)
7b01a4ab91 is described below
commit 7b01a4ab91eb91f4f7786928d831207a71393ad6
Author: mrproliu <741550...@qq.com>
AuthorDate: Wed Nov 8 15:06:49 2023 +0800
Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC
related storage (#11511)
---
docs/en/changes/changes.md | 1 +
.../oap/server/storage/plugin/jdbc/common/dao/JDBCZipkinQueryDAO.java | 2 +-
test/e2e-v2/cases/zipkin/zipkin-cases.yaml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index f456a302ea..a18840d059 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -37,6 +37,7 @@
* Correct the file format and fix typos in the filenames for monitoring
Kafka's e2e tests.
* Support extract timestamp from patterned datetime string in LAL.
* Support output key parameters in the booting logs.
+* Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC
related storage.
UI
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCZipkinQueryDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCZipkinQueryDAO.java
index b5a4a1a143..bfead65fc7 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCZipkinQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCZipkinQueryDAO.java
@@ -253,7 +253,7 @@ public class JDBCZipkinQueryDAO implements IZipkinQueryDAO {
}
}
}
-sql.append(" group by ").append(ZipkinSpanRecord.TRACE_ID);
+sql.append(" group by
").append(table).append(".").append(ZipkinSpanRecord.TRACE_ID);
sql.append(" order by
min(").append(ZipkinSpanRecord.TIMESTAMP_MILLIS).append(") desc");
sql.append(" limit ").append(request.limit());
h2Client.executeQuery(sql.toString(), resultSet -> {
diff --git a/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
b/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
index d3b8b0a4de..995c7e2b3a 100644
--- a/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
+++ b/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
@@ -24,7 +24,7 @@ cases:
- query: curl
http://${oap_host}:${oap_9412}/zipkin/api/v2/spans?serviceName=frontend
expected: expected/span-name.yml
# traces
- - query: curl
http://${oap_host}:${oap_9412}/zipkin/api/v2/traces?serviceName=frontend&remoteServiceName=backend&spanName=get&limit=1
+ - query: curl
http://${oap_host}:${oap_9412}/zipkin/api/v2/traces?serviceName=frontend&remoteServiceName=backend&spanName=get&annotationQuery=wr&limit=1
expected: expected/traces.yml
# autocomplete
- query: curl
http://${oap_host}:${oap_9412}/zipkin/api/v2/autocompleteValues?key=http.method
(skywalking-swck) branch master updated: bump up the ingress apiVersion from networking.k8s.io/v1beta1 to networking.k8s.io/v1 for oapserver manifest (#101)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git
The following commit(s) were added to refs/heads/master by this push:
new 9088389 bump up the ingress apiVersion from networking.k8s.io/v1beta1
to networking.k8s.io/v1 for oapserver manifest (#101)
9088389 is described below
commit 9088389a2117ba392bd3940b70a10e3da9121038
Author: zhuhao <37029601+hwzhu...@users.noreply.github.com>
AuthorDate: Tue Nov 7 16:45:16 2023 +0800
bump up the ingress apiVersion from networking.k8s.io/v1beta1 to
networking.k8s.io/v1 for oapserver manifest (#101)
---
operator/pkg/operator/manifests/oapserver/templates/ingress.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/operator/pkg/operator/manifests/oapserver/templates/ingress.yaml
b/operator/pkg/operator/manifests/oapserver/templates/ingress.yaml
index 948f197..b21b4a8 100644
--- a/operator/pkg/operator/manifests/oapserver/templates/ingress.yaml
+++ b/operator/pkg/operator/manifests/oapserver/templates/ingress.yaml
@@ -17,7 +17,7 @@
{{- $ingress := .Spec.Service.Ingress }}
{{ if $ingress.Host }}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Name }}-ui
(skywalking) branch booting-log deleted (was ae4256c536)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch booting-log in repository https://gitbox.apache.org/repos/asf/skywalking.git was ae4256c536 Fix tests. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Support output key parameters in the booting logs. (#11506)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 f8c6855814 Support output key parameters in the booting logs. (#11506) f8c6855814 is described below commit f8c68558147793b49fa4bd22ba78df84ccce3249 Author: 吴晟 Wu Sheng AuthorDate: Mon Nov 6 23:57:58 2023 +0800 Support output key parameters in the booting logs. (#11506) --- docs/en/changes/changes.md | 3 + docs/en/setup/backend/backend-cluster.md | 39 ++--- docs/en/setup/backend/backend-setup.md | 67 +--- ...ClusterModuleZookeeperProviderFunctionalIT.java | 11 ++- .../apollo/ApolloConfigurationIT.java | 2 +- .../consul/ConsulConfigurationIT.java | 2 +- .../configuration/etcd/EtcdConfigurationIT.java| 2 +- .../configuration/nacos/NacosConfigurationIT.java | 2 +- .../zookeeper/it/ZookeeperConfigurationIT.java | 2 +- .../oap/server/core/CoreModuleProvider.java| 9 +++ .../oap/server/core/MockModuleManager.java | 1 + .../agent/kafka/mock/MockModuleManager.java| 1 + .../library/module/ApplicationConfiguration.java | 2 +- .../oap/server/library/module/ModuleDefine.java| 8 +- .../oap/server/library/module/ModuleManager.java | 21 - .../oap/server/library/module/ModuleProvider.java | 13 ++- .../library/module/TerminalFriendlyTable.java | 93 ++ .../server/library/module/ModuleManagerTest.java | 8 +- .../OpenTelemetryMetricRequestProcessorTest.java | 2 +- .../server/SharingServerModuleProvider.java| 5 ++ .../receiver/telegraf/mock/MockModuleManager.java | 1 + .../oap/server/starter/OAPServerBootstrap.java | 17 +++- .../starter/config/ApplicationConfigLoader.java| 10 ++- .../config/ApplicationConfigLoaderTestCase.java| 3 +- .../testing/module/mock/MockModuleManager.java | 3 +- .../exporter/ProfileSnapshotExporterBootstrap.java | 8 +- 26 files changed, 280 insertions(+), 55 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 5d3f9de339..f456a302ea 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -36,6 +36,7 @@ * Support GraalVM native-image (Experimental). * Correct the file format and fix typos in the filenames for monitoring Kafka's e2e tests. * Support extract timestamp from patterned datetime string in LAL. +* Support output key parameters in the booting logs. UI @@ -60,5 +61,7 @@ * Add missing metrics to the `OpenTelemetry Metrics` doc. * Polish docs of `Concepts and Designs`. * Fix incorrect notes of slowCacheReadThreshold. +* Update OAP setup and cluster coordinator docs to explain new booting parameters table in the logs, and how to setup + cluster mode. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/193?closed=1) diff --git a/docs/en/setup/backend/backend-cluster.md b/docs/en/setup/backend/backend-cluster.md index a22f2c393b..ed8528f915 100644 --- a/docs/en/setup/backend/backend-cluster.md +++ b/docs/en/setup/backend/backend-cluster.md @@ -25,6 +25,7 @@ There are various ways to manage the cluster in the backend. Choose the one that In the `application.yml` file, there are default configurations for the aforementioned coordinators under the section `cluster`. You can specify any of them in the `selector` property to enable it. +# Cloud Native ## Kubernetes The required backend clusters are deployed inside Kubernetes. See the guides in [Deploy in kubernetes](backend-k8s.md). @@ -54,6 +55,20 @@ containers: Read [the complete helm](https://github.com/apache/skywalking-helm/blob/476afd51d44589c77a4cbaac950272cd5d064ea9/chart/skywalking/templates/oap-deployment.yaml#L125) for more details. +# Traditional Coordinator + +**NOTICE** +In all the following coordinators, `oap.internal.comm.host`:`oap.internal.comm.port` is registered as the ID +and address for the current OAP node. By default, because they are same in all OAP nodes, the registrations are conflicted, +and (may) show as one registered node, which actually would be the node itself. **In this case, the cluster mode is NOT working.** + +Please check the registered nodes on your coordinator servers, to make the registration information unique for every node. +You could have two options + +1. Change `core/gRPCHost`(`oap.internal.comm.host`) and `core/gRPCPort`(`oap.internal.comm.port`) for internal, + and [setup external communication channels](backend-expose.md) for data reporting and query. +2. Use `internalComHost` and `internalComPort` in the config to provide a unique host and port for every OAP node. This + host name port should be accessible for other OAP nodes. ## Zookeeper coordinator @@ -85,11 +1
(skywalking-website) branch master updated: Add the demo-ui image for the getting-started doc of SWCK. (#655)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 2eccf0a86d3 Add the demo-ui image for the getting-started doc of SWCK. (#655) 2eccf0a86d3 is described below commit 2eccf0a86d3defdb90722019c9d70aeab44273e1 Author: Ye Cao AuthorDate: Mon Nov 6 23:30:39 2023 +0800 Add the demo-ui image for the getting-started doc of SWCK. (#655) --- static/doc-graph/swck/demo-ui.png | Bin 0 -> 51668 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/static/doc-graph/swck/demo-ui.png b/static/doc-graph/swck/demo-ui.png new file mode 100644 index 000..bee84400e48 Binary files /dev/null and b/static/doc-graph/swck/demo-ui.png differ
(skywalking) branch booting-log updated: Fix tests.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch booting-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/booting-log by this push:
new ae4256c536 Fix tests.
ae4256c536 is described below
commit ae4256c536853cd9d2c09a92e8be92ac0bb29452
Author: Wu Sheng
AuthorDate: Mon Nov 6 23:00:15 2023 +0800
Fix tests.
---
.../zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java | 11 +--
.../server/configuration/apollo/ApolloConfigurationIT.java| 2 +-
.../server/configuration/consul/ConsulConfigurationIT.java| 2 +-
.../oap/server/configuration/etcd/EtcdConfigurationIT.java| 2 +-
.../oap/server/configuration/nacos/NacosConfigurationIT.java | 2 +-
.../configuration/zookeeper/it/ZookeeperConfigurationIT.java | 2 +-
.../server/analyzer/agent/kafka/mock/MockModuleManager.java | 1 +
.../skywalking/oap/server/library/module/ModuleProvider.java | 2 +-
.../otel/otlp/OpenTelemetryMetricRequestProcessorTest.java| 2 +-
.../oap/server/receiver/telegraf/mock/MockModuleManager.java | 1 +
.../profile/exporter/ProfileSnapshotExporterBootstrap.java| 2 +-
11 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
index 9270eb1f01..171f125aa5 100644
---
a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
+++
b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
@@ -18,6 +18,9 @@
package org.apache.skywalking.oap.server.cluster.plugin.zookeeper;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import lombok.Getter;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.skywalking.oap.server.core.cluster.ClusterCoordinator;
@@ -45,10 +48,6 @@ import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -73,7 +72,7 @@ public class ClusterModuleZookeeperProviderFunctionalIT {
@BeforeEach
public void init() {
Mockito.when(telemetryProvider.getService(MetricsCreator.class))
-.thenReturn(new MetricsCreatorNoop());
+ .thenReturn(new MetricsCreatorNoop());
TelemetryModule telemetryModule = Mockito.spy(TelemetryModule.class);
Whitebox.setInternalState(telemetryModule, "loadedProvider",
telemetryProvider);
Mockito.when(moduleManager.find(TelemetryModule.NAME)).thenReturn(telemetryModule);
@@ -229,7 +228,7 @@ public class ClusterModuleZookeeperProviderFunctionalIT {
}
private ClusterModuleZookeeperProvider createProvider(String namespace,
String internalComHost,
-int internalComPort) throws Exception {
+ int internalComPort)
throws Exception {
ClusterModuleZookeeperProvider provider = new
ClusterModuleZookeeperProvider();
provider.setManager(moduleManager);
ClusterModuleZookeeperConfig moduleConfig = new
ClusterModuleZookeeperConfig();
diff --git
a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
index fabc664109..286f7115a9 100644
---
a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
+++
b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
@@ -95,7 +95,7 @@ public class ApolloConfigurationIT {
final ApplicationConfiguration applicationConfiguration = new
ApplicationConfiguration();
loadConfig(applicationConfiguration);
-final ModuleManager moduleManager = new ModuleManager();
+final ModuleManager moduleManager = new ModuleMan
(skywalking) branch booting-log updated (3281863f02 -> 679c86d3ad)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch booting-log in repository https://gitbox.apache.org/repos/asf/skywalking.git from 3281863f02 Fix default logs. add 679c86d3ad Fix styles and tests. No new revisions were added by this update. Summary of changes: .../org/apache/skywalking/oap/server/core/MockModuleManager.java | 1 + .../apache/skywalking/oap/server/library/module/ModuleDefine.java | 1 - .../skywalking/oap/server/library/module/ModuleManagerTest.java | 8 3 files changed, 5 insertions(+), 5 deletions(-)
(skywalking) branch booting-log updated: Fix default logs.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch booting-log in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/booting-log by this push: new 3281863f02 Fix default logs. 3281863f02 is described below commit 3281863f02e9d30ac1a92655c86e5ebf887852f6 Author: Wu Sheng AuthorDate: Mon Nov 6 21:59:42 2023 +0800 Fix default logs. --- docs/en/setup/backend/backend-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/setup/backend/backend-setup.md b/docs/en/setup/backend/backend-setup.md index cb1d40ca55..da53b704fd 100755 --- a/docs/en/setup/backend/backend-setup.md +++ b/docs/en/setup/backend/backend-setup.md @@ -86,7 +86,7 @@ module.telemetry.provider | none oap.external.grpc.host | 0.0.0.0 oap.external.grpc.port | 11800 oap.external.http.host | 0.0.0.0 -oap.external.http.port | 7788 +oap.external.http.port | 12800 oap.internal.comm.host | 0.0.0.0 oap.internal.comm.port | 11800 ```
(skywalking) 01/02: Support output key parameters in the booting logs.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch booting-log in repository https://gitbox.apache.org/repos/asf/skywalking.git commit e0c5aa0a7d9d0122024ecbe895eb49c1f998dda3 Author: Wu Sheng AuthorDate: Mon Nov 6 21:50:46 2023 +0800 Support output key parameters in the booting logs. --- docs/en/changes/changes.md | 3 + docs/en/setup/backend/backend-cluster.md | 39 ++--- docs/en/setup/backend/backend-setup.md | 67 +--- .../oap/server/core/CoreModuleProvider.java| 9 +++ .../library/module/ApplicationConfiguration.java | 2 +- .../oap/server/library/module/ModuleDefine.java| 9 ++- .../oap/server/library/module/ModuleManager.java | 21 - .../oap/server/library/module/ModuleProvider.java | 15 +++- .../library/module/TerminalFriendlyTable.java | 93 ++ .../server/SharingServerModuleProvider.java| 5 ++ .../oap/server/starter/OAPServerBootstrap.java | 17 +++- .../starter/config/ApplicationConfigLoader.java| 10 ++- .../config/ApplicationConfigLoaderTestCase.java| 3 +- .../testing/module/mock/MockModuleManager.java | 3 +- .../exporter/ProfileSnapshotExporterBootstrap.java | 6 +- 15 files changed, 263 insertions(+), 39 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 893f5f4ae8..fa016a72b0 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -36,6 +36,7 @@ * Support GraalVM native-image (Experimental). * Correct the file format and fix typos in the filenames for monitoring Kafka's e2e tests. * Support extract timestamp from patterned datetime string in LAL. +* Support output key parameters in the booting logs. UI @@ -59,5 +60,7 @@ * Add topology configuration in UI-Grafana doc. * Add missing metrics to the `OpenTelemetry Metrics` doc. * Polish docs of `Concepts and Designs`. +* Update OAP setup and cluster coordinator docs to explain new booting parameters table in the logs, and how to setup + cluster mode. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/193?closed=1) diff --git a/docs/en/setup/backend/backend-cluster.md b/docs/en/setup/backend/backend-cluster.md index a22f2c393b..ed8528f915 100644 --- a/docs/en/setup/backend/backend-cluster.md +++ b/docs/en/setup/backend/backend-cluster.md @@ -25,6 +25,7 @@ There are various ways to manage the cluster in the backend. Choose the one that In the `application.yml` file, there are default configurations for the aforementioned coordinators under the section `cluster`. You can specify any of them in the `selector` property to enable it. +# Cloud Native ## Kubernetes The required backend clusters are deployed inside Kubernetes. See the guides in [Deploy in kubernetes](backend-k8s.md). @@ -54,6 +55,20 @@ containers: Read [the complete helm](https://github.com/apache/skywalking-helm/blob/476afd51d44589c77a4cbaac950272cd5d064ea9/chart/skywalking/templates/oap-deployment.yaml#L125) for more details. +# Traditional Coordinator + +**NOTICE** +In all the following coordinators, `oap.internal.comm.host`:`oap.internal.comm.port` is registered as the ID +and address for the current OAP node. By default, because they are same in all OAP nodes, the registrations are conflicted, +and (may) show as one registered node, which actually would be the node itself. **In this case, the cluster mode is NOT working.** + +Please check the registered nodes on your coordinator servers, to make the registration information unique for every node. +You could have two options + +1. Change `core/gRPCHost`(`oap.internal.comm.host`) and `core/gRPCPort`(`oap.internal.comm.port`) for internal, + and [setup external communication channels](backend-expose.md) for data reporting and query. +2. Use `internalComHost` and `internalComPort` in the config to provide a unique host and port for every OAP node. This + host name port should be accessible for other OAP nodes. ## Zookeeper coordinator @@ -85,11 +100,11 @@ Note: - If you set `schema` as `digest`, the password of the expression is set in **clear text**. In some cases, the OAP default gRPC host and port in the core are not suitable for internal communication among the OAP -nodes. +nodes, such as the default host(`0.0.0.0`) should not be used in cluster mode. The following settings are provided to set the host and port manually, based on your own LAN env. -- internalComHost: The registered host and other OAP nodes use this to communicate with the current node. -- internalComPort: the registered port and other OAP nodes use this to communicate with the current node. +- internalComHost: The exposed host name for other OAP nodes in the cluster internal communication. +- internalComPort: the exposed port for other OAP nodes in the cluster internal communication. ``
(skywalking) branch booting-log created (now 8073679cd5)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch booting-log in repository https://gitbox.apache.org/repos/asf/skywalking.git at 8073679cd5 Merge commit 'a34a0b71afc8fe2e17fe8c5291a6ec9dc7bb8e24' into booting-log This branch includes the following new commits: new e0c5aa0a7d Support output key parameters in the booting logs. new 8073679cd5 Merge commit 'a34a0b71afc8fe2e17fe8c5291a6ec9dc7bb8e24' into booting-log The 2 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) 02/02: Merge commit 'a34a0b71afc8fe2e17fe8c5291a6ec9dc7bb8e24' into booting-log
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch booting-log in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 8073679cd589d974654974c04cf40ba05eb8709b Merge: e0c5aa0a7d a34a0b71af Author: Wu Sheng AuthorDate: Mon Nov 6 21:51:18 2023 +0800 Merge commit 'a34a0b71afc8fe2e17fe8c5291a6ec9dc7bb8e24' into booting-log # Conflicts: # docs/en/changes/changes.md docs/en/changes/changes.md| 1 + graal/graal-server-starter/src/main/resources/application.yml | 2 +- oap-server/server-starter/src/main/resources/application.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --cc docs/en/changes/changes.md index fa016a72b0,5d3f9de339..f456a302ea --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@@ -60,7 -59,6 +60,8 @@@ * Add topology configuration in UI-Grafana doc. * Add missing metrics to the `OpenTelemetry Metrics` doc. * Polish docs of `Concepts and Designs`. + * Fix incorrect notes of slowCacheReadThreshold. +* Update OAP setup and cluster coordinator docs to explain new booting parameters table in the logs, and how to setup + cluster mode. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/193?closed=1)
(skywalking-website) branch master updated: add a user, bthhotels.com (#654)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 7f5637e342f add a user, bthhotels.com (#654) 7f5637e342f is described below commit 7f5637e342fb018d736e7a413f0bd1b17125a6ec Author: LemonPuffLee <149987444+lemonpuff...@users.noreply.github.com> AuthorDate: Mon Nov 6 11:44:10 2023 +0800 add a user, bthhotels.com (#654) --- data/users.yml | 5 + static/images/users/bthhotels_logo.png | Bin 0 -> 7183 bytes 2 files changed, 5 insertions(+) diff --git a/data/users.yml b/data/users.yml index c1fba9e9e11..6c519469c80 100644 --- a/data/users.yml +++ b/data/users.yml @@ -743,3 +743,8 @@ users: info: zuzuche.com 租租车 website: https://www.zuzuche.com/ logo: /images/users/zuzuche_logo.png + + - name: bthhotels +info: bthhotels.com 首旅如家 +website: https://www.bthhotels.com/ +logo: /images/users/bthhotels_logo.png diff --git a/static/images/users/bthhotels_logo.png b/static/images/users/bthhotels_logo.png new file mode 100644 index 000..1a9fe04d313 Binary files /dev/null and b/static/images/users/bthhotels_logo.png differ
(skywalking-banyandb) branch main updated: fix: some links are broken in the doc (#350)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new 4e92c429 fix: some links are broken in the doc (#350)
4e92c429 is described below
commit 4e92c42997ee64e449bb86fd8478420eff20772b
Author: Rick <1450685+linuxsu...@users.noreply.github.com>
AuthorDate: Sun Nov 5 15:20:05 2023 +0800
fix: some links are broken in the doc (#350)
---
.dlc.json| 25 +++
.github/workflows/dead-link-checker.yaml | 41
docs/concept/persistence-storage.md | 2 +-
docs/crud/group.md | 4 ++--
docs/crud/index_rule.md | 4 ++--
docs/crud/index_rule_binding.md | 4 ++--
docs/crud/property.md| 4 ++--
7 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/.dlc.json b/.dlc.json
new file mode 100644
index ..4869ba03
--- /dev/null
+++ b/.dlc.json
@@ -0,0 +1,25 @@
+{
+"ignorePatterns": [
+ {
+"pattern": "^http://localhost";
+ },
+ {
+"pattern":
"^https://dist.apache.org/repos/dist/dev/skywalking/banyandb/\\$VERSION";
+ },
+ {
+"pattern": "^https://twitter.com*";
+ },
+ {
+"pattern": "^#"
+ }
+],
+"timeout": "10s",
+"retryOn429": true,
+"retryCount": 10,
+"fallbackRetryDelay": "1000s",
+"aliveStatusCodes": [
+ 200,
+ 401,
+ 403
+]
+}
diff --git a/.github/workflows/dead-link-checker.yaml
b/.github/workflows/dead-link-checker.yaml
new file mode 100644
index ..8103bc34
--- /dev/null
+++ b/.github/workflows/dead-link-checker.yaml
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Dead Link Checker
+
+on:
+ pull_request:
+paths:
+- 'docs/**'
+ schedule:
+- cron: '0 18 * * *' # TimeZone: UTC 0
+
+concurrency:
+ group: dlc-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ CheckDeadLinks:
+if: (github.event_name == 'schedule' && github.repository ==
'apache/skywalking-banyandb') || (github.event_name != 'schedule')
+runs-on: ubuntu-latest
+timeout-minutes: 30
+steps:
+ - uses: actions/checkout@v3
+ - run: sudo npm install -g markdown-link-check@3.10.0
+ - run: |
+ for file in $(find . -name "*.md"); do
+markdown-link-check -c .dlc.json -q "$file"
+ done
diff --git a/docs/concept/persistence-storage.md
b/docs/concept/persistence-storage.md
index 190fa42d..48199985 100644
--- a/docs/concept/persistence-storage.md
+++ b/docs/concept/persistence-storage.md
@@ -20,7 +20,7 @@ Persistence storage offers a range of IO modes to cater to
various throughput re
## Io_uring
Io_uring is a new feature in Linux 5.1, which is fully asynchronous and offers
high throughput. In the scene of massive storage, io_uring can bring
significant benefits. The following is the diagram about how io_uring works.
-
+
If the user sets io_uring for use, the read and write requests will first be
placed in the submission queue buffer when calling the operation API. When the
threshold is reached, batch submissions will be made to SQ. After the kernel
threads complete execution, the requests will be placed in the CQ, and the user
can obtain the request results.
## Synchronous IO
diff --git a/docs/crud/group.md b/docs/crud/group.md
index 237fc170..7833670c 100644
--- a/docs/crud/group.md
+++ b/docs/crud/group.md
@@ -4,7 +4,7 @@ CRUD operations create, read, update and delete groups.
The group represents a collection of a class of resources. Each resource has a
na
(skywalking) branch master updated: Fix incorrect notes of slowCacheReadThreshold. (#11499)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 a34a0b71af Fix incorrect notes of slowCacheReadThreshold. (#11499)
a34a0b71af is described below
commit a34a0b71afc8fe2e17fe8c5291a6ec9dc7bb8e24
Author: peachisai <96932958+peachi...@users.noreply.github.com>
AuthorDate: Sat Nov 4 22:01:11 2023 +0800
Fix incorrect notes of slowCacheReadThreshold. (#11499)
---
docs/en/changes/changes.md| 1 +
graal/graal-server-starter/src/main/resources/application.yml | 2 +-
oap-server/server-starter/src/main/resources/application.yml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 893f5f4ae8..5d3f9de339 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -59,5 +59,6 @@
* Add topology configuration in UI-Grafana doc.
* Add missing metrics to the `OpenTelemetry Metrics` doc.
* Polish docs of `Concepts and Designs`.
+* Fix incorrect notes of slowCacheReadThreshold.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/193?closed=1)
diff --git a/graal/graal-server-starter/src/main/resources/application.yml
b/graal/graal-server-starter/src/main/resources/application.yml
index ab6557fa6e..b6891d7235 100644
--- a/graal/graal-server-starter/src/main/resources/application.yml
+++ b/graal/graal-server-starter/src/main/resources/application.yml
@@ -240,7 +240,7 @@ agent-analyzer:
# Exit spans with the component in the list would not generate the
client-side instance relation metrics.
noUpstreamRealAddressAgents: ${SW_NO_UPSTREAM_REAL_ADDRESS:6000,9000}
meterAnalyzerActiveFiles:
${SW_METER_ANALYZER_ACTIVE_FILES:datasource,threadpool,satellite,go-runtime,python-runtime,continuous-profiling}
# Which files could be meter analyzed, files split by ","
-slowCacheReadThreshold:
${SW_SLOW_CACHE_SLOW_READ_THRESHOLD:default:20,redis:10} # The slow cache write
operation thresholds. Unit ms.
+slowCacheReadThreshold:
${SW_SLOW_CACHE_SLOW_READ_THRESHOLD:default:20,redis:10} # The slow cache read
operation thresholds. Unit ms.
slowCacheWriteThreshold:
${SW_SLOW_CACHE_SLOW_WRITE_THRESHOLD:default:20,redis:10} # The slow cache
write operation thresholds. Unit ms.
log-analyzer:
diff --git a/oap-server/server-starter/src/main/resources/application.yml
b/oap-server/server-starter/src/main/resources/application.yml
index db24ed625c..4dcf16e28e 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -239,7 +239,7 @@ agent-analyzer:
# Exit spans with the component in the list would not generate the
client-side instance relation metrics.
noUpstreamRealAddressAgents: ${SW_NO_UPSTREAM_REAL_ADDRESS:6000,9000}
meterAnalyzerActiveFiles:
${SW_METER_ANALYZER_ACTIVE_FILES:datasource,threadpool,satellite,go-runtime,python-runtime,continuous-profiling}
# Which files could be meter analyzed, files split by ","
-slowCacheReadThreshold:
${SW_SLOW_CACHE_SLOW_READ_THRESHOLD:default:20,redis:10} # The slow cache write
operation thresholds. Unit ms.
+slowCacheReadThreshold:
${SW_SLOW_CACHE_SLOW_READ_THRESHOLD:default:20,redis:10} # The slow cache read
operation thresholds. Unit ms.
slowCacheWriteThreshold:
${SW_SLOW_CACHE_SLOW_WRITE_THRESHOLD:default:20,redis:10} # The slow cache
write operation thresholds. Unit ms.
log-analyzer:
(skywalking-python) branch master updated: Add support printing TID to logs (#323)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 bea712c Add support printing TID to logs (#323)
bea712c is described below
commit bea712c7a87583432764ec5e176bca49b9595bb3
Author: Starry
AuthorDate: Sat Nov 4 11:29:01 2023 +0800
Add support printing TID to logs (#323)
---
CHANGELOG.md | 1 +
docs/en/setup/advanced/LogReporter.md | 8 +++-
skywalking/agent/__init__.py | 2 --
skywalking/log/sw_logging.py | 3 +++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 849e94e..c775273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Feature:
- Users now can specify the `SW_AGENT_ASYNCIO_ENHANCEMENT` environment
variable to enable the performance enhancement with asyncio (#316)
+ - Support printing Trace IDs (TID) to collected application logs (#323)
- Plugins:
- Add neo4j plugin.(#312)
diff --git a/docs/en/setup/advanced/LogReporter.md
b/docs/en/setup/advanced/LogReporter.md
index c1982d9..e08e65f 100644
--- a/docs/en/setup/advanced/LogReporter.md
+++ b/docs/en/setup/advanced/LogReporter.md
@@ -103,4 +103,10 @@ Will result in:
}
]
}
-```
\ No newline at end of file
+```
+
+## Print trace ID in your logs
+To print out the trace IDs in the logs, simply add `%(tid)s` to the
`agent_log_reporter_layout`.
+
+You can take advantage of this feature to print out the trace IDs on any
channel you desire, not limited to reporting logs to OAP,
+this can be achieved by using any formatter you prefer in your own application
logic.
\ No newline at end of file
diff --git a/skywalking/agent/__init__.py b/skywalking/agent/__init__.py
index fc7f9e7..9ee4d92 100644
--- a/skywalking/agent/__init__.py
+++ b/skywalking/agent/__init__.py
@@ -268,7 +268,6 @@ class SkyWalkingAgent(Singleton):
logger.info(f'SkyWalking sync agent instance
{config.agent_instance_name} starting in pid-{os.getpid()}.')
# Install log reporter core
-# TODO - Add support for printing traceID/ context in logs
if config.agent_log_reporter_active:
from skywalking import log
log.install()
@@ -502,7 +501,6 @@ class SkyWalkingAgentAsync(Singleton):
self._finished = asyncio.Event()
# Install log reporter core
-# TODO - Add support for printing traceID/ context in logs
if config.agent_log_reporter_active:
from skywalking import log
log.install()
diff --git a/skywalking/log/sw_logging.py b/skywalking/log/sw_logging.py
index 801befe..e192368 100644
--- a/skywalking/log/sw_logging.py
+++ b/skywalking/log/sw_logging.py
@@ -75,6 +75,9 @@ def install():
context = get_context()
+if '%(tid)s' in layout:
+record.tid = str(context.segment.related_traces[0])
+
active_span_id = -1
primary_endpoint_name = ''
(skywalking-website) branch master updated: Add blog: collect and analyse nginx access log by LAL. (#652)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 0180c702e74 Add blog: collect and analyse nginx access log by LAL.
(#652)
0180c702e74 is described below
commit 0180c702e7468694eee3979252ae4abcbdbdba24
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Fri Nov 3 16:05:19 2023 +0800
Add blog: collect and analyse nginx access log by LAL. (#652)
---
.../index.md | 157 +
.../nginx-log.jpg | Bin 0 -> 152586 bytes
.../nginx-metric.jpg | Bin 0 -> 93189 bytes
3 files changed, 157 insertions(+)
diff --git
a/content/zh/2023-10-29-collect-and-analyse-nginx-accesslog-by-lal/index.md
b/content/zh/2023-10-29-collect-and-analyse-nginx-accesslog-by-lal/index.md
new file mode 100644
index 000..0fc6900eb7a
--- /dev/null
+++ b/content/zh/2023-10-29-collect-and-analyse-nginx-accesslog-by-lal/index.md
@@ -0,0 +1,157 @@
+---
+title: "使用 LAL 收集并分析 Nginx access log"
+author: "魏翔"
+date: 2023-10-29
+description: "本篇文章演示如何将 Nginx access log 收集到 SkyWalking 中，并通过 LAL 进行指标分析"
+tags:
+- LAL
+- Logging
+- Nginx
+---
+
+## 背景介绍
+Nginx access log 中包含了丰富的信息，例如：日志时间、状态码、响应时间、body 大小等。通过收集并分析 access
log，我们可以实现对 Nginx 中接口状态的监控。
+
+在本案例中，将由 [fluent-bit](https://fluentbit.io/) 收集 access log，并通过 HTTP 将日志信息发送给
SkyWalking OAP Server 进行进一步的分析。
+
+## 环境准备
+实验需要的 Nginx 及 Fluent-bit
相关配置文件都被上传到了[Github](https://github.com/weixiang1862/nginx-fluent-bit)，有需要的读者可以自行
git clone 并通过 docker compose 启动，本文中将介绍配置文件中几个关键点。
+
+### Nginx日志格式配置
+LAL 目前支持 JSON、YAML 及 REGEX 日志解析，为了方便获取到日志中的指标字段，我们将 Nginx 的日志格式定义为 JSON.
+
+```
+http {
+...
+...
+
+log_format main '{"remote_addr": "$remote_addr",'
+'"remote_user": "$remote_user",'
+'"request": "$request",'
+'"time": "$time_iso8601",'
+'"status": "$status",'
+'"request_time":"$request_time",'
+'"body_bytes_sent": "$body_bytes_sent",'
+'"http_referer": "$http_referer",'
+'"http_user_agent": "$http_user_agent",'
+'"http_x_forwarded_for": "$http_x_forwarded_for"}';
+
+access_log /var/log/nginx/access.log main;
+
+...
+...
+}
+```
+
+### Fluent bit Filter
+我们通过 Fluent bit 的 lua filter 进行日志格式的改写，将其调整为 SkyWalking 所需要的格式，record的各个字段含义如下：
+- body：日志内容体
+- service：服务名称
+- serviceInstance：实例名称
+```
+function rewrite_body(tag, timestamp, record)
+local newRecord = {}
+newRecord["body"] = { json = { json = record.log } }
+newRecord["service"] = "nginx::nginx"
+newRecord["serviceInstance"] = "localhost"
+return 1, timestamp, newRecord
+end
+```
+
+## OAP 日志分析
+### LAL定义
+在 filter 中，我们通过条件判断，只处理 `service=nginx::nginx` 的服务，其他服务依旧走默认逻辑：
+
+第一步，使用 json 指令对日志进行解析，解析的结果会被存放到 parsed 字段中，通过 parsed 字段我们可以获取 json 日志中的字段信息。
+
+第二步，使用 timestamp 指令解析 parsed.time 并将其赋值给日志的 timestamp 字段，这里的 time 就是access log
json 中的 time。
+
+第三步，使用 tag 指令给日志打上对应的标签，标签的值依然可以通过 parsed 字段获取。
+
+第四步，使用 metrics 指令从日志中提取出指标信息，我们共提取了四个指标：
+- `nginx_log_count`：Nginx 每次请求都会生成一条 access log，该指标可以帮助我们统计 Nginx 当前的请求数。
+- `nginx_request_time`：access log 中会记录请求时间，该指标可以帮助我们统计上游接口的响应时长。
+- `nginx_body_bytes_sent`：body 大小指标可以帮助我们了解网关上的流量情况。
+- `nginx_status_code`：状态码指标可以实现对状态码的监控，如果出现异常上涨可以结合 alarm 进行告警。
+
+```yaml
+rules:
+ - name: default
+layer: GENERAL
+dsl: |
+ filter {
+if (log.service == "nginx::nginx") {
+ json {
+abortOnFailure true
+ }
+
+ extractor {
+timestamp parsed.time as String, "-MM-dd'T'HH:mm:ssXXX"
+tag status: parsed.status
+tag remote_addr: parsed.remote_addr
+
+metrics {
+ timestamp log.timestamp as Long
+ labels service: log.service, instance: log.serviceInstance
+ name "nginx_log_count"
+ value 1
+}
+metrics {
+ timestamp log.timestamp as Long
+ labels service: log.service, instance: log.serviceInstance
+ name "nginx_request_time"
+ value parsed.request_time as Double
+}
+metrics {
+ timestamp log.timestamp as Long
+ labels service: log.service, instance: log.serviceInstance
+ name "nginx_body_byt
(skywalking) branch master updated: Support extract timestamp from patterned datetime string in LAL. (#11489)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 0f8c67822d Support extract timestamp from patterned datetime string in
LAL. (#11489)
0f8c67822d is described below
commit 0f8c67822d9e07cc446e66579c57cfcb2e035297
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Fri Nov 3 14:42:04 2023 +0800
Support extract timestamp from patterned datetime string in LAL. (#11489)
---
docs/en/changes/changes.md | 1 +
docs/en/concepts-and-designs/lal.md| 21 ++-
.../analyzer/dsl/spec/extractor/ExtractorSpec.java | 25 --
.../skywalking/oap/log/analyzer/dsl/DSLTest.java | 11
.../query/graphql/resolver/LogTestQueryTest.java | 30 ++
test/e2e-v2/cases/vm/zabbix/docker-compose.yml | 2 +-
6 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index e464311ec2..893f5f4ae8 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -35,6 +35,7 @@
* BanyanDBStorageClient: Add `define(Property property, PropertyStore.Strategy
strategy)` API.
* Support GraalVM native-image (Experimental).
* Correct the file format and fix typos in the filenames for monitoring
Kafka's e2e tests.
+* Support extract timestamp from patterned datetime string in LAL.
UI
diff --git a/docs/en/concepts-and-designs/lal.md
b/docs/en/concepts-and-designs/lal.md
index f81d96f125..caa934a923 100644
--- a/docs/en/concepts-and-designs/lal.md
+++ b/docs/en/concepts-and-designs/lal.md
@@ -185,7 +185,26 @@ dropped) and is used to associate with traces / metrics.
`timestamp` extracts the timestamp from the `parsed` result, and set it into
the `LogData`, which will be persisted (if
not dropped) and is used to associate with traces / metrics.
-The unit of `timestamp` is millisecond.
+The parameter of `timestamp` can be a millisecond:
+```groovy
+filter {
+// ... parser
+
+extractor {
+timestamp parsed.time as String
+}
+}
+```
+or a datetime string with a specified pattern:
+```groovy
+filter {
+// ... parser
+
+extractor {
+timestamp parsed.time as String, "-MM-dd HH:mm:ss"
+}
+}
+```
- `layer`
diff --git
a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
index 9359fff070..2a52cd64e1 100644
---
a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
+++
b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
@@ -22,6 +22,8 @@ import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import groovy.lang.Closure;
import groovy.lang.DelegatesTo;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -57,6 +59,7 @@ 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.module.ModuleStartException;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
+import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -203,11 +206,29 @@ public class ExtractorSpec extends AbstractSpec {
@SuppressWarnings("unused")
public void timestamp(final String timestamp) {
+timestamp(timestamp, null);
+}
+
+@SuppressWarnings("unused")
+public void timestamp(final String timestamp, final String formatPattern) {
if (BINDING.get().shouldAbort()) {
return;
}
-if (nonNull(timestamp) && StringUtils.isNumeric(timestamp)) {
-BINDING.get().log().setTimestamp(Long.parseLong(timestamp));
+if (StringUtil.isEmpty(timestamp)) {
+return;
+}
+
+if (StringUtil.isEmpty(formatPattern)) {
+if (StringUtils.isNumeric(timestamp)) {
+BINDING.get().log().setTimestamp(Long.parseLong(timestamp));
+}
+} else {
+SimpleDateFormat format = new SimpleDateFormat(formatPattern);
+try {
+
BINDING.get().log().setTimestamp(format.parse(timestamp).getTime());
+} catch (ParseException e) {
+// ignore
+}
}
}
diff --git
a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/sky
(skywalking-java) branch main updated: Fix Impala Jdbc URL (including schema without properties) parsing exception (#644)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 2721438820 Fix Impala Jdbc URL (including schema without properties)
parsing exception (#644)
2721438820 is described below
commit 27214388200183c0a27ca57eb7041aa9d4aff921
Author: Chen Ziyan
AuthorDate: Thu Nov 2 15:32:31 2023 +0800
Fix Impala Jdbc URL (including schema without properties) parsing exception
(#644)
---
CHANGES.md | 1 +
.../connectionurl/parser/ImpalaJdbcURLParser.java | 6 ++
.../jdbc/connectionurl/parser/URLParserTest.java | 22 ++
3 files changed, 29 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 46c54f8a35..a63f4a9a58 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Release Notes.
* Support collecting ZGC memory pool metrics. Require OAP 9.7.0 to support
these new metrics.
* Upgrade netty-codec-http2 to 4.1.100.Final
* Add a netty-http 4.1.x plugin to trace HTTP requests.
+* Fix Impala Jdbc URL (including schema without properties) parsing exception.
Documentation
diff --git
a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ImpalaJdbcURLParser.java
b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ImpalaJdbcURLParser.java
index c11052e23d..c33c917774 100644
---
a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ImpalaJdbcURLParser.java
+++
b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ImpalaJdbcURLParser.java
@@ -36,6 +36,9 @@ public class ImpalaJdbcURLParser extends AbstractURLParser {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.length();
+if (url.indexOf("/", hostLabelStartIndex + 2) != -1) {
+hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+}
int hostLabelEndIndexWithParameter = url.indexOf(";",
hostLabelStartIndex);
if (hostLabelEndIndexWithParameter != -1) {
String subUrl = url.substring(0, hostLabelEndIndexWithParameter);
@@ -64,6 +67,9 @@ public class ImpalaJdbcURLParser extends AbstractURLParser {
if (databaseStartTag == -1 && firstParamIndex == -1) {
return null;
} else {
+if (firstParamIndex == -1) {
+firstParamIndex = url.length();
+}
String subUrl = url.substring(startSize, firstParamIndex);
int schemaIndex = subUrl.indexOf("/");
if (schemaIndex == -1) {
diff --git
a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java
b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java
index a1d0a910c7..9556a0bc27 100644
---
a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java
+++
b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java
@@ -185,4 +185,26 @@ public class URLParserTest {
assertThat(connectionInfo.getDatabasePeer(), is("localhost:8123"));
}
+@Test
+public void testParseImpalaJDBCURL() {
+ConnectionInfo connectionInfo = new
URLParser().parser("jdbc:impala://localhost:21050/test;AuthMech=3;UID=UserName;PWD=Password");
+assertThat(connectionInfo.getDBType(), is("Impala"));
+assertThat(connectionInfo.getDatabaseName(), is("test"));
+assertThat(connectionInfo.getDatabasePeer(), is("localhost:21050"));
+}
+
+@Test
+public void testParseImpalaJDBCURLWithSchema() {
+ConnectionInfo connectionInfo = new
URLParser().parser("jdbc:impala://localhost:21050/test");
+assertThat(connectionInfo.getDBType(), is("Impala"));
+assertThat(connectionInfo.getDatabaseName(), is("test"));
+assertThat(connectionInfo.getDatabasePeer(), is("localhost:21050"));
+}
+
+@Test
+public void testParseImpalaJDBCURLWithoutSchema() {
+ConnectionInfo connectionInfo = new
URLParser().parser("jdbc:impala://localhost:21050");
+assertThat(connectionInfo.getDBType(), is("Impala"));
+assertThat(connectionInfo.getDatabasePeer(), is("localhost:21050"));
+}
}
(skywalking-booster-ui) branch main updated: refactor: update Logs view (#333)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new d86543ae refactor: update Logs view (#333)
d86543ae is described below
commit d86543aeedb9440e8eea005013b335aff7287d3b
Author: Fine0830
AuthorDate: Wed Nov 1 22:45:45 2023 +0800
refactor: update Logs view (#333)
New columns of the Log View
1. Timestamp + Raw log(content) as column one, 70% of the initial table
width. No separate timestamp column. The first column should be timestamp -
content
2. Level tag(key=level)'s value. This could be missed from tags, if so,
keep the column empty.
3. Trace link. If trace ID exists, generate a link to trace. Don't need to
put the relative trace ID in the text.
4. Still keep details pop-up style.
---
src/locales/lang/en.ts | 3 +-
src/locales/lang/es.ts | 1 +
src/locales/lang/zh.ts | 3 +-
src/views/dashboard/related/log/LogTable/Index.vue | 19 ++--
.../dashboard/related/log/LogTable/LogDetail.vue | 5 ++-
.../dashboard/related/log/LogTable/LogService.vue | 36 +-
src/views/dashboard/related/log/LogTable/data.ts | 32 +--
7 files changed, 40 insertions(+), 59 deletions(-)
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 415a4735..9c854703 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -297,7 +297,8 @@ const msg = {
return: "Return",
isError: "Error",
contentType: "Content Type",
- content: "Content",
+ content: "Timestamp - Content",
+ level: "Level",
viewLogs: "View Logs",
logsTagsTip: `Only tags defined in the core/default/searchableLogsTags are
searchable.
Check more details on the Configuration Vocabulary page`,
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index 27860e0d..278af1be 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -297,6 +297,7 @@ const msg = {
isError: "Error",
contentType: "Tipo de Contenido",
content: "Contenido",
+ level: "Level",
viewLogs: "Ver Registro de Datos",
logsTagsTip: `Solamente etiquetas definidas en
core/default/searchableLogsTags pueden ser buscadas.
Más información en la página de Vocabulario de Configuración`,
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index b9a6c48d..e9c340ec 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -294,7 +294,8 @@ const msg = {
return: "返回",
isError: "错误",
contentType: "内容类型",
- content: "内容",
+ content: "时间戳 - 内容",
+ level: "Level",
viewLogs: "查看日志",
logsTagsTip:
"只有core/default/searchableLogsTags中定义的标记才可搜索。查看配置词汇表页面上的更多详细信息。",
keywordsOfContentLogTips: "SkyWalking OAP服务器的当前存储不支持此操作",
diff --git a/src/views/dashboard/related/log/LogTable/Index.vue
b/src/views/dashboard/related/log/LogTable/Index.vue
index 266b119e..a0b9be81 100644
--- a/src/views/dashboard/related/log/LogTable/Index.vue
+++ b/src/views/dashboard/related/log/LogTable/Index.vue
@@ -15,10 +15,10 @@ limitations under the License. -->
-
+
- {{ t(item.value) }}
+ {{ item.value && t(item.value) }}
@@ -42,7 +42,7 @@ limitations under the License. -->
@closed="showDetail = false"
:title="t('logDetail')"
>
-
+
@@ -80,6 +80,7 @@ limitations under the License. -->
}
.log-header {
+width: 100%;
white-space: nowrap;
user-select: none;
border-left: 0;
@@ -87,23 +88,23 @@ limitations under the License. -->
border-bottom: 1px solid rgb(0 0 0 / 10%);
.traceId {
- width: 390px;
+ width: 140px;
+}
+
+.content {
+ width: 1300px;
}
-.content,
.tags {
- width: 300px;
+ width: 100px;
}
-.serviceInstanceName,
-.endpointName,
.serviceName {
width: 200px;
}
}
.log-header div {
-display: inline-block;
padding: 0 5px;
border: 1px solid transparent;
border-right: 1px dotted silver;
diff --git a/src/views/dashboard/related/log/LogTable/LogDetail.vue
b/src/views/dashboard/related/log/LogTable/LogDetail.vue
index b8c8a758..6a17b2cc 100644
--- a/src/views/dashboard/related/log/LogTable/LogDetail.vue
+++ b/src/views/dashboard/related/log/LogTable/LogDetail.vue
@@ -14,7 +14,7 @@ See the License for the specific language governing
permissions and
limitations under the License. -->
-
+
{{ t(item.value) }}:
(skywalking-banyandb) branch main updated: Bump go and several tools (#348)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new adc60137 Bump go and several tools (#348)
adc60137 is described below
commit adc60137e898a3f9e47d1fbaae16c86d26dd7271
Author: Gao Hongtao
AuthorDate: Wed Nov 1 22:42:33 2023 +0800
Bump go and several tools (#348)
---
.github/workflows/ci.yml| 4 +-
.github/workflows/e2e.storage.yml | 2 +-
.github/workflows/publish-docker.yml| 2 +-
.github/workflows/test.yml | 2 +-
.golangci.yml | 6 +-
CHANGES.md | 7 ++
CONTRIBUTING.md | 4 +-
Makefile| 7 ++
api/Makefile| 1 +
banyand/Dockerfile | 4 +-
banyand/Makefile| 1 +
banyand/metadata/schema/checker_test.go | 60
banyand/query/processor_topn.go | 6 +-
banyand/stream/metadata_test.go | 78 ++---
banyand/stream/stream_suite_test.go | 30
bydbctl/Dockerfile | 2 +-
bydbctl/Makefile| 1 +
bydbctl/internal/cmd/group_test.go | 4 +-
bydbctl/internal/cmd/index_rule.go | 2 +-
bydbctl/internal/cmd/index_rule_binding.go | 2 +-
bydbctl/internal/cmd/index_rule_binding_test.go | 2 +-
bydbctl/internal/cmd/index_rule_test.go | 2 +-
bydbctl/internal/cmd/measure.go | 2 +-
bydbctl/internal/cmd/measure_test.go| 4 +-
bydbctl/internal/cmd/property_test.go | 2 +-
bydbctl/internal/cmd/root.go| 2 +
bydbctl/internal/cmd/stream.go | 2 +-
bydbctl/internal/cmd/stream_test.go | 4 +-
dist/LICENSE| 24 +++
docs/installation.md| 4 +-
docs/installation/binaries.md | 4 +-
go.mod | 26 +++
go.sum | 58 +---
pkg/Makefile| 1 +
pkg/convert/string.go | 18 ++---
pkg/flow/streaming/sliding_window_test.go | 54 +++
pkg/flow/streaming/streaming_test.go| 92 -
pkg/fs/local_file_system.go | 9 ++-
pkg/Makefile => scripts/build/vendor.mk | 12 ++--
scripts/build/version.mk| 14 ++--
scripts/ci/check/version_test.go| 2 +-
test/Makefile | 1 +
test/stress/cases/istio/istio_suite_test.go | 52 +++---
ui/Makefile | 5 ++
ui/package-lock.json| 2 +-
ui/package.json | 2 +-
46 files changed, 332 insertions(+), 293 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27509f8f..8663ca24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
${{ runner.os }}-check-tool-
- uses: actions/setup-node@v3
with:
- node-version: 18.16
+ node-version: 20.9
cache: 'npm'
cache-dependency-path: ui/package-lock.json
- name: Install Go
@@ -100,7 +100,7 @@ jobs:
${{ runner.os }}-build-tool-
- uses: actions/setup-node@v3
with:
- node-version: 18.16
+ node-version: 20.9
cache: 'npm'
cache-dependency-path: ui/package-lock.json
- name: Install Go
diff --git a/.github/workflows/e2e.storage.yml
b/.github/workflows/e2e.storage.yml
index 35428b9c..0446bb17 100644
--- a/.github/workflows/e2e.storage.yml
+++ b/.github/workflows/e2e.storage.yml
@@ -74,7 +74,7 @@ jobs:
${{ runner.os }}-build-tool-
- uses: actions/setup-node@v3
with:
- node-version: 18.16
+ node-version: 20.9
cache: 'npm'
cache-dependency-path: ui/package-lock.json
- name: Install Go
diff --git a/.github/workflows/publish-docker.yml
b/.github/workflows/publish-docker.yml
index 1024d5bb..5e1a256f 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -61,7 +61,7 @@ jobs:
${{ runner.os }}-build-tool-
- uses: actions/setup-node@v3
with:
- node-version: 18.16
+ node-version: 20.9
cache: 'npm'
cache-dependency-path: ui/package-lock.json
(skywalking-banyandb) branch bump-req deleted (was 6b56b93a)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch bump-req in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was 6b56b93a Bump go and several tools The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-website) branch master updated: Add blog: Detailed explanation of SkyWalking Go Toolkit Trace (zh) (#651)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 6febe89a246 Add blog: Detailed explanation of SkyWalking Go Toolkit
Trace (zh) (#651)
6febe89a246 is described below
commit 6febe89a246be323abfeb6a3cd6dead6b9f2f86b
Author: Alipebt <1160756...@qq.com>
AuthorDate: Wed Nov 1 17:15:21 2023 +0800
Add blog: Detailed explanation of SkyWalking Go Toolkit Trace (zh) (#651)
---
.../correlation.png| Bin 0 -> 73267 bytes
.../2023-10-18-skywalking-toolkit-trace/index.md | 287 +
.../2023-10-18-skywalking-toolkit-trace/trace.png | Bin 0 -> 79274 bytes
3 files changed, 287 insertions(+)
diff --git a/content/zh/2023-10-18-skywalking-toolkit-trace/correlation.png
b/content/zh/2023-10-18-skywalking-toolkit-trace/correlation.png
new file mode 100644
index 000..a1b6fe3df1b
Binary files /dev/null and
b/content/zh/2023-10-18-skywalking-toolkit-trace/correlation.png differ
diff --git a/content/zh/2023-10-18-skywalking-toolkit-trace/index.md
b/content/zh/2023-10-18-skywalking-toolkit-trace/index.md
new file mode 100644
index 000..1a66531fe27
--- /dev/null
+++ b/content/zh/2023-10-18-skywalking-toolkit-trace/index.md
@@ -0,0 +1,287 @@
+---
+title: "SkyWalking Go Toolkit Trace 详解"
+date: 2023-10-18
+author: "Alipebt"
+description: "本文展示了 Skywalking Go 中 toolkit trace 的介绍和用法"
+
+---
+
+## 背景介绍
+
+SkyWalking
Go是一个开源的非侵入式Golang代理程序，用于监控、追踪和在分布式系统中进行数据收集。它使用户能够观察系统内请求的流程和延迟，从各个系统组件收集性能数据以进行性能监控，并通过追踪请求的完整路径来解决问题。
+
+在版本v0.3.0中，Skywalking Go引入了 toolkit-trace 工具。Trace APIs
允许用户在插件不支持的情况下将关键操作、函数或服务添加到追踪范围。从而实现追踪和监控这些操作，并可用于故障分析、诊断和性能监控。
+
+在深入了解之前，您可以参考[SkyWalking Go
Agent快速开始指南](https://skywalking.apache.org/zh/2023-06-01-quick-start-with-skywalking-go-agent/)来学习如何使用SkyWalking
Go Agent。
+
+下面将会介绍如何在特定场景中使用这些接口。
+
+## 导入 Trace Toolkit
+
+在项目的根目录中执行以下命令：
+
+```shell
+go get github.com/apache/skywalking-go/toolkit
+```
+
+使用 toolkit trace 接口前，需要将该包导入到您的项目中：
+
+```go
+"github.com/apache/skywalking-go/toolkit/trace"
+```
+
+## 手动追踪
+
+Span 是 Tracing
中单个操作的基本单元。它代表在特定时间范围内的操作，比如一个请求、一个函数调用或特定动作。Span记录了特定操作的关键信息，包括开始和结束时间、操作名称、标签（键-值对）以及操作之间的关系。多个
Span 可以形成层次结构。
+
+在遇到 Skywalking Go 不支持的框架的情况下，用户可以手动创建 Span 以获取追踪信息。
+
+（为了作为示例，我删除了已支持的框架。以下仅为示例。请在使用私有或不支持的框架的 API 时参考）
+
+例如，当需要追踪HTTP响应时，可以在处理请求的方法内部使用 `trace.CreateEntrySpan() `来创建一个 span，在处理完成后使用
`trace.StopSpan()` 来结束这个 span。在发送HTTP请求时，使用 `trace.CreateExitSpan()` 来创建一个
span，在请求返回后结束这个 span。
+
+这里有两个名为 consumer 和 provider 的HTTP服务。当用户访问 consumer 服务时，它在内部接收用户的请求，然后访问
provider 以获取资源。
+
+```go
+// consumer.go
+package main
+
+import (
+ "io"
+ "net/http"
+
+ _ "github.com/apache/skywalking-go"
+ "github.com/apache/skywalking-go/toolkit/trace"
+)
+
+func getProvider() (*http.Response, error) {
+ // 新建 HTTP 请求
+ req, err := http.NewRequest("GET", "http://localhost:9998/provider";,
http.NoBody)
+ // 在发送 HTTP 请求之前创建 ExitSpan
+ trace.CreateExitSpan("GET:/provider", "localhost:",
+ func(headerKey, headerValue string) error {
+ // Injector 向请求中添加特定的 header 信息
+ req.Header.Add(headerKey, headerValue)
+ return nil
+ })
+ // 结束 ExitSpan，使用 defer 确保在函数返回时执行
+ defer trace.StopSpan()
+
+ // 发送请求
+ client := &http.Client{}
+ resp, err := client.Do(req)
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
+
+func consumerHandler(w http.ResponseWriter, r *http.Request) {
+ // 创建 EntrySpan 来追踪 consumerHandler 方法的执行
+ trace.CreateEntrySpan(r.Method+"/consumer", func(headerKey string)
(string, error) {
+ // Extractor 获取请求中添加的 header 信息
+ return r.Header.Get(headerKey), nil
+ })
+ // 结束 EntrySpan
+ defer trace.StopSpan()
+
+ // 准备发送 HTTP 请求
+ resp, err := getProvider()
+
+ body, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return
+ }
+ _, _ = w.Write(body)
+}
+
+func main() {
+ http.HandleFunc("/consumer", consumerHandler)
+
+ _ = http.ListenAndServe(":", nil)
+}
+```
+
+```go
+// provider.go
+package main
+
+import (
+ "net/http"
+
+ _ "github.com/apache/skywalking-go"
+ "github.com/apache/skywalking-go/toolkit/trace"
+)
+
+func providerHandler(w http.ResponseWriter, r *http.Request) {
+ // 创建 EntrySpan 来追踪 providerHandler 方法的执行
+ trace.CreateEntrySpan("GET:/provider", func(headerKey string) (string,
error) {
+ return r
(skywalking-website) branch master updated: Add blog: Detailed explanation of SkyWalking Go Toolkit Trace (#650)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 73cdaa0b8d6 Add blog: Detailed explanation of SkyWalking Go Toolkit
Trace (#650)
73cdaa0b8d6 is described below
commit 73cdaa0b8d63a0a54f5e8e502899d747fd1aa68d
Author: Alipebt <1160756...@qq.com>
AuthorDate: Wed Nov 1 11:20:45 2023 +0800
Add blog: Detailed explanation of SkyWalking Go Toolkit Trace (#650)
---
.../correlation.png| Bin 0 -> 73267 bytes
.../2023-10-18-skywalking-toolkit-trace/index.md | 288 +
.../2023-10-18-skywalking-toolkit-trace/trace.png | Bin 0 -> 79274 bytes
3 files changed, 288 insertions(+)
diff --git a/content/blog/2023-10-18-skywalking-toolkit-trace/correlation.png
b/content/blog/2023-10-18-skywalking-toolkit-trace/correlation.png
new file mode 100644
index 000..a1b6fe3df1b
Binary files /dev/null and
b/content/blog/2023-10-18-skywalking-toolkit-trace/correlation.png differ
diff --git a/content/blog/2023-10-18-skywalking-toolkit-trace/index.md
b/content/blog/2023-10-18-skywalking-toolkit-trace/index.md
new file mode 100644
index 000..a90c1437e33
--- /dev/null
+++ b/content/blog/2023-10-18-skywalking-toolkit-trace/index.md
@@ -0,0 +1,288 @@
+---
+title: "Detailed explanation of SkyWalking Go Toolkit Trace"
+date: 2023-10-18
+author: "Alipebt"
+description: "This article shows the introduction and usage of toolkit trace
provided by Skywalking Go to users."
+
+---
+
+## Background
+
+SkyWalking Go is an open-source, non-intrusive Golang agent used for
monitoring, tracing, and data collection within distributed systems. It enables
users to observe the flow and latency of requests within the system, collect
performance data from various system components for performance monitoring, and
troubleshoot issues by tracing the complete path of requests.
+
+In version v0.3.0, Skywalking Go introduced the toolkit trace tool. Trace APIs
allow users to include critical operations, functions, or services in the
tracing scope in situations where plugins do not support them. This inclusion
enables tracking and monitoring of these operations and can be used for fault
analysis, diagnosis, and performance monitoring.
+
+Before diving into this, you can learn how to use the Skywalking Go agent by
referring to the [SkyWalking Go Agent Quick Start
Guide](https://skywalking.apache.org/zh/2023-06-01-quick-start-with-skywalking-go-agent/).
+
+The following sections will explain how to use these interfaces in specific
scenarios.
+
+## Introducing the Trace Toolkit
+
+Execute the following command in the project's root directory:
+
+```shell
+go get github.com/apache/skywalking-go/toolkit
+```
+
+To use the toolkit trace interface, you need to import the package into your
project:
+
+```go
+"github.com/apache/skywalking-go/toolkit/trace"
+```
+
+## Manual Tracing
+
+A Span is the fundamental unit of an operation in Tracing. It represents an
operation within a specific timeframe, such as a request, a function call, or a
specific action. It records essential information about a particular operation,
including start and end times, the operation's name, tags (key-value pairs),
and relationships between operations. Multiple Spans can form a hierarchical
structure.
+
+In situations where Skywalking-go doesn't support a particular framework,
users can manually create Spans to obtain tracing information.
+
+(Here, I have removed the supported frameworks for the sake of the example.
These are only examples. You should reference this when using the APIs in
private and/or unsupported frameworks)
+
+For example, when you need to trace an HTTP response, you can create a span
using trace.CreateEntrySpan() within the method handling the request, and end
the span using trace.StopSpan() after processing.
+When sending an HTTP request, use trace.CreateExitSpan() to create a span, and
end the span after the request returns.
+
+Here are two HTTP services named `consumer` and `provider`. When a user
accesses the `consumer` service, it receives the user's request internally and
then accesses the provider to obtain resources.
+
+```go
+// consumer.go
+package main
+
+import (
+ "io"
+ "net/http"
+
+ _ "github.com/apache/skywalking-go"
+ "github.com/apache/skywalking-go/toolkit/trace"
+)
+
+func getProvider() (*http.Response, error) {
+ // Create an HTTP request
+ req, err := http.NewRequest("GET", "http://localhost:9998/provider";,
http.NoBody)
+ // Create an ExitSpan before sending the HTTP request.
+ trace.CreateExitSpan("GET:/provider", "localhost:
(skywalking) branch master updated: Feature pulsar monitoring (#11339)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 ced3f22708 Feature pulsar monitoring (#11339) ced3f22708 is described below commit ced3f227088090bd32f3bd70025463f1f40893a4 Author: Xiangying Meng <55571188+liangyepianz...@users.noreply.github.com> AuthorDate: Tue Oct 31 21:04:16 2023 +0800 Feature pulsar monitoring (#11339) --- .github/workflows/skywalking.yaml | 2 + docs/en/changes/changes.md | 1 + .../setup/backend/backend-bookkeeper-monitoring.md | 61 +++ docs/en/setup/backend/backend-pulsar-monitoring.md | 67 docs/menu.yml | 4 + .../skywalking/oap/server/core/analysis/Layer.java | 14 +- .../ui/template/UITemplateInitializer.java | 2 + .../src/main/resources/application.yml | 2 +- .../otel-rules/bookkeeper/bookkeeper-cluster.yaml | 62 +++ .../otel-rules/bookkeeper/bookkeeper-node.yaml | 90 + .../resources/otel-rules/pulsar/pulsar-broker.yaml | 76 .../otel-rules/pulsar/pulsar-cluster.yaml | 68 .../bookkeeper/bookkeeper-cluster.json | 393 +++ .../bookkeeper/bookkeeper-node.json| 366 + .../bookkeeper/bookkeeper-root.json| 51 +++ .../resources/ui-initialized-templates/menu.yaml | 10 + .../pulsar/pulsar-broker.json | 422 .../pulsar/pulsar-cluster.json | 435 + .../pulsar/pulsar-root.json| 51 +++ test/e2e-v2/cases/pulsar/docker-compose.yml| 137 +++ test/e2e-v2/cases/pulsar/e2e.yaml | 37 ++ .../cases/pulsar/expected/bookie_instance.yml | 22 ++ .../cases/pulsar/expected/broker_instance.yml | 22 ++ .../metrics-has-value-instance-bookie-label.yml| 33 ++ .../metrics-has-value-instance-broker-label.yml| 33 ++ .../cases/pulsar/expected/metrics-has-value.yml| 31 ++ test/e2e-v2/cases/pulsar/expected/service.yml | 31 ++ .../e2e-v2/cases/pulsar/otel-collector-config.yaml | 58 +++ test/e2e-v2/cases/pulsar/pulsar-cases.yaml | 129 ++ 29 files changed, 2708 insertions(+), 2 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index bfb1b97bcb..96b3a0736b 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -641,6 +641,8 @@ jobs: config: test/e2e-v2/cases/kafka/kafka-monitoring/e2e.yaml - name: MQE Service config: test/e2e-v2/cases/mqe/e2e.yaml + - name: Pulsar and BookKeeper +config: test/e2e-v2/cases/pulsar/e2e.yaml - name: UI Menu BanyanDB config: test/e2e-v2/cases/menu/banyandb/e2e.yaml diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index e2e7f614c1..4ba8bb4417 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -13,6 +13,7 @@ * ElasticSearchClient: Add `deleteById` API. * Fix Custom alarm rules are overwritten by 'resource/alarm-settings.yml' * Support Kafka Monitoring. +* Support Pulsar server and BookKeeper server Monitoring. * [Breaking Change] Elasticsearch storage merge all management data indices into one index `management`, including `ui_template，ui_menu，continuous_profiling_policy`. * Add a release mechanism for alarm windows when it is expired in case of OOM. diff --git a/docs/en/setup/backend/backend-bookkeeper-monitoring.md b/docs/en/setup/backend/backend-bookkeeper-monitoring.md new file mode 100644 index 00..e94e347481 --- /dev/null +++ b/docs/en/setup/backend/backend-bookkeeper-monitoring.md @@ -0,0 +1,61 @@ +# BookKeeper monitoring + +SkyWalking leverages OpenTelemetry Collector to collect metrics data from the BookKeeper and leverages OpenTelemetry Collector to transfer the metrics to +[OpenTelemetry receiver](opentelemetry-receiver.md) and into the [Meter System](./../../concepts-and-designs/meter.md). +Kafka entity as a `Service` in OAP and on the `Layer: BOOKKEEPER. + +## Data flow + +1. BookKeeper exposes metrics through Prometheus endpoint. +2. OpenTelemetry Collector fetches metrics from BookKeeper cluster via Prometheus Receiver and pushes metrics to SkyWalking OAP Server via OpenTelemetry gRPC exporter. +3. The SkyWalking OAP Server parses the expression with [MAL](../../concepts-and-designs/mal.md) to + filter/calculate/aggregate and store the results.` + +## Setup + +1. Set up [BookKeeper Cluster](https://bookkeeper.apache.org/docs/deployment/manual). +2. Set up [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/getting-started/#kubernetes). The example + for OpenTelemetry Collect
(skywalking-banyandb) branch property deleted (was c3e1bdbd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch property in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was c3e1bdbd Fix the bug that property merge new tags failed The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: Fix the bug that property merge new tags failed (#347)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new facef3d1 Fix the bug that property merge new tags failed (#347)
facef3d1 is described below
commit facef3d10ad7dfd6f24aa252afaa75a040363dee
Author: Gao Hongtao
AuthorDate: Tue Oct 31 14:19:11 2023 +0800
Fix the bug that property merge new tags failed (#347)
---
CHANGES.md | 4 ++
banyand/metadata/schema/property.go| 12 ++--
pkg/node/maglev_test.go| 2 +-
test/integration/standalone/other/property_test.go | 69 ++
4 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 7c48f319..1db2102c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,10 @@ Release Notes.
- Support etcd client authentication.
- Implement Local file system.
+### Bugs
+
+- Fix the bug that property merge new tags failed.
+
## 0.5.0
### Features
diff --git a/banyand/metadata/schema/property.go
b/banyand/metadata/schema/property.go
index 906d3e59..1f79597b 100644
--- a/banyand/metadata/schema/property.go
+++ b/banyand/metadata/schema/property.go
@@ -177,16 +177,20 @@ func (e *etcdSchemaRegistry) mergeProperty(ctx
context.Context, key string, prop
return false, 0, 0, err
}
merge := func(existed *propertyv1.Property) (*propertyv1.Property,
error) {
- tags := make([]*modelv1.Tag, len(property.Tags))
- copy(tags, property.Tags)
+ tags := make([]*modelv1.Tag, 0)
for i := 0; i < int(tagsNum); i++ {
- t := tags[0]
- tags = tags[1:]
+ t := property.Tags[i]
+ tagExisted := false
for _, et := range existed.Tags {
if et.Key == t.Key {
et.Value = t.Value
+ tagExisted = true
+ break
}
}
+ if !tagExisted {
+ tags = append(tags, t)
+ }
}
existed.Tags = append(existed.Tags, tags...)
existed.LeaseId = leaseID
diff --git a/pkg/node/maglev_test.go b/pkg/node/maglev_test.go
index b58daddd..d581dd03 100644
--- a/pkg/node/maglev_test.go
+++ b/pkg/node/maglev_test.go
@@ -30,7 +30,7 @@ import (
const (
dataNodeTemplate = "data-node-%d"
- targetEpsilon= 0.03
+ targetEpsilon= 0.1
)
func TestMaglevSelector(t *testing.T) {
diff --git a/test/integration/standalone/other/property_test.go
b/test/integration/standalone/other/property_test.go
index 6ef21a4a..ab217059 100644
--- a/test/integration/standalone/other/property_test.go
+++ b/test/integration/standalone/other/property_test.go
@@ -98,6 +98,75 @@ var _ = Describe("Property application", func() {
{Key: "t2", Value: &modelv1.TagValue{Value:
&modelv1.TagValue_Str{Str: &modelv1.Str{Value: "v22",
}))
})
+ It("applies properties with new tags", func() {
+ md := &propertyv1.Metadata{
+ Container: &commonv1.Metadata{
+ Name: "p",
+ Group: "g",
+ },
+ Id: "1",
+ }
+ resp, err := client.Apply(context.Background(),
&propertyv1.ApplyRequest{Property: &propertyv1.Property{
+ Metadata: md,
+ Tags: []*modelv1.Tag{
+ {Key: "t1", Value: &modelv1.TagValue{Value:
&modelv1.TagValue_Str{Str: &modelv1.Str{Value: "v1",
+ },
+ }})
+ Expect(err).NotTo(HaveOccurred())
+ Expect(resp.Created).To(BeTrue())
+ Expect(resp.TagsNum).To(Equal(uint32(1)))
+ resp, err = client.Apply(context.Background(),
&propertyv1.ApplyRequest{Property: &propertyv1.Property{
+ Metadata: md,
+ Tags: []*modelv1.Tag{
+ {Key: "t1", Value: &modelv1.TagValue{Value:
&modelv1.TagValue_Str{Str: &modelv1.Str{Value: "v2",
+ {Key: "t2", Value: &modelv1.TagValue{Value:
&modelv1.TagValue_Str{Str: &modelv1.Str{Value: "v22",
+ },
+ }})
+ E
(skywalking-java) branch main updated: Disable dep bot (#641)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 d5cfd35c5d Disable dep bot (#641) d5cfd35c5d is described below commit d5cfd35c5d0479c8afb89892449054082adb5f0d Author: 吴晟 Wu Sheng AuthorDate: Tue Oct 31 06:39:07 2023 +0800 Disable dep bot (#641) --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 7851fda4b7..d09df5be14 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -31,6 +31,7 @@ github: squash: true merge: false rebase: false + dependabot_updates: false protected_branches: main: required_status_checks:
(skywalking-java) branch wu-sheng-patch-1 deleted (was e47ddf054f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was e47ddf054f Disable dep bot The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-java) 01/01: Disable dep bot
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git commit e47ddf054f1e75606cd2b9605fea07b1afd65bc2 Author: 吴晟 Wu Sheng AuthorDate: Mon Oct 30 23:18:55 2023 +0800 Disable dep bot --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 7851fda4b7..d09df5be14 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -31,6 +31,7 @@ github: squash: true merge: false rebase: false + dependabot_updates: false protected_branches: main: required_status_checks:
(skywalking-java) branch wu-sheng-patch-1 created (now e47ddf054f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at e47ddf054f Disable dep bot This branch includes the following new commits: new e47ddf054f Disable dep bot 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) branch transform-config deleted (was bd3f295f56)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch transform-config in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was bd3f295f56 Update docs. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-java) branch main updated: Add a netty-4.1.x plugin to trace http (#625)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 0b80f3d424 Add a netty-4.1.x plugin to trace http (#625) 0b80f3d424 is described below commit 0b80f3d424de20887ed709d89dfdfa445a03c0c1 Author: peachisai <96932958+peachi...@users.noreply.github.com> AuthorDate: Sun Oct 29 16:18:25 2023 +0800 Add a netty-4.1.x plugin to trace http (#625) --- .github/workflows/plugins-test.1.yaml | 1 + CHANGES.md | 1 + .../network/trace/component/ComponentsDefine.java | 2 + apm-sniffer/config/agent.config| 6 + .../netty-http-4.1.x-plugin/pom.xml| 46 +++ .../http/AddHttpRequestDecoderInterceptor.java | 64 ++ .../http/AddHttpRequestEncoderInterceptor.java | 64 ++ .../http/AddHttpResponseDecoderInterceptor.java| 64 ++ .../http/AddHttpResponseEncoderInterceptor.java| 64 ++ .../http/ChannelHandlerContextInterceptor.java | 52 .../http/ChannelPipelineRemoveLastInterceptor.java | 50 .../netty/http/RemoveHandlerInterceptor.java | 71 +++ .../plugin/netty/http/common/AttributeKeys.java| 55 + .../plugin/netty/http/common/NettyConstants.java | 33 + .../netty/http/config/NettyHttpPluginConfig.java | 50 .../http/define/AbstractNettyInstrumentation.java | 35 ++ .../ChannelHandlerContextInstrumentation.java | 64 ++ .../http/define/ChannelHandlerInstrumentation.java | 63 ++ .../define/ChannelPipelineInstrumentation.java | 63 ++ .../define/HttpRequestDecoderInstrumentation.java | 65 ++ .../define/HttpRequestEncoderInstrumentation.java | 65 ++ .../define/HttpResponseDecoderInstrumentation.java | 65 ++ .../define/HttpResponseEncoderInstrumentation.java | 65 ++ .../NettyHttpRequestDecoderTracingHandler.java | 133 .../NettyHttpRequestEncoderTracingHandler.java | 134 + .../NettyHttpResponseDecoderTracingHandler.java| 103 .../NettyHttpResponseEncoderTracingHandler.java| 82 + .../netty/http/utils/HttpDataCollectUtils.java | 80 .../apm/plugin/netty/http/utils/TypeUtils.java | 68 +++ .../src/main/resources/skywalking-plugin.def | 23 apm-sniffer/optional-plugins/pom.xml | 1 + .../service-agent/java-agent/Optional-plugins.md | 3 +- .../setup/service-agent/java-agent/Plugin-list.md | 1 + .../service-agent/java-agent/Supported-list.md | 1 + .../service-agent/java-agent/configurations.md | 6 +- .../netty-http-4.1.x-scenario/bin/startup.sh | 21 .../config/expectedData.yaml | 81 + .../netty-http-4.1.x-scenario/configuration.yml| 22 .../scenarios/netty-http-4.1.x-scenario/pom.xml| 101 .../src/main/assembly/assembly.xml | 41 +++ .../apm/testcase/netty/http/Application.java | 30 + .../netty/http/controller/CaseController.java | 49 .../testcase/netty/http/core/ClientService.java| 87 + .../testcase/netty/http/core/ServerService.java| 62 ++ .../netty/http/handler/UserClientHandler.java | 45 +++ .../netty/http/handler/UserServerHandler.java | 57 + .../src/main/resources/application.yaml| 22 .../netty-http-4.1.x-scenario/support-version.list | 27 + 48 files changed, 2386 insertions(+), 2 deletions(-) diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml index dfa98f3dcd..e271ad915b 100644 --- a/.github/workflows/plugins-test.1.yaml +++ b/.github/workflows/plugins-test.1.yaml @@ -80,6 +80,7 @@ jobs: - mssql-jdbc-scenario - mybatis-3.x-scenario - resteasy-4.x-scenario + - netty-http-4.1.x-scenario steps: - uses: actions/checkout@v2 with: diff --git a/CHANGES.md b/CHANGES.md index 96a55eaaa1..46c54f8a35 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,7 @@ Release Notes. * Fix config length limitation. * Support collecting ZGC memory pool metrics. Require OAP 9.7.0 to support these new metrics. * Upgrade netty-codec-http2 to 4.1.100.Final +* Add a netty-http 4.1.x plugin to trace HTTP requests. Documentation diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java index fff71474da..2334cb58e0 100755 --- a/apm-protocol/apm-network/src/main/java/org/
(skywalking-java) branch transform-config updated: Update docs.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch transform-config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/transform-config by this push:
new bd3f295f56 Update docs.
bd3f295f56 is described below
commit bd3f295f56d47b5f320a994048e73af2ed68a059
Author: Wu Sheng
AuthorDate: Sat Oct 28 08:21:55 2023 +0800
Update docs.
---
.../service-agent/java-agent/advanced-features.md | 1 +
.../setup/service-agent/java-agent/re-transform.md | 35 ++
docs/menu.yml | 2 ++
3 files changed, 38 insertions(+)
diff --git a/docs/en/setup/service-agent/java-agent/advanced-features.md
b/docs/en/setup/service-agent/java-agent/advanced-features.md
index 96302df680..1a6f1f2e01 100644
--- a/docs/en/setup/service-agent/java-agent/advanced-features.md
+++ b/docs/en/setup/service-agent/java-agent/advanced-features.md
@@ -3,6 +3,7 @@
* Set the settings through system properties for config file override. Read
[setting override](Setting-override.md).
* Use gRPC TLS to link backend. See [open TLS](TLS.md)
* Set client [token](Token-auth.md) if backend open the token authentication.
+* Activate [re-transform support](re-transform.md) when you need more than one
agent.
* Application Toolkit, are a collection of libraries, provided by SkyWalking
APM. Using them, you have a bridge between your application and SkyWalking APM
agent.
* If you want your codes to interact with SkyWalking agent, including
`getting trace id`, `setting tags`, `propagating custom data` etc.. Try
[SkyWalking manual APIs](Application-toolkit-trace.md).
* If you require customized metrics, try [SkyWalking Meter System
Toolkit](Application-toolkit-meter.md).
diff --git a/docs/en/setup/service-agent/java-agent/re-transform.md
b/docs/en/setup/service-agent/java-agent/re-transform.md
new file mode 100644
index 00..b38c8f9d20
--- /dev/null
+++ b/docs/en/setup/service-agent/java-agent/re-transform.md
@@ -0,0 +1,35 @@
+# Re-transform Support
+
+By default, the SkyWalking agent is not expected to install alongside other
Java agents.
+Therefore, in cases where class re-transformation occurs, the instrumentation
provided by
+SkyWalking could potentially be overwritten or lost.
+
+The limitation of the default type description strategy, **HYBRID**, is
described as following.
+> A description type strategy represents a type as a
TypeDescription.ForLoadedType if a
+retransformation or redefinition is applied on a type. Using a loaded type
typically results in better performance
+as no I/O is required for resolving type descriptions. However, any
interaction with the type is carried out via the Java reflection API.
+Using the reflection API triggers eager loading of any type that is part of a
method or field signature.
+If any of these types are missing from the class path, this eager loading will
cause a NoClassDefFoundError.
+Some Java code declares optional dependencies to other classes which are only
realized if the optional dependency is present.
+Such code relies on the Java reflection API not being used for types using
optional dependencies.
+
+In certain scenarios, users may need to have multiple agents installed.
+To accommodate this, they should enable this new feature by setting this
configuration to true.
+
+```
+# Enables the Java agent kernel to run in a mode that supports class
re-transformation by other agents.
+# It's recommended to use this mode only if the service has more than one
SkyWalking agent installed.
+#
+# Be aware that this mode can slow down class loading. As a result, you might
experience a higher
+# startup delay (the time it takes for the program to launch and be ready for
use).
+agent.enable_retransform_support={SW_ENABLE_RETRANSFORM_SUPPORT:false}
+```
+
+This option would change the type description strategy to `POOL_FIRST`.
+But, **doing so can cause overhead as processing loaded types is supported
very efficiently by a JVM.**
+and slow down class loading. As a result, you might experience a higher
+startup delay (the time it takes for the program to launch and be ready for
use).
+
+Based on our tests, enabling this feature could potentially double the
additional time cost
+incurred by the agent during the boot-up stage. This might also lead to delays
in class
+loading during runtime.
\ No newline at end of file
diff --git a/docs/menu.yml b/docs/menu.yml
index 3964b059be..cef15764b9 100644
--- a/docs/menu.yml
+++ b/docs/menu.yml
@@ -34,6 +34,8 @@ catalog:
path: "/en/setup/service-agent/java-agent/tls"
- name: "Token Authentication"
path: "/en/setup/service-agent/java-agent/token-auth"
+ - name: "Work with other Java agents"
+path: "/en/setup/service-agent/java-agent/re-transform"
(skywalking-java) branch transform-config updated (c41e88653c -> af449af307)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch transform-config in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from c41e88653c Expose `SW_ENABLE_RETRANSFORM_SUPPORT` config to set up the re-transform support explicitly add af449af307 Fix No new revisions were added by this update. Summary of changes: test/plugin/scenarios/retransform-class-scenario/configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-java) branch transform-config created (now c41e88653c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch transform-config in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at c41e88653c Expose `SW_ENABLE_RETRANSFORM_SUPPORT` config to set up the re-transform support explicitly This branch includes the following new commits: new c41e88653c Expose `SW_ENABLE_RETRANSFORM_SUPPORT` config to set up the re-transform support explicitly 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: Expose `SW_ENABLE_RETRANSFORM_SUPPORT` config to set up the re-transform support explicitly
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch transform-config
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit c41e88653c248cc2f612d7944892a94a53b23af3
Author: Wu Sheng
AuthorDate: Fri Oct 27 23:22:47 2023 +0800
Expose `SW_ENABLE_RETRANSFORM_SUPPORT` config to set up the re-transform
support explicitly
---
CHANGES.md| 3 +++
.../org/apache/skywalking/apm/agent/core/conf/Config.java | 11 +++
.../java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java | 6 --
apm-sniffer/config/agent.config | 7 +++
.../scenarios/retransform-class-scenario/configuration.yml| 1 +
.../retransform-class-tomcat-scenario/configuration.yml | 2 ++
6 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 96a55eaaa1..876f6a885f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,9 @@ Release Notes.
9.1.0
--
+* **IMPORTANT** Expose `SW_ENABLE_RETRANSFORM_SUPPORT` config to set up the
re-transform support explicitly,
+ and close it by default to keep startup delay low.
+ This was added and enabled in 9.0.0, and we confirmed it would slow down the
service launch.
* Fix hbase onConstruct NPE in the file configuration scenario
* Fix the issue of createSpan failure caused by invalid request URL in
HttpClient 4.x/5.x plugin
* Optimize ElasticSearch 6.x 7.x plugin compatibility
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
index be7d54a4e4..52ff888e3e 100755
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -174,6 +174,17 @@ public class Config {
* Enable the agent kernel services and instrumentation.
*/
public static boolean ENABLE = true;
+
+/**
+ * Enables the Java agent kernel to run in a mode that supports class
re-transformation by other agents.
+ * It's recommended to use this mode only if the service has more than
one SkyWalking agent installed.
+ *
+ * Be aware that this mode can slow down class loading. As a result,
you might experience a higher
+ * startup delay (the time it takes for the program to launch and be
ready for use).
+ *
+ * @since 9.1.0
+ */
+public static boolean ENABLE_RETRANSFORM_SUPPORT = false;
}
public static class OsInfo {
diff --git
a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
index 8e0c2495b5..d908a36a09 100644
---
a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
+++
b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
@@ -157,8 +157,10 @@ public class SkyWalkingAgent {
.with(new SWImplementationContextFactory(NAME_TRAIT));
SWNativeMethodStrategy nativeMethodStrategy = new
SWNativeMethodStrategy(NAME_TRAIT);
-return new SWAgentBuilderDefault(byteBuddy, nativeMethodStrategy)
-.with(AgentBuilder.DescriptionStrategy.Default.POOL_FIRST);
+final SWAgentBuilderDefault swAgentBuilder = new
SWAgentBuilderDefault(byteBuddy, nativeMethodStrategy);
+return Config.Agent.ENABLE_RETRANSFORM_SUPPORT ?
+
swAgentBuilder.with(AgentBuilder.DescriptionStrategy.Default.POOL_FIRST)
+: swAgentBuilder;
}
private static class Transformer implements AgentBuilder.Transformer {
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
index 1874a77be2..9e26ec8240 100755
--- a/apm-sniffer/config/agent.config
+++ b/apm-sniffer/config/agent.config
@@ -83,6 +83,13 @@ agent.ssl_cert_chain_path=${SW_AGENT_SSL_CERT_CHAIN_PATH:}
# Enable the agent kernel services and instrumentation.
agent.enable=${SW_AGENT_ENABLE:true}
+# Enables the Java agent kernel to run in a mode that supports class
re-transformation by other agents.
+# It's recommended to use this mode only if the service has more than one
SkyWalking agent installed.
+#
+# Be aware that this mode can slow down class loading. As a result, you might
experience a higher
+# startup delay (the time it takes for the program to launch and be ready for
use).
+agent.enable_retransform_support={SW_ENABLE_RETRANSFORM_SUPPORT:false}
+
# Limit the length of the ipv4 list size.
osinfo.ipv4_list_size=${SW_AGENT_OSINFO_IPV4_LIST_SIZE:10}
diff --git a/test/plugin/scenarios/retransform-class-scenario/configuration.yml
b/t
(skywalking) branch master updated: Add eclipse-temurin:21-jre as a new image runtime (#11464)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 789df669b0 Add eclipse-temurin:21-jre as a new image runtime (#11464)
789df669b0 is described below
commit 789df669b02db5725879e50e7c9d3482d0fd7343
Author: 吴晟 Wu Sheng
AuthorDate: Fri Oct 27 19:50:13 2023 +0800
Add eclipse-temurin:21-jre as a new image runtime (#11464)
---
.github/workflows/publish-docker.yaml | 5 +
docs/en/changes/changes.md| 2 ++
2 files changed, 7 insertions(+)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 78f6cceefd..1410f39555 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,5 +79,10 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
+ - name: Build and push docker images based on Java 21
+env:
+ SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
+ TAG: ${{ env.TAG }}-java21
+run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 668a114909..00828c2569 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,6 +5,8 @@
* Add distribution/graal module to make preliminary preparations for
supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
+* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
+ eclipse-temurin:21-jre are available for every commit and release.
OAP Server
(skywalking) branch jre-21 deleted (was 0e9da5a056)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jre-21 in repository https://gitbox.apache.org/repos/asf/skywalking.git was 0e9da5a056 Add eclipse-temurin:21-jre as a new image runtime The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) 01/01: Add eclipse-temurin:21-jre as a new image runtime
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch jre-21
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 0e9da5a05676a56485cc3020d5ef0fabbcb00613
Author: Wu Sheng
AuthorDate: Fri Oct 27 18:11:45 2023 +0800
Add eclipse-temurin:21-jre as a new image runtime
---
.github/workflows/publish-docker.yaml | 5 +
docs/en/changes/changes.md| 2 ++
2 files changed, 7 insertions(+)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 78f6cceefd..1410f39555 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,5 +79,10 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
+ - name: Build and push docker images based on Java 21
+env:
+ SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
+ TAG: ${{ env.TAG }}-java21
+run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 668a114909..00828c2569 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,6 +5,8 @@
* Add distribution/graal module to make preliminary preparations for
supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
+* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
+ eclipse-temurin:21-jre are available for every commit and release.
OAP Server
(skywalking) branch jre-21 created (now 0e9da5a056)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jre-21 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 0e9da5a056 Add eclipse-temurin:21-jre as a new image runtime This branch includes the following new commits: new 0e9da5a056 Add eclipse-temurin:21-jre as a new image runtime 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) branch strategy deleted (was b0358981ce)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch strategy in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was b0358981ce Change strategy from POOL_FIRST to HYBRID The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-java) 01/01: Change strategy from POOL_FIRST to HYBRID
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch strategy
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit b0358981ceccceb967f2e702952d7a0f772f5340
Author: Wu Sheng
AuthorDate: Fri Oct 27 17:42:49 2023 +0800
Change strategy from POOL_FIRST to HYBRID
---
.../src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
index 8e0c2495b5..3f92142718 100644
---
a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
+++
b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
@@ -158,7 +158,7 @@ public class SkyWalkingAgent {
SWNativeMethodStrategy nativeMethodStrategy = new
SWNativeMethodStrategy(NAME_TRAIT);
return new SWAgentBuilderDefault(byteBuddy, nativeMethodStrategy)
-.with(AgentBuilder.DescriptionStrategy.Default.POOL_FIRST);
+.with(AgentBuilder.DescriptionStrategy.Default.HYBRID);
}
private static class Transformer implements AgentBuilder.Transformer {
(skywalking-java) branch strategy created (now b0358981ce)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch strategy in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at b0358981ce Change strategy from POOL_FIRST to HYBRID This branch includes the following new commits: new b0358981ce Change strategy from POOL_FIRST to HYBRID 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: Remvoe a deadlink (#11462)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 39d365971b Remvoe a deadlink (#11462) 39d365971b is described below commit 39d365971ba67f7e5701f180ce534ce889fccbaf Author: 吴晟 Wu Sheng AuthorDate: Fri Oct 27 09:39:55 2023 +0800 Remvoe a deadlink (#11462) --- docs/en/setup/backend/storages/mysql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/setup/backend/storages/mysql.md b/docs/en/setup/backend/storages/mysql.md index 3526f2cbb2..11e2829626 100644 --- a/docs/en/setup/backend/storages/mysql.md +++ b/docs/en/setup/backend/storages/mysql.md @@ -22,7 +22,7 @@ storage: ``` All connection-related settings, including URL link, username, and password, are found in `application.yml`. Only part of the settings is listed here. See the [HikariCP](https://github.com/brettwooldridge/HikariCP) connection pool document for full settings. -To understand the function of the parameter `rewriteBatchedStatements=true` in MySQL, see the [MySQL official document](https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-connp-props-performance-extensions.html#cj-conn-prop_rewriteBatchedStatements). +To understand the function of the parameter `rewriteBatchedStatements=true` in MySQL, see the MySQL official document for more details. In theory, all other databases that are compatible with MySQL protocol should be able to use this storage plugin, such as TiDB. Please compose the JDBC URL according to the database's documentation.
[skywalking] branch wu-sheng-patch-1 deleted (was 8e90f38ad0)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git was 8e90f38ad0 Remvoe a deadlink The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] 01/01: Remvoe a deadlink
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 8e90f38ad03dac6e4725f0a1642eb30ea749c4c1 Author: 吴晟 Wu Sheng AuthorDate: Fri Oct 27 09:34:22 2023 +0800 Remvoe a deadlink --- docs/en/setup/backend/storages/mysql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/setup/backend/storages/mysql.md b/docs/en/setup/backend/storages/mysql.md index 3526f2cbb2..11e2829626 100644 --- a/docs/en/setup/backend/storages/mysql.md +++ b/docs/en/setup/backend/storages/mysql.md @@ -22,7 +22,7 @@ storage: ``` All connection-related settings, including URL link, username, and password, are found in `application.yml`. Only part of the settings is listed here. See the [HikariCP](https://github.com/brettwooldridge/HikariCP) connection pool document for full settings. -To understand the function of the parameter `rewriteBatchedStatements=true` in MySQL, see the [MySQL official document](https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-connp-props-performance-extensions.html#cj-conn-prop_rewriteBatchedStatements). +To understand the function of the parameter `rewriteBatchedStatements=true` in MySQL, see the MySQL official document for more details. In theory, all other databases that are compatible with MySQL protocol should be able to use this storage plugin, such as TiDB. Please compose the JDBC URL according to the database's documentation.
[skywalking] branch wu-sheng-patch-1 created (now 8e90f38ad0)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 8e90f38ad0 Remvoe a deadlink This branch includes the following new commits: new 8e90f38ad0 Remvoe a deadlink 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-satellite] branch main updated: Disable dependentbot (#148)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git The following commit(s) were added to refs/heads/main by this push: new dc7bfb7 Disable dependentbot (#148) dc7bfb7 is described below commit dc7bfb7bef38eb2ff43a1f995a8af504a0ebef70 Author: kezhenxu94 AuthorDate: Thu Oct 26 17:28:31 2023 +0800 Disable dependentbot (#148) --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 2870f28..1c879f8 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -30,6 +30,7 @@ github: squash: true merge: false rebase: false + dependabot_updates: false protected_branches: main: required_status_checks:
[skywalking-satellite] branch kezhenxu94-patch-1 deleted (was 1d784e3)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git was 1d784e3 Disable dependentbot The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-cli] branch dbot deleted (was 170079f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch dbot in repository https://gitbox.apache.org/repos/asf/skywalking-cli.git was 170079f Disable dependentbot The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-cli] branch master updated: Disable dependentbot (#196)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-cli.git The following commit(s) were added to refs/heads/master by this push: new 5d0a37c Disable dependentbot (#196) 5d0a37c is described below commit 5d0a37cf942c84ed417be5ca5d24c780c72728aa Author: kezhenxu94 AuthorDate: Thu Oct 26 17:27:33 2023 +0800 Disable dependentbot (#196) --- .asf.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index b8c92c6..2a51aa9 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,6 +28,7 @@ github: squash: true merge: false rebase: false + dependabot_updates: false protected_branches: master: required_status_checks: @@ -36,4 +37,4 @@ github: - Required required_pull_request_reviews: dismiss_stale_reviews: true -required_approving_review_count: 1 \ No newline at end of file +required_approving_review_count: 1
[skywalking-kubernetes-event-exporter] branch main updated: Disable dependentbot (#23)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes-event-exporter.git The following commit(s) were added to refs/heads/main by this push: new 9ad39c4 Disable dependentbot (#23) 9ad39c4 is described below commit 9ad39c47eb347f13c0003d1ecd05c843c6d511ea Author: kezhenxu94 AuthorDate: Thu Oct 26 17:27:05 2023 +0800 Disable dependentbot (#23) --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 8809ba4..ddd932d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,6 +28,7 @@ github: squash: true merge: false rebase: false + dependabot_updates: false protected_branches: main: required_status_checks:
[skywalking-kubernetes-event-exporter] branch kezhenxu94-patch-1 deleted (was 91f0f6c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes-event-exporter.git was 91f0f6c Disable dependentbot The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-infra-e2e] branch kezhenxu94-patch-1 deleted (was 23222b4)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git was 23222b4 Disable dependabot The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-infra-e2e] branch main updated: Disable dependabot (#122)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 8dc634f Disable dependabot (#122) 8dc634f is described below commit 8dc634f0676ae0cd6748081ff08a16c792dcc3db Author: kezhenxu94 AuthorDate: Thu Oct 26 17:24:08 2023 +0800 Disable dependabot (#122) --- .asf.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 107fe13..5c87e16 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -33,7 +33,8 @@ github: required_pull_request_reviews: dismiss_stale_reviews: true required_approving_review_count: 1 + dependabot_updates: false enabled_merge_buttons: squash: true merge: false -rebase: false \ No newline at end of file +rebase: false
[skywalking-go] branch main updated: Disable dependency Bot Pull Requests (#149)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-go.git The following commit(s) were added to refs/heads/main by this push: new d13c94d Disable dependency Bot Pull Requests (#149) d13c94d is described below commit d13c94de8bca98613432ee593d907875b04926c8 Author: mrproliu <741550...@qq.com> AuthorDate: Thu Oct 26 10:42:50 2023 +0800 Disable dependency Bot Pull Requests (#149) --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index b79b6d1..121018f 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -32,6 +32,7 @@ github: squash: true merge: false rebase: false + dependabot_updates: false protected_branches: main: required_status_checks:
[skywalking] branch docs deleted (was 45a0264d15)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch docs in repository https://gitbox.apache.org/repos/asf/skywalking.git was 45a0264d15 Polish docs of `Concepts and Designs` The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] branch master updated: Polish docs of `Concepts and Designs` (#11457)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 7fa06c028b Polish docs of `Concepts and Designs` (#11457) 7fa06c028b is described below commit 7fa06c028b13013c5cc5987e02b747c9402e04b7 Author: 吴晟 Wu Sheng AuthorDate: Thu Oct 26 10:06:33 2023 +0800 Polish docs of `Concepts and Designs` (#11457) --- docs/en/changes/changes.md | 1 + docs/en/concepts-and-designs/backend-overview.md | 5 ++-- docs/en/concepts-and-designs/oal.md| 20 +++-- docs/en/concepts-and-designs/overview.md | 5 ++-- docs/en/concepts-and-designs/probe-introduction.md | 35 +++--- docs/menu.yml | 2 +- 6 files changed, 42 insertions(+), 26 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 8f8480031b..a30321c614 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -51,5 +51,6 @@ * Separate storage docs to different files, and add an estimated timeline for BanyanDB(end of 2023). * Add topology configuration in UI-Grafana doc. * Add missing metrics to the `OpenTelemetry Metrics` doc. +* Polish docs of `Concepts and Designs`. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/193?closed=1) diff --git a/docs/en/concepts-and-designs/backend-overview.md b/docs/en/concepts-and-designs/backend-overview.md index d53440ca69..f68d123884 100644 --- a/docs/en/concepts-and-designs/backend-overview.md +++ b/docs/en/concepts-and-designs/backend-overview.md @@ -4,8 +4,9 @@ SkyWalking is an Observability Analysis Platform that provides full observabilit ## Capabilities SkyWalking covers all 3 areas of observability, including, **Tracing**, **Metrics** and **Logging**. -- **Tracing**. SkyWalking native data formats, including Zipkin v1 and v2, as well as Jaeger. -- **Metrics**. SkyWalking integrates with Service Mesh platforms, such as Istio, Envoy, and Linkerd, to build observability into the data plane +- **Tracing**. SkyWalking native data formats, and Zipkin traces of v1 and v2 formats are supported. +- **Metrics**. SkyWalking supports mature metrics formats, including native meter format, OTEL metrics format, and Telegraf format. +SkyWalking integrates with Service Mesh platforms, typically Istio and Envoy, to build observability into the data plane or control plane. Also, SkyWalking native agents can run in the metrics mode, which greatly improves performances. - **Logging**. Includes logs collected from disk or through network. Native agents could bind the tracing context with logs automatically, or use SkyWalking to bind the trace and log through the text content. diff --git a/docs/en/concepts-and-designs/oal.md b/docs/en/concepts-and-designs/oal.md index 5a0b8d2856..704529a246 100644 --- a/docs/en/concepts-and-designs/oal.md +++ b/docs/en/concepts-and-designs/oal.md @@ -1,13 +1,27 @@ +# Analysis Native Streaming Traces and Service Mesh Traffic + +The traces in SkyWalking native format and Service Mesh Traffic(Access Log in gRPC) are able to be analyzed by OAL, +to build metrics of services, service instances and endpoints, and to build topology/dependency of services, service +instances and endpoints(traces-oriented analysis only). + +The spans of traces relative with RPC, such as HTTP, gRPC, Dubbo, RocketMQ, Kafka, would be converted to service input/output +traffic, like access logs collected from service mesh. Both of those traffic would be cataloged as the defined sources +in the `Observability Analysis Language` engine. + +The metrics are customizable through Observability Analysis Language(OAL) scripts, +and the topology/dependency is built by the SkyWalking OAP kernel automatically without +explicit OAL scripts. + # Observability Analysis Language OAL(Observability Analysis Language) serves to analyze incoming data in streaming mode. OAL focuses on metrics in Service, Service Instance and Endpoint. Therefore, the language is easy to learn and use. - -Since 6.3, the OAL engine is embedded in OAP server runtime as `oal-rt`(OAL Runtime). OAL scripts are now found in the `/config` folder, and users could simply change and reboot the server to run them. -However, the OAL script is a compiled language, and the OAL Runtime generates java codes dynamically. +However, the OAL script is a compiled language, and the OAL Runtime generates java codes dynamically. Don't expect to mount +the changes of those scripts in the runtime. +If your OAP servers are running in a cluster mode, these script defined metrics should be aligned. You can open set `SW_OAL_ENGINE_DEBUG=Y` at system env to see which classes are generated. diff --git a/docs/en/concepts-and-designs/overview.
[skywalking] branch docs created (now 45a0264d15)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch docs in repository https://gitbox.apache.org/repos/asf/skywalking.git at 45a0264d15 Polish docs of `Concepts and Designs` This branch includes the following new commits: new 45a0264d15 Polish docs of `Concepts and Designs` 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: Polish docs of `Concepts and Designs`
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch docs in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 45a0264d150129240b9c514e6375a4c9ac87fcd5 Author: Wu Sheng AuthorDate: Thu Oct 26 09:44:35 2023 +0800 Polish docs of `Concepts and Designs` --- docs/en/changes/changes.md | 1 + docs/en/concepts-and-designs/backend-overview.md | 5 ++-- docs/en/concepts-and-designs/oal.md| 20 +++-- docs/en/concepts-and-designs/overview.md | 5 ++-- docs/en/concepts-and-designs/probe-introduction.md | 35 +++--- docs/menu.yml | 2 +- 6 files changed, 42 insertions(+), 26 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 8f8480031b..a30321c614 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -51,5 +51,6 @@ * Separate storage docs to different files, and add an estimated timeline for BanyanDB(end of 2023). * Add topology configuration in UI-Grafana doc. * Add missing metrics to the `OpenTelemetry Metrics` doc. +* Polish docs of `Concepts and Designs`. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/193?closed=1) diff --git a/docs/en/concepts-and-designs/backend-overview.md b/docs/en/concepts-and-designs/backend-overview.md index d53440ca69..f68d123884 100644 --- a/docs/en/concepts-and-designs/backend-overview.md +++ b/docs/en/concepts-and-designs/backend-overview.md @@ -4,8 +4,9 @@ SkyWalking is an Observability Analysis Platform that provides full observabilit ## Capabilities SkyWalking covers all 3 areas of observability, including, **Tracing**, **Metrics** and **Logging**. -- **Tracing**. SkyWalking native data formats, including Zipkin v1 and v2, as well as Jaeger. -- **Metrics**. SkyWalking integrates with Service Mesh platforms, such as Istio, Envoy, and Linkerd, to build observability into the data plane +- **Tracing**. SkyWalking native data formats, and Zipkin traces of v1 and v2 formats are supported. +- **Metrics**. SkyWalking supports mature metrics formats, including native meter format, OTEL metrics format, and Telegraf format. +SkyWalking integrates with Service Mesh platforms, typically Istio and Envoy, to build observability into the data plane or control plane. Also, SkyWalking native agents can run in the metrics mode, which greatly improves performances. - **Logging**. Includes logs collected from disk or through network. Native agents could bind the tracing context with logs automatically, or use SkyWalking to bind the trace and log through the text content. diff --git a/docs/en/concepts-and-designs/oal.md b/docs/en/concepts-and-designs/oal.md index 5a0b8d2856..704529a246 100644 --- a/docs/en/concepts-and-designs/oal.md +++ b/docs/en/concepts-and-designs/oal.md @@ -1,13 +1,27 @@ +# Analysis Native Streaming Traces and Service Mesh Traffic + +The traces in SkyWalking native format and Service Mesh Traffic(Access Log in gRPC) are able to be analyzed by OAL, +to build metrics of services, service instances and endpoints, and to build topology/dependency of services, service +instances and endpoints(traces-oriented analysis only). + +The spans of traces relative with RPC, such as HTTP, gRPC, Dubbo, RocketMQ, Kafka, would be converted to service input/output +traffic, like access logs collected from service mesh. Both of those traffic would be cataloged as the defined sources +in the `Observability Analysis Language` engine. + +The metrics are customizable through Observability Analysis Language(OAL) scripts, +and the topology/dependency is built by the SkyWalking OAP kernel automatically without +explicit OAL scripts. + # Observability Analysis Language OAL(Observability Analysis Language) serves to analyze incoming data in streaming mode. OAL focuses on metrics in Service, Service Instance and Endpoint. Therefore, the language is easy to learn and use. - -Since 6.3, the OAL engine is embedded in OAP server runtime as `oal-rt`(OAL Runtime). OAL scripts are now found in the `/config` folder, and users could simply change and reboot the server to run them. -However, the OAL script is a compiled language, and the OAL Runtime generates java codes dynamically. +However, the OAL script is a compiled language, and the OAL Runtime generates java codes dynamically. Don't expect to mount +the changes of those scripts in the runtime. +If your OAP servers are running in a cluster mode, these script defined metrics should be aligned. You can open set `SW_OAL_ENGINE_DEBUG=Y` at system env to see which classes are generated. diff --git a/docs/en/concepts-and-designs/overview.md b/docs/en/concepts-and-designs/overview.md index 03da50ff64..6b6f376b9a 100644 --- a/docs/en/concepts-and-designs/overview.md +++ b/docs/en/concepts-and-designs/overview.md @@
[skywalking-go] branch main updated: feat: Add SetComponent() to toolkit-trace (#135)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-go.git
The following commit(s) were added to refs/heads/main by this push:
new 74b6886 feat: Add SetComponent() to toolkit-trace (#135)
74b6886 is described below
commit 74b68861aed04b4d78fcc5b4bcd925113f7de81d
Author: Alipebt <1160756...@qq.com>
AuthorDate: Tue Oct 24 21:22:33 2023 +0800
feat: Add SetComponent() to toolkit-trace (#135)
---
.../advanced-features/manual-apis/toolkit-trace.md | 27 ++
plugins/trace-activation/instrument.go | 5 +++
.../trace-activation/set_component_interceptor.go | 41 +++---
.../scenarios/trace-activation/config/excepted.yml | 11 ++
test/plugins/scenarios/trace-activation/main.go| 1 +
.../scenarios/trace-activation/test_service.go | 6
toolkit/trace/api.go | 3 ++
7 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/docs/en/advanced-features/manual-apis/toolkit-trace.md
b/docs/en/advanced-features/manual-apis/toolkit-trace.md
index 1e0073a..6eeb810 100644
--- a/docs/en/advanced-features/manual-apis/toolkit-trace.md
+++ b/docs/en/advanced-features/manual-apis/toolkit-trace.md
@@ -23,6 +23,21 @@ type ExtractorRef func(headerKey string) (string, error)
type InjectorRef func(headerKey, headerValue string) error
```
+The following demo demonstrates how to pass the Context Carrier in the Tracing
API:
+
+```go
+// create a new entry span and extract the context carrier from the request
+trace.CreateEntrySpan("EntrySpan", func(headerKey string) (string, error) {
+return request.Header.Get(headerKey), nil
+})
+
+// create a new exit span and inject the context carrier into the request
+trace.CreateExitSpan("ExitSpan", request.Host, func(headerKey, headerValue
string) error {
+ request.Header.Add(headerKey, headerValue)
+ return nil
+})
+```
+
### Create Span
Use `trace.CreateEntrySpan()` API to create entry span, and then use `SpanRef`
to contain the reference of created span in agent kernel.
@@ -70,6 +85,18 @@ trace.AddLog(...string)
trace.SetTag("key","value")
```
+### Set ComponentID
+
+Use `trace.SetComponent()` to set the component id of the Span
+
+- the type of parameter is int32.
+
+```go
+trace.SetComponent(ComponentID)
+```
+
+The Component ID in Span is used to identify the current component, which is
declared in the [component libraries
YAML](https://github.com/apache/skywalking/blob/master/oap-server/server-starter/src/main/resources/component-libraries.yml)
from the OAP server side.
+
### Async Prepare/Finish
Use `trace.PrepareAsync()` to make current span still alive until
`trace.AsyncFinish()` called.
diff --git a/plugins/trace-activation/instrument.go
b/plugins/trace-activation/instrument.go
index 1721d3b..f091226 100644
--- a/plugins/trace-activation/instrument.go
+++ b/plugins/trace-activation/instrument.go
@@ -128,6 +128,11 @@ func (i *Instrument) Points() []*instrument.Point {
At:
instrument.NewStaticMethodEnhance("SetCorrelation"),
Interceptor: "SetCorrelationInterceptor",
},
+ {
+ PackagePath: "", PackageName: "trace",
+ At:
instrument.NewStaticMethodEnhance("SetComponent"),
+ Interceptor: "SetComponentInterceptor",
+ },
}
}
diff --git a/test/plugins/scenarios/trace-activation/main.go
b/plugins/trace-activation/set_component_interceptor.go
similarity index 51%
copy from test/plugins/scenarios/trace-activation/main.go
copy to plugins/trace-activation/set_component_interceptor.go
index 2ca47ce..1f1d411 100644
--- a/test/plugins/scenarios/trace-activation/main.go
+++ b/plugins/trace-activation/set_component_interceptor.go
@@ -15,41 +15,24 @@
// specific language governing permissions and limitations
// under the License.
-package main
+package traceactivation
import (
- "net/http"
-
- _ "github.com/apache/skywalking-go"
- "github.com/apache/skywalking-go/toolkit/trace"
+ "github.com/apache/skywalking-go/plugins/core/operator"
+ "github.com/apache/skywalking-go/plugins/core/tracing"
)
-func providerHandler(w http.ResponseWriter, r *http.Request) {
- trace.CreateLocalSpan("testSetCorrelation")
- trace.SetTag("testCorrelation", trace.GetCorrelation("testCorrelation"))
- trace.StopSpan()
+type SetComponentInterceptor struct {
}
-func consumerHandler(w http.ResponseWriter, r *http.Request) {
- testTag()
- testLog()
- testGetSegmentID()
- testGetSpanID()
- testGetTraceID()
-
[skywalking-java] branch main updated: fix CVE-2023-4586 (#632)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 c94b409b28 fix CVE-2023-4586 (#632) c94b409b28 is described below commit c94b409b2819aec81b49b90d1974bfa54900faaa Author: alan <252491...@qq.com> AuthorDate: Tue Oct 24 19:28:02 2023 +0800 fix CVE-2023-4586 (#632) Co-authored-by: za-liuyonghua --- CHANGES.md| 1 + dist-material/LICENSE | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index eab5a4afde..96a55eaaa1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ Release Notes. * To compatible upper and lower case Oracle TNS url parse. * Fix config length limitation. * Support collecting ZGC memory pool metrics. Require OAP 9.7.0 to support these new metrics. +* Upgrade netty-codec-http2 to 4.1.100.Final Documentation diff --git a/dist-material/LICENSE b/dist-material/LICENSE index 27cdba1bdb..f8a5552565 100755 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -221,7 +221,7 @@ The text of each license is the standard Apache 2.0 license. Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0 Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0 Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0 -netty 4.1.94: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 +netty 4.1.100: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 BSD licenses diff --git a/pom.xml b/pom.xml index 828041e9ee..3182775be8 100755 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 1.14.4 1.50.0 -4.1.94.Final +4.1.100.Final 2.8.9 1.6.2 0.6.1
[skywalking] branch master updated: Add a component ID for Fiber (ID=5021) (#11450)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 1706020f30 Add a component ID for Fiber (ID=5021) (#11450) 1706020f30 is described below commit 1706020f3035b53f46417e00b7dc2a0b28cae6df Author: Starry AuthorDate: Tue Oct 24 08:36:47 2023 +0800 Add a component ID for Fiber (ID=5021) (#11450) --- docs/en/changes/changes.md | 1 + oap-server/server-starter/src/main/resources/component-libraries.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index b20a69ac6a..8f8480031b 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -28,6 +28,7 @@ * Fix AlarmRule expression validation: add labeled metrics mock data for check. * Support collect ZGC memory pool metrics. * Add a component ID for Netty-http (ID=151). +* Add a component ID for Fiber (ID=5021). UI diff --git a/oap-server/server-starter/src/main/resources/component-libraries.yml b/oap-server/server-starter/src/main/resources/component-libraries.yml index 692137430d..1e845ec150 100644 --- a/oap-server/server-starter/src/main/resources/component-libraries.yml +++ b/oap-server/server-starter/src/main/resources/component-libraries.yml @@ -644,6 +644,9 @@ GoFastHttpClient: GoFastHttpServer: id: 5020 language: Golang +Fiber: + id: 5021 + language: Golang # Lua components # [6000, 7000) for Lua agent
[skywalking] branch master updated: Sync UI (#11448)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 f38a874355 Sync UI (#11448) f38a874355 is described below commit f38a87435593226cd34d644b1e197f4bd31d032b Author: 吴晟 Wu Sheng AuthorDate: Mon Oct 23 20:11:38 2023 +0800 Sync UI (#11448) --- docs/en/changes/changes.md | 6 +- skywalking-ui | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 89cfbe0e4a..b20a69ac6a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -38,8 +38,12 @@ * Refactor: update pagination style. No visualization style change. * Apply MQE on K8s layer UI-templates. * Fix icons display in trace tree diagram. -* fix: update tooltip style to support multiple metrics scrolling view in a metrics graph. +* Fix: update tooltip style to support multiple metrics scrolling view in a metrics graph. * Add a new widget to show jvm memory pool detail. +* Fix: avoid querying data with empty parameters. +* Add a title and a description for trace segments. +* Add Netty icon for Netty HTTP plugin. +* Add Pulsar menu i18n files. Documentation diff --git a/skywalking-ui b/skywalking-ui index 1be2792ff4..d2eae87957 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 1be2792ff46547fafe5b554b0cd4f086dd8d02b7 +Subproject commit d2eae879573ae657d230aea651de83432aace87c
[skywalking] branch ui-sync updated: Add change logs.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch ui-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/ui-sync by this push: new c515f41ee3 Add change logs. c515f41ee3 is described below commit c515f41ee3dc3a8ac2d352faaf27881732de73d6 Author: Wu Sheng AuthorDate: Mon Oct 23 19:08:17 2023 +0800 Add change logs. --- docs/en/changes/changes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 172529fe1a..b20a69ac6a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -41,7 +41,9 @@ * Fix: update tooltip style to support multiple metrics scrolling view in a metrics graph. * Add a new widget to show jvm memory pool detail. * Fix: avoid querying data with empty parameters. -* Add a title and a description for trace segments +* Add a title and a description for trace segments. +* Add Netty icon for Netty HTTP plugin. +* Add Pulsar menu i18n files. Documentation
[skywalking] branch ui-sync updated: Submit submodule
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch ui-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/ui-sync by this push: new f4e79553e6 Submit submodule f4e79553e6 is described below commit f4e79553e67cdcdde71854fa224b314bfa405d26 Author: Wu Sheng AuthorDate: Mon Oct 23 19:06:41 2023 +0800 Submit submodule --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 1be2792ff4..d2eae87957 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 1be2792ff46547fafe5b554b0cd4f086dd8d02b7 +Subproject commit d2eae879573ae657d230aea651de83432aace87c
[skywalking] 01/01: Sync UI
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch ui-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git commit c955462065ee8c5907c73b984a2a37dd4e19f055 Author: Wu Sheng AuthorDate: Mon Oct 23 17:55:49 2023 +0800 Sync UI --- docs/en/changes/changes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 89cfbe0e4a..172529fe1a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -38,8 +38,10 @@ * Refactor: update pagination style. No visualization style change. * Apply MQE on K8s layer UI-templates. * Fix icons display in trace tree diagram. -* fix: update tooltip style to support multiple metrics scrolling view in a metrics graph. +* Fix: update tooltip style to support multiple metrics scrolling view in a metrics graph. * Add a new widget to show jvm memory pool detail. +* Fix: avoid querying data with empty parameters. +* Add a title and a description for trace segments Documentation
[skywalking] branch ui-sync created (now c955462065)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ui-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git at c955462065 Sync UI This branch includes the following new commits: new c955462065 Sync UI 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: Add missing metrics to the `OpenTelemetry Metrics` doc. (#11446)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 6d85b931b9 Add missing metrics to the `OpenTelemetry Metrics` doc. (#11446) 6d85b931b9 is described below commit 6d85b931b9e3eaba7cee2be1f2b81ec60dd371b0 Author: Wan Kai AuthorDate: Mon Oct 23 15:21:38 2023 +0800 Add missing metrics to the `OpenTelemetry Metrics` doc. (#11446) --- docs/en/changes/changes.md | 2 +- docs/en/setup/backend/opentelemetry-receiver.md | 45 +++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 3f4b445234..89cfbe0e4a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -45,6 +45,6 @@ * Separate storage docs to different files, and add an estimated timeline for BanyanDB(end of 2023). * Add topology configuration in UI-Grafana doc. - +* Add missing metrics to the `OpenTelemetry Metrics` doc. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/193?closed=1) diff --git a/docs/en/setup/backend/opentelemetry-receiver.md b/docs/en/setup/backend/opentelemetry-receiver.md index ddbe586f2f..1c82c45529 100644 --- a/docs/en/setup/backend/opentelemetry-receiver.md +++ b/docs/en/setup/backend/opentelemetry-receiver.md @@ -26,21 +26,32 @@ The receiver adds label with key `node_identifier_host_name` to the collected da and its value is from `net.host.name` (or `host.name` for some OTLP versions) resource attributes defined in OpenTelemetry proto, for identification of the metric data. -| Description | Configuration File | Data Source | -|-||---| -| Metrics of Istio Control Plane | otel-rules/istio-controlplane.yaml | Istio Control Plane -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of SkyWalking OAP server itself | otel-rules/oap.yaml | SkyWalking OAP Server(SelfObservability) -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of VMs | otel-rules/vm.yaml | Prometheus node-exporter(VMs) -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server| -| Metrics of K8s cluster | otel-rules/k8s/k8s-cluster.yaml | K8s kube-state-metrics -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of K8s cluster | otel-rules/k8s/k8s-node.yaml | cAdvisor & K8s kube-state-metrics -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server| -| Metrics of K8s cluster | otel-rules/k8s/k8s-service.yaml | cAdvisor & K8s kube-state-metrics -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server| -| Metrics of MYSQL| otel-rules/mysql/mysql-instance.yaml | prometheus/mysqld_exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of MYSQL| otel-rules/mysql/mysql-service.yaml| prometheus/mysqld_exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of PostgreSQL | otel-rules/postgresql/postgresql-instance.yaml | postgres_exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of PostgreSQL | otel-rules/postgresql/postgresql-service.yaml | postgres_exporter -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of Apache APISIX| otel-rules/apisix.yaml | apisix prometheus plugin -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of AWS Cloud EKS| otel-rules/aws-eks/eks-cluster.yaml| AWS Container Insights Receiver -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP Server | -| Metrics of AWS Cloud EKS| otel-rules/aws-eks/eks-service.yaml| AWS Container Insights Receiver -> OpenTelemetry Collector -- OTLP exporter --> SkyWalking OAP
[skywalking-java] branch main updated: [DOCS] Corrected an issue using misspelled words in Native Tracer (#626)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 45993545e9 [DOCS] Corrected an issue using misspelled words in Native
Tracer (#626)
45993545e9 is described below
commit 45993545e97c955c5558f61a50ac00ea9d55ab3c
Author: Ricky Lau
AuthorDate: Mon Oct 23 10:49:21 2023 +0800
[DOCS] Corrected an issue using misspelled words in Native Tracer (#626)
---
docs/en/setup/service-agent/java-agent/Application-toolkit-tracer.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/docs/en/setup/service-agent/java-agent/Application-toolkit-tracer.md
b/docs/en/setup/service-agent/java-agent/Application-toolkit-tracer.md
index df6a001a93..1a18134509 100644
--- a/docs/en/setup/service-agent/java-agent/Application-toolkit-tracer.md
+++ b/docs/en/setup/service-agent/java-agent/Application-toolkit-tracer.md
@@ -6,7 +6,7 @@
import org.apache.skywalking.apm.toolkit.trace.Tracer;
...
- SpanRef spanRef = Tracer.createEnteySpan("${operationName}", null);
+ SpanRef spanRef = Tracer.createEntrySpan("${operationName}", null);
```
* Use `Tracer.createLocalSpan()` API to create local span, the only parameter
is the operation name of span.
[skywalking-website] branch master updated: Release Go Agent v0.3.0 (#649)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 877a9b6ed88 Release Go Agent v0.3.0 (#649) 877a9b6ed88 is described below commit 877a9b6ed88f734592eaeb6e34d042f51e8d48fb Author: mrproliu <741550...@qq.com> AuthorDate: Mon Oct 23 10:41:10 2023 +0800 Release Go Agent v0.3.0 (#649) --- .../release-apache-skwaylking-go-0.3.0/index.md| 25 ++ data/docs.yml | 6 +++--- data/releases.yml | 20 - 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/content/events/release-apache-skwaylking-go-0.3.0/index.md b/content/events/release-apache-skwaylking-go-0.3.0/index.md new file mode 100644 index 000..b8f869f5801 --- /dev/null +++ b/content/events/release-apache-skwaylking-go-0.3.0/index.md @@ -0,0 +1,25 @@ +--- +title: Release Apache SkyWalking Go 0.3.0 +date: 2023-10-23 +author: SkyWalking Team +description: "Release Apache SkyWalking Go 0.3.0" +--- + +SkyWalking Go 0.3.0 is released. Go to [downloads](https://skywalking.apache.org/downloads) page to find release tars. + + Features +* Support manual tracing APIs for users. + + Plugins +* Support [mux](https://github.com/gorilla/mux) HTTP server framework. +* Support [grpc](https://github.com/grpc/grpc-go) server and client framework. +* Support [iris](https://github.com/kataras/iris) framework. + + Documentation +* Add `Tracing APIs` document into `Manual APIs`. + + Bug Fixes + + Issues and PR +- All issues are [here](https://github.com/apache/skywalking/milestone/189?closed=1) +- All and pull requests are [here](https://github.com/apache/skywalking-go/milestone/3?closed=1) \ No newline at end of file diff --git a/data/docs.yml b/data/docs.yml index 18c578e5307..76d84f78d6b 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -138,9 +138,9 @@ docs: - version: Next link: /docs/skywalking-go/next/readme/ -- version: v0.2.0 - link: /docs/skywalking-go/v0.2.0/readme/ - commitId: 637845b76c9949a495a14ecf0e7e2f0e385701c8 +- version: v0.3.0 + link: /docs/skywalking-go/v0.3.0/readme/ + commitId: 316433e71808ec6a130e81c287caa8b2a98f45a5 - name: Rust Agent icon: sw-rust diff --git a/data/releases.yml b/data/releases.yml index 462c1f2670a..05af8a739d4 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -268,25 +268,25 @@ icon: skywalking-go description: The Go Agent for Apache SkyWalking, which provides the native tracing/metrics/logging abilities for Golang projects. source: -- version: v0.2.0 - date: Jul. 31th, 2023 +- version: v0.3.0 + date: Oct. 23th, 2023 downloadLink: - name: src - link: https://www.apache.org/dyn/closer.cgi/skywalking/go/0.2.0/apache-skywalking-go-0.2.0-src.tgz + link: https://www.apache.org/dyn/closer.cgi/skywalking/go/0.3.0/apache-skywalking-go-0.3.0-src.tgz - name: asc - link: https://downloads.apache.org/skywalking/go/0.2.0/apache-skywalking-go-0.2.0-src.tgz.asc + link: https://downloads.apache.org/skywalking/go/0.3.0/apache-skywalking-go-0.3.0-src.tgz.asc - name: sha512 - link: https://downloads.apache.org/skywalking/go/0.2.0/apache-skywalking-go-0.2.0-src.tgz.sha512 + link: https://downloads.apache.org/skywalking/go/0.3.0/apache-skywalking-go-0.3.0-src.tgz.sha512 distribution: -- version: v0.2.0 - date: Jul. 31th, 2023 +- version: v0.3.0 + date: Oct. 23th, 2023 downloadLink: - name: tar - link: https://www.apache.org/dyn/closer.cgi/skywalking/go/0.2.0/apache-skywalking-go-0.2.0-bin.tgz + link: https://www.apache.org/dyn/closer.cgi/skywalking/go/0.3.0/apache-skywalking-go-0.3.0-bin.tgz - name: asc - link: https://downloads.apache.org/skywalking/go/0.2.0/apache-skywalking-go-0.2.0-bin.tgz.asc + link: https://downloads.apache.org/skywalking/go/0.3.0/apache-skywalking-go-0.3.0-bin.tgz.asc - name: sha512 - link: https://downloads.apache.org/skywalking/go/0.2.0/apache-skywalking-go-0.2.0-bin.tgz.sha512 + link: https://downloads.apache.org/skywalking/go/0.3.0/apache-skywalking-go-0.3.0-bin.tgz.sha512 - name: NodeJS Agent icon: nodejs-agent
[skywalking-booster-ui] branch main updated: fix: avoid querying data with empty parameters (#331)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new d9064e8b fix: avoid querying data with empty parameters (#331)
d9064e8b is described below
commit d9064e8b45ae3a31b9606b63b4411d1ccdc7aa93
Author: Fine0830
AuthorDate: Mon Oct 23 10:37:43 2023 +0800
fix: avoid querying data with empty parameters (#331)
* fix: Avoid querying data with empty parameters
---
src/store/modules/topology.ts | 11 ++-
.../dashboard/related/topology/components/utils/layout.ts | 3 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/store/modules/topology.ts b/src/store/modules/topology.ts
index 74bc7e15..6a12f252 100644
--- a/src/store/modules/topology.ts
+++ b/src/store/modules/topology.ts
@@ -191,6 +191,9 @@ export const topologyStore = defineStore({
}
},
async getServicesTopology(serviceIds: string[]) {
+ if (!serviceIds.length) {
+return new Promise((resolve) => resolve({}));
+ }
const duration = useAppStoreWithOut().durationTime;
const res: AxiosResponse = await
graphql.query("getServicesTopology").params({
serviceIds,
@@ -207,7 +210,7 @@ export const topologyStore = defineStore({
const clientServiceId = (currentDestService && currentDestService.id) ||
"";
const duration = useAppStoreWithOut().durationTime;
if (!(serverServiceId && clientServiceId)) {
-return;
+return new Promise((resolve) => resolve({}));
}
const res: AxiosResponse = await
graphql.query("getInstanceTopology").params({
clientServiceId,
@@ -220,6 +223,9 @@ export const topologyStore = defineStore({
return res.data;
},
async updateEndpointTopology(endpointIds: string[], depth: number) {
+ if (!endpointIds.length) {
+return new Promise((resolve) => resolve({}));
+ }
const res = await this.getEndpointTopology(endpointIds);
if (depth > 1) {
const ids = res.nodes.map((item: Node) => item.id).filter((d: string)
=> !endpointIds.includes(d));
@@ -285,6 +291,9 @@ export const topologyStore = defineStore({
}
},
async getEndpointTopology(endpointIds: string[]) {
+ if (!endpointIds.length) {
+return new Promise((resolve) => resolve({}));
+ }
const duration = useAppStoreWithOut().durationTime;
const variables = ["$duration: Duration!"];
const fragment = endpointIds.map((id: string, index: number) => {
diff --git a/src/views/dashboard/related/topology/components/utils/layout.ts
b/src/views/dashboard/related/topology/components/utils/layout.ts
index 0ac2e567..27b8073d 100644
--- a/src/views/dashboard/related/topology/components/utils/layout.ts
+++ b/src/views/dashboard/related/topology/components/utils/layout.ts
@@ -19,7 +19,8 @@ import type { Node, Call } from "@/types/topology";
export function layout(levels: Node[][], calls: Call[], radius: number) {
// precompute level depth
- levels.forEach((l: Node[], i: number) => l.forEach((n: any) => (n.level =
i)));
+ console.log(levels);
+ levels.forEach((l: Node[], i: number) => l.forEach((n: any) => n && (n.level
= i)));
const nodes: Node[] = levels.reduce((a, x) => a.concat(x), []);
// layout
[skywalking-website] branch banyandb-0.5.0 deleted (was b4cd6075c5b)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch banyandb-0.5.0 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was b4cd6075c5b Release BanyanDB 0.5.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-website] branch master updated: Release BanyanDB 0.5.0 (#648)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 89d255cf099 Release BanyanDB 0.5.0 (#648) 89d255cf099 is described below commit 89d255cf09984e59a173c9390fe6623d8fd56ed3 Author: Gao Hongtao AuthorDate: Mon Oct 23 09:15:42 2023 +0800 Release BanyanDB 0.5.0 (#648) --- .../index.md | 37 ++ data/docs.yml | 6 ++-- data/releases.yml | 20 ++-- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/content/events/release-apache-skywalking-banyandb-0-5-0/index.md b/content/events/release-apache-skywalking-banyandb-0-5-0/index.md new file mode 100644 index 000..ed092a63a18 --- /dev/null +++ b/content/events/release-apache-skywalking-banyandb-0-5-0/index.md @@ -0,0 +1,37 @@ +--- +title: Release Apache SkyWalking BanyanDB 0.5.0 +date: 2023-10-23 +author: SkyWalking Team +--- + +SkyWalking BanyanDB 0.5.0 is released. Go to [downloads](/downloads) page to find release tars. + +### Features + +- List all properties in a group. +- Implement Write-ahead Logging +- Document the clustering. +- Support multiple roles for banyand server. +- Support for recovery buffer using wal. +- Register the node role to the metadata registry. +- Implement the remote queue to spreading data to data nodes. +- Fix parse environment variables error +- Implement the distributed query engine. +- Add mod revision check to write requests. +- Add TTL to the property. +- Implement node selector (e.g. PickFirst Selector, Maglev Selector). +- Unified the buffers separated in blocks to a single buffer in the shard. + +### Bugs + +- BanyanDB ui unable to load icon. +- BanyanDB ui type error +- Fix timer not released +- BanyanDB ui misses fields when creating a group +- Fix data duplicate writing +- Syncing metadata change events from etcd instead of a local channel. + +### Chores + +- Bump several dependencies and tools. +- Drop redundant "discovery" module from banyand. "metadata" module is enough to play the node and shard discovery role. diff --git a/data/docs.yml b/data/docs.yml index 6f57291762b..18c578e5307 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -300,9 +300,9 @@ docs: - version: Next link: /docs/skywalking-banyandb/next/readme/ -- version: v0.4.0 - link: /docs/skywalking-banyandb/v0.4.0/readme/ - commitId: df34a83663d66af9687ff484884ceae669c83980 +- version: v0.5.0 + link: /docs/skywalking-banyandb/v0.5.0/readme/ + commitId: 84f32b3969cdcc676aaee428383b34b3b67dbdf5 - name: BanyanDB Java Client icon: banyan-db description: The client implementation for SkyWalking BanyanDB in Java diff --git a/data/releases.yml b/data/releases.yml index c2a2da4c38f..462c1f2670a 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -552,25 +552,25 @@ icon: banyan-db description: The BanyanDB Server source: -- version: v0.4.0 - date: July 2th, 2023 +- version: v0.5.0 + date: Oct 23th, 2023 downloadLink: - name: src - link: https://www.apache.org/dyn/closer.cgi/skywalking/banyandb/0.4.0/skywalking-banyandb-0.4.0-src.tgz + link: https://www.apache.org/dyn/closer.cgi/skywalking/banyandb/0.5.0/skywalking-banyandb-0.5.0-src.tgz - name: asc - link: https://downloads.apache.org/skywalking/banyandb/0.4.0/skywalking-banyandb-0.4.0-src.tgz.asc + link: https://downloads.apache.org/skywalking/banyandb/0.5.0/skywalking-banyandb-0.5.0-src.tgz.asc - name: sha512 - link: https://downloads.apache.org/skywalking/banyandb/0.4.0/skywalking-banyandb-0.4.0-src.tgz.sha512 + link: https://downloads.apache.org/skywalking/banyandb/0.5.0/skywalking-banyandb-0.5.0-src.tgz.sha512 distribution: -- version: v0.4.0 - date: July 2th, 2023 +- version: v0.5.0 + date: Oct 23th, 2023 downloadLink: - name: tar - link: https://www.apache.org/dyn/closer.cgi/skywalking/banyandb/0.4.0/skywalking-banyandb-0.4.0-bin.tgz + link: https://www.apache.org/dyn/closer.cgi/skywalking/banyandb/0.5.0/skywalking-banyandb-0.5.0-bin.tgz - name: asc - link: https://downloads.apache.org/skywalking/banyandb/0.4.0/skywalking-banyandb-0.4.0-bin.tgz.asc + link: https://downloads.apache.org/skywalking/banyandb/0.5.0/skywalking-banyandb-0.5.0-bin.tgz.asc - name: sha512 - link: https://downloads.apache.org/skywalking/banyandb/0.4.0/skywalking-banyandb-0.4.0-bin.tgz.sha512 +
[skywalking-booster-ui] branch main updated: add a netty icon (#330)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git The following commit(s) were added to refs/heads/main by this push: new 6fb4f074 add a netty icon (#330) 6fb4f074 is described below commit 6fb4f074c12f999cea72b00953009abd7b16bf53 Author: peachisai <96932958+peachi...@users.noreply.github.com> AuthorDate: Sat Oct 21 22:46:17 2023 +0800 add a netty icon (#330) --- src/assets/img/technologies/NETTYHTTP.png | Bin 0 -> 4395 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/assets/img/technologies/NETTYHTTP.png b/src/assets/img/technologies/NETTYHTTP.png new file mode 100644 index ..739aaacd Binary files /dev/null and b/src/assets/img/technologies/NETTYHTTP.png differ
[skywalking] branch master updated: Add a component ID for Netty (#11442)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 fac8309e13 Add a component ID for Netty (#11442) fac8309e13 is described below commit fac8309e13311c4455d39d906aae96c46bb5c5ed Author: peachisai <96932958+peachi...@users.noreply.github.com> AuthorDate: Sat Oct 21 20:39:26 2023 +0800 Add a component ID for Netty (#11442) --- docs/en/changes/changes.md | 1 + oap-server/server-starter/src/main/resources/component-libraries.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index a5715bae9f..3f4b445234 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -27,6 +27,7 @@ * Fix `WebhookCallback` send incorrect messages, add catch exception for each callback HTTP Post. * Fix AlarmRule expression validation: add labeled metrics mock data for check. * Support collect ZGC memory pool metrics. +* Add a component ID for Netty-http (ID=151). UI diff --git a/oap-server/server-starter/src/main/resources/component-libraries.yml b/oap-server/server-starter/src/main/resources/component-libraries.yml index 930b5452a7..692137430d 100644 --- a/oap-server/server-starter/src/main/resources/component-libraries.yml +++ b/oap-server/server-starter/src/main/resources/component-libraries.yml @@ -502,6 +502,9 @@ Aerospike: Nacos: id: 150 languages: Java +Netty-http: + id: 151 + languages: Java # .NET/.NET Core components
[skywalking-booster-ui] branch main updated: feat(pulsar): add new menu for pulsar monitoring (#329)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new f88c8a97 feat(pulsar): add new menu for pulsar monitoring (#329)
f88c8a97 is described below
commit f88c8a97717fbf0d3a6c756686b1534385424262
Author: Xiangying Meng <55571188+liangyepianz...@users.noreply.github.com>
AuthorDate: Sat Oct 21 16:45:57 2023 +0800
feat(pulsar): add new menu for pulsar monitoring (#329)
---
src/locales/lang/menus/en.ts | 2 ++
src/locales/lang/menus/es.ts | 2 ++
src/locales/lang/menus/zh.ts | 2 ++
3 files changed, 6 insertions(+)
diff --git a/src/locales/lang/menus/en.ts b/src/locales/lang/menus/en.ts
index 307aca50..6b70e681 100644
--- a/src/locales/lang/menus/en.ts
+++ b/src/locales/lang/menus/en.ts
@@ -111,6 +111,8 @@ const titles = {
mq_rabbitmq_desc: "Provide RabbitMQ monitoring through OpenTelemetry's
Prometheus Receiver.",
mq_kafka: "Kafka",
mq_kafka_desc: "Provide Kafka monitoring through OpenTelemetry's Prometheus
Receiver.",
+ mq_pulsar: "Pulsar",
+ mq_pulsar_desc: "Provide Pulsar monitoring through OpenTelemetry's
Prometheus Receiver.",
// self observability
self_observability: "Self Observability",
self_observability_desc:
diff --git a/src/locales/lang/menus/es.ts b/src/locales/lang/menus/es.ts
index fddc218f..cd02e856 100644
--- a/src/locales/lang/menus/es.ts
+++ b/src/locales/lang/menus/es.ts
@@ -111,6 +111,8 @@ const titles = {
mq_rabbitmq_desc: "Provide RabbitMQ monitoring through OpenTelemetry's
Prometheus Receiver.",
mq_kafka: "Kafka",
mq_kafka_desc: "Provide Kafka monitoring through OpenTelemetry's Prometheus
Receiver.",
+ mq_pulsar: "Pulsar",
+ mq_pulsar_desc: "Provide Pulsar monitoring through OpenTelemetry's
Prometheus Receiver.",
// self observability
self_observability: "Self Observability",
self_observability_desc:
diff --git a/src/locales/lang/menus/zh.ts b/src/locales/lang/menus/zh.ts
index 4c5c2c0b..65a84cbd 100644
--- a/src/locales/lang/menus/zh.ts
+++ b/src/locales/lang/menus/zh.ts
@@ -98,6 +98,8 @@ const titles = {
mq_rabbitmq_desc: "通过OpenTelemetry的Prometheus接收器提供RabbitMQ监控。",
mq_kafka: "Kafka",
mq_Kafka_desc: "通过OpenTelemetry的Prometheus接收器提供Kafka监控。",
+ mq_pulsar: "Pulsar",
+ mq_Pulsar_desc: "通过OpenTelemetry的Prometheus接收器提供Pulsar监控。",
// self observability
self_observability: "自监控",
self_observability_desc: "自观察性为运行SkyWalking生态系统中的组件和服务器提供了可观察性。",
[skywalking] branch master updated: chore: add a grafana dashboard tag name for filter (#11441)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 0911f44ca5 chore: add a grafana dashboard tag name for filter (#11441)
0911f44ca5 is described below
commit 0911f44ca597776efaab6bd81d17049b77ad
Author: Rick <1450685+linuxsu...@users.noreply.github.com>
AuthorDate: Fri Oct 20 18:52:59 2023 +0800
chore: add a grafana dashboard tag name for filter (#11441)
---
docs/en/setup/backend/grafana-cluster.json | 4 +++-
docs/en/setup/backend/grafana-instance.json | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/docs/en/setup/backend/grafana-cluster.json
b/docs/en/setup/backend/grafana-cluster.json
index ba99a904cd..6235427152 100644
--- a/docs/en/setup/backend/grafana-cluster.json
+++ b/docs/en/setup/backend/grafana-cluster.json
@@ -4373,7 +4373,9 @@
"refresh": false,
"schemaVersion": 21,
"style": "dark",
- "tags": [],
+ "tags": [
+"skywalking"
+ ],
"templating": {
"list": [
{
diff --git a/docs/en/setup/backend/grafana-instance.json
b/docs/en/setup/backend/grafana-instance.json
index 874595a593..c39217ffc9 100644
--- a/docs/en/setup/backend/grafana-instance.json
+++ b/docs/en/setup/backend/grafana-instance.json
@@ -4964,7 +4964,9 @@
"refresh": "",
"schemaVersion": 21,
"style": "dark",
- "tags": [],
+ "tags": [
+"skywalking"
+ ],
"templating": {
"list": [
{
[skywalking-java] branch wu-sheng-patch-1 deleted (was fefa3d5a12)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was fefa3d5a12 Add OAP version requirement The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-java] branch main updated: Add OAP version requirement (#624)
This is an automated email from the ASF dual-hosted git repository. wusheng 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 88b4b5c930 Add OAP version requirement (#624) 88b4b5c930 is described below commit 88b4b5c930d5c72069f226e349d5b386554044f5 Author: 吴晟 Wu Sheng AuthorDate: Fri Oct 20 17:58:24 2023 +0800 Add OAP version requirement (#624) --- docs/en/setup/service-agent/java-agent/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/setup/service-agent/java-agent/README.md b/docs/en/setup/service-agent/java-agent/README.md index d0ace7c3fe..f457913c83 100755 --- a/docs/en/setup/service-agent/java-agent/README.md +++ b/docs/en/setup/service-agent/java-agent/README.md @@ -8,6 +8,8 @@ 1. Add `-javaagent:/path/to/skywalking-package/agent/skywalking-agent.jar` to JVM argument. And make sure to add it before the `-jar` argument. +**Require SkyWalking OAP server 9.7.0+ if the agent works on the JRE using ZGC.** + The agent release dist is included in Apache [official release](http://skywalking.apache.org/downloads/). New agent package looks like this.
