(skywalking-client-js) branch dependabot/npm_and_yarn/follow-redirects-1.15.4 deleted (was f68c1b7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/follow-redirects-1.15.4 in repository https://gitbox.apache.org/repos/asf/skywalking-client-js.git was f68c1b7 build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4 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-client-js) branch master updated: build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4 (#120)
This is an automated email from the ASF dual-hosted git repository.
qiuxiafan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-client-js.git
The following commit(s) were added to refs/heads/master by this push:
new 162286a build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4
(#120)
162286a is described below
commit 162286a78a6715a59e7c4587dcbeafd09b349975
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 10 15:09:45 2024 +0800
build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4 (#120)
---
package-lock.json | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 18292a9..b3c3860 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
"packages": {
"": {
"name": "skywalking-client-js",
- "version": "0.10.0",
+ "version": "0.11.0",
"license": "Apache 2.0",
"dependencies": {
"js-base64": "^3.6.0"
@@ -1859,9 +1859,9 @@
"dev": true
},
"node_modules/follow-redirects": {
- "version": "1.15.2",
- "resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz;,
- "integrity":
"sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+ "version": "1.15.4",
+ "resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz;,
+ "integrity":
"sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
"dev": true,
"funding": [
{
@@ -6387,9 +6387,9 @@
}
},
"follow-redirects": {
- "version": "1.15.2",
- "resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz;,
- "integrity":
"sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+ "version": "1.15.4",
+ "resolved":
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz;,
+ "integrity":
"sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
"dev": true
},
"forwarded": {
Re: [PR] build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4 [skywalking-client-js]
Fine0830 merged PR #120: URL: https://github.com/apache/skywalking-client-js/pull/120 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4 [skywalking-client-js]
dependabot[bot] opened a new pull request, #120: URL: https://github.com/apache/skywalking-client-js/pull/120 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4. Commits https://github.com/follow-redirects/follow-redirects/commit/65858205e59f1e23c9bf173348a7a7cbb8ac47f5;>6585820 Release version 1.15.4 of the npm package. https://github.com/follow-redirects/follow-redirects/commit/7a6567e16dfa9ad18a70bfe91784c28653fbf19d;>7a6567e Disallow bracketed hostnames. https://github.com/follow-redirects/follow-redirects/commit/05629af696588b90d64e738bc2e809a97a5f92fc;>05629af Prefer native URL instead of deprecated url.parse. https://github.com/follow-redirects/follow-redirects/commit/1cba8e85fa73f563a439fe460cf028688e4358df;>1cba8e8 Prefer native URL instead of legacy url.resolve. https://github.com/follow-redirects/follow-redirects/commit/72bc2a4229bc18dc9fbd57c60579713e6264cb92;>72bc2a4 Simplify _processResponse error handling. https://github.com/follow-redirects/follow-redirects/commit/3d42aecdca39b144a0a2f27ea134b4cf67dd796a;>3d42aec Add bracket tests. https://github.com/follow-redirects/follow-redirects/commit/bcbb096b32686ecad6cd34235358ed6f2217d4f0;>bcbb096 Do not directly set Error properties. https://github.com/follow-redirects/follow-redirects/commit/192dbe7ce671ecad813c074bffe3b3f5d3680fee;>192dbe7 Release version 1.15.3 of the npm package. https://github.com/follow-redirects/follow-redirects/commit/bd8c81e4f32d12f28a35d265f88b1716703687c6;>bd8c81e Fix resource leak on destroy. https://github.com/follow-redirects/follow-redirects/commit/9c728c314b06f9595dcd7f245d40731e8a27d79f;>9c728c3 Split linting and testing. Additional commits viewable in https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/skywalking-client-js/network/alerts). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-client-js) branch dependabot/npm_and_yarn/follow-redirects-1.15.4 created (now f68c1b7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/follow-redirects-1.15.4 in repository https://gitbox.apache.org/repos/asf/skywalking-client-js.git at f68c1b7 build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.4 No new revisions were added by this update.
Re: [I] [Feature] support jedis-5.x [skywalking]
wu-sheng closed issue #11747: [Feature] support jedis-5.x URL: https://github.com/apache/skywalking/issues/11747 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] support jedis-5.x [skywalking]
wu-sheng commented on issue #11747: URL: https://github.com/apache/skywalking/issues/11747#issuecomment-1884285601 We are open to new plugin contributions. If you want to submit a new one, welcome. But for issue tracker, unless you are going to submit one in short term, we wouldn't keep this one open. Too many kind of requests could be opened. It is hard to follow. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] skywalking-go enhance method reports error [skywalking]
wu-sheng closed issue #11739: [Bug] skywalking-go enhance method reports error URL: https://github.com/apache/skywalking/issues/11739 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-go) branch main updated: Fix enhance method error when unknown parameter type (#160)
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 63bab93 Fix enhance method error when unknown parameter type (#160)
63bab93 is described below
commit 63bab93d8009e91686c853e4efb3c2cd8d57a151
Author: mrproliu <741550...@qq.com>
AuthorDate: Wed Jan 10 14:50:20 2024 +0800
Fix enhance method error when unknown parameter type (#160)
---
CHANGES.md | 3 ++-
.../plugins/templates/method_intercept_after.tmpl | 3 ++-
.../plugins/templates/method_intercept_before.tmpl | 11 +
tools/go-agent/tools/enhancement.go| 27 +++---
tools/go-agent/tools/enhancement_test.go | 22 --
5 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index f782716..4e98f9c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,8 @@ Release Notes.
* Fix users can not use async api in toolkit-trace.
* Fix cannot enhance the vendor management project.
* Fix SW_AGENT_REPORTER_GRPC_MAX_SEND_QUEUE not working on metricsSendCh &
logSendCh chans of gRPC reporter.
-* Fix ParseVendorModule error for special case in vendor/modules.txt
+* Fix ParseVendorModule error for special case in vendor/modules.txt.
+* Fix enhance method error when unknown parameter type.
Issues and PR
- All issues are
[here](https://github.com/apache/skywalking/milestone/197?closed=1)
diff --git
a/tools/go-agent/instrument/plugins/templates/method_intercept_after.tmpl
b/tools/go-agent/instrument/plugins/templates/method_intercept_after.tmpl
index f17b10d..1aa0847 100644
--- a/tools/go-agent/instrument/plugins/templates/method_intercept_after.tmpl
+++ b/tools/go-agent/instrument/plugins/templates/method_intercept_after.tmpl
@@ -21,7 +21,8 @@ if (invocation.isContinue) {
if invocation.returnValues[{{$index}}] != nil {
*ret_{{$index}} =
(invocation.returnValues[{{$index}}]).({{$value.PackagedTypeName}})
} else {
-*ret_{{$index}} = {{$value.DefaultValueAsString}}
+var tmp_{{$index}} {{$value.PackagedTypeName}}
+*ret_{{$index}} = tmp_{{$index}}
}
{{- end }}
}
\ No newline at end of file
diff --git
a/tools/go-agent/instrument/plugins/templates/method_intercept_before.tmpl
b/tools/go-agent/instrument/plugins/templates/method_intercept_before.tmpl
index f6cbd07..e29f34b 100644
--- a/tools/go-agent/instrument/plugins/templates/method_intercept_before.tmpl
+++ b/tools/go-agent/instrument/plugins/templates/method_intercept_before.tmpl
@@ -25,18 +25,21 @@ invocation.changeArgCallback = func(index int, value
interface{}) {
panic("cannot found the argument index")
}
+{{- range $index, $value := .Results }}
+var def_res_{{$index}} {{$value.PackagedTypeName}}
+{{- end}}
// real invoke
if err := {{.InterceptorVarName}}.BeforeInvoke(invocation); err != nil {
// using go2sky log error
log.Warnf("execute interceptor before invoke error, instrument name:
%s, interceptor name: %s, function ID: %s, error: %v",
"{{.InstrumentName}}", "{{.InterceptorDefineName}}",
"{{.FuncID}}", err)
+
return {{ range $index, $value := .Results -}}
-{{$value.DefaultValueAsString}},
+def_res_{{$index}},
{{- end}}invocation, false
}
if (invocation.isContinue) {
{{- range $index, $value := .Results }}
-var def_res_{{$index}} {{$value.PackagedTypeName}}
if invocation.returnValues[{{$index}}] != nil {
def_res_{{$index}} =
(invocation.returnValues[{{$index}}]).({{$value.PackagedTypeName}})
}
@@ -46,5 +49,5 @@ if (invocation.isContinue) {
{{- end}}invocation, true
}
return {{ range $index, $value := .Results -}}
-{{- if ne $index 0}}, {{end}}{{$value.DefaultValueAsString }}
-{{- end}}{{if .Results}}, {{- end}}invocation, false
\ No newline at end of file
+def_res_{{$index}},
+{{- end}}invocation, false
\ No newline at end of file
diff --git a/tools/go-agent/tools/enhancement.go
b/tools/go-agent/tools/enhancement.go
index 7b800fd..4171f61 100644
--- a/tools/go-agent/tools/enhancement.go
+++ b/tools/go-agent/tools/enhancement.go
@@ -19,8 +19,6 @@ package tools
import (
"fmt"
- "go/token"
- "strings"
"github.com/dave/dst"
"github.com/dave/dst/decorator"
@@ -31,10 +29,9 @@ const OtherPackageRefPrefix = "swref_"
const parameterAppender = ", "
type ParameterInfo struct {
- Name string
- Type dst.Expr
- DefaultValueAsString string
- TypeName string
+ Name string
+ Type dst.Expr
+ TypeName string
}
type PackagedParameterInfo struct {
@@ -141,24 +138,6 @@ func newParameterInfo(name string, tp dst.Expr)
*ParameterInfo {
Type: tp,
TypeName:
Re: [PR] Fix enhance method error when unknown parameter type [skywalking-go]
wu-sheng merged PR #160: URL: https://github.com/apache/skywalking-go/pull/160 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Feature] support jedis-5.x [skywalking]
luger1990 opened a new issue, #11747: URL: https://github.com/apache/skywalking/issues/11747 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar feature requirement. ### Description The current skywalking java agent([apache-skywalking-java-agent-9.1.0.tgz](https://dlcdn.apache.org/skywalking/java-agent/9.1.0/apache-skywalking-java-agent-9.1.0.tgz)) dosen't support jedis 5.x ### Use case _No response_ ### Related issues _No response_ ### Are you willing to submit a pull request to implement this on your own? - [ ] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-java) branch update-year deleted (was 4ce96f7e03)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch update-year in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was 4ce96f7e03 Update NOTICE year to 2024 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: Update NOTICE year to 2024 (#663)
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 3c243e1d07 Update NOTICE year to 2024 (#663) 3c243e1d07 is described below commit 3c243e1d07f16905589cd40624f8f78c8fa4df84 Author: 吴晟 Wu Sheng AuthorDate: Wed Jan 10 11:50:42 2024 +0800 Update NOTICE year to 2024 (#663) --- NOTICE | 2 +- dist-material/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index c68c69971c..04d6ba5bea 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache SkyWalking -Copyright 2017-2023 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/dist-material/NOTICE b/dist-material/NOTICE index 673951e2e6..f95d82a9c3 100755 --- a/dist-material/NOTICE +++ b/dist-material/NOTICE @@ -1,5 +1,5 @@ Apache SkyWalking -Copyright 2017-2023 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
Re: [PR] Update NOTICE year to 2024 [skywalking-java]
wu-sheng merged PR #663: URL: https://github.com/apache/skywalking-java/pull/663 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Can traceId in skywalking be replaced by a unique value in the business [skywalking]
wu-sheng closed issue #11746: [Feature] Can traceId in skywalking be replaced by a unique value in the business URL: https://github.com/apache/skywalking/issues/11746 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Can traceId in skywalking be replaced by a unique value in the business [skywalking]
wu-sheng commented on issue #11746: URL: https://github.com/apache/skywalking/issues/11746#issuecomment-1884127561 Not an issue or feature. We never declared this could be done. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Feature] Can traceId in skywalking be replaced by a unique value in the business [skywalking]
liufeng2311 opened a new issue, #11746: URL: https://github.com/apache/skywalking/issues/11746 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Can traceId in skywalking be replaced by a unique value in the business， ### Use case I want to manually set the value of traceId in the business, and the uniqueness of traceId is guaranteed by our business ### Related issues _No response_ ### Are you willing to submit a pull request to implement this on your own? - [X] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Update NOTICE year to 2024 [skywalking-java]
wu-sheng opened a new pull request, #663: URL: https://github.com/apache/skywalking-java/pull/663 - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [ ] Update the [`CHANGES` log](https://github.com/apache/skywalking-java/blob/main/CHANGES.md). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-java) branch update-year created (now 4ce96f7e03)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch update-year in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at 4ce96f7e03 Update NOTICE year to 2024 This branch includes the following new commits: new 4ce96f7e03 Update NOTICE year to 2024 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: Update NOTICE year to 2024
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch update-year in repository https://gitbox.apache.org/repos/asf/skywalking-java.git commit 4ce96f7e03e1da92bdf1315525166ff7a59ba0ec Author: Wu Sheng AuthorDate: Wed Jan 10 11:07:50 2024 +0800 Update NOTICE year to 2024 --- NOTICE | 2 +- dist-material/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index c68c69971c..04d6ba5bea 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache SkyWalking -Copyright 2017-2023 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/dist-material/NOTICE b/dist-material/NOTICE index 673951e2e6..f95d82a9c3 100755 --- a/dist-material/NOTICE +++ b/dist-material/NOTICE @@ -1,5 +1,5 @@ Apache SkyWalking -Copyright 2017-2023 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
(skywalking-showcase) branch hierarchy deleted (was 6c16f1c)
This is an automated email from the ASF dual-hosted git repository. wankai pushed a change to branch hierarchy in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git was 6c16f1c update OAP for hierarchy 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-showcase) branch main updated: update OAP for hierarchy (#155)
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 3196d8f update OAP for hierarchy (#155)
3196d8f is described below
commit 3196d8fddc2772f636a09bd1754b24de11017add
Author: Wan Kai
AuthorDate: Wed Jan 10 09:39:06 2024 +0800
update OAP for hierarchy (#155)
---
Makefile.in | 4 ++--
deploy/platform/kubernetes/templates/feature-rover/resources.yaml | 4 ++--
deploy/platform/kubernetes/values.yaml| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index bb9b6e2..c150aef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,10 +29,10 @@ ES_IMAGE ?=
docker.elastic.co/elasticsearch/elasticsearch-oss
ES_IMAGE_TAG ?= 7.10.2
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= 8ff67d09e90712341c7889e0e6f4dc9506f4ad16
+SW_OAP_IMAGE_TAG ?= 593bd056f695cf51d4ca84b9954c8629f54a9945
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8ff67d09e90712341c7889e0e6f4dc9506f4ad16
+SW_UI_IMAGE_TAG ?= 593bd056f695cf51d4ca84b9954c8629f54a9945
SW_CLI_IMAGE ?=
ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
SW_EVENT_EXPORTER_IMAGE ?=
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
index f2c3700..0546b91 100644
--- a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
+++ b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
@@ -57,9 +57,9 @@ spec:
- name: ROVER_BACKEND_ADDR
value: {{ template "skywalking.collector.address" . }}
- name:
ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_ISTIO_ENVOY_SERVICE_NAME
- value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}
+ value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
- name:
ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_ISTIO_APPLICATION_SERVICE_NAME
- value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}
+ value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
- name:
ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_K8S_SERVICE_NAME
value:
skywalking-showcase::{{"{{"}}.Pod.ServiceName{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
- name: ROVER_HOST_MAPPING
diff --git a/deploy/platform/kubernetes/values.yaml
b/deploy/platform/kubernetes/values.yaml
index 180778f..f9fa608 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -43,7 +43,7 @@ skywalking:
SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES:
vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/*
SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self
o11y through prometheus
SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS: "mx-mesh,persistence" # @feature:
als; enable mesh analyzer (mx-mesh) to analyze ALS logs
- K8S_SERVICE_NAME_RULE: "mesh-svr::${service.metadata.name}"
+ K8S_SERVICE_NAME_RULE:
"mesh-svr::${service.metadata.name}.${service.metadata.namespace}"
SW_CONFIGURATION: k8s-configmap
SW_ENVOY_METRIC_ALS_TCP_ANALYSIS: "mx-mesh"
SW_ENABLE_UPDATE_UI_TEMPLATE: "false"
@@ -58,7 +58,7 @@ skywalking:
config:
metadata-service-mapping.yaml: |
-serviceName:
mesh-svr::${LABELS."service.istio.io/canonical-name",LABELS."app.kubernetes.io/name",LABELS.app}
+serviceName:
mesh-svr::${LABELS."service.istio.io/canonical-name",LABELS."app.kubernetes.io/name",LABELS.app}.${NAMESPACE}
serviceInstanceName: ${NAME}
alarm-settings.yml: |
rules:
Re: [PR] update OAP for hierarchy [skywalking-showcase]
wankai123 merged PR #155: URL: https://github.com/apache/skywalking-showcase/pull/155 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] update OAP for hierarchy [skywalking-showcase]
wankai123 opened a new pull request, #155: URL: https://github.com/apache/skywalking-showcase/pull/155 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-showcase) branch hierarchy created (now 6c16f1c)
This is an automated email from the ASF dual-hosted git repository. wankai pushed a change to branch hierarchy in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git at 6c16f1c update OAP for hierarchy This branch includes the following new commits: new 6c16f1c update OAP for hierarchy 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-showcase) 01/01: update OAP for hierarchy
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch hierarchy
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 6c16f1c23c73f365c2d58b924d0d674a765fed86
Author: wankai123
AuthorDate: Wed Jan 10 09:37:45 2024 +0800
update OAP for hierarchy
---
Makefile.in | 4 ++--
deploy/platform/kubernetes/templates/feature-rover/resources.yaml | 4 ++--
deploy/platform/kubernetes/values.yaml| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index bb9b6e2..c150aef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,10 +29,10 @@ ES_IMAGE ?=
docker.elastic.co/elasticsearch/elasticsearch-oss
ES_IMAGE_TAG ?= 7.10.2
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= 8ff67d09e90712341c7889e0e6f4dc9506f4ad16
+SW_OAP_IMAGE_TAG ?= 593bd056f695cf51d4ca84b9954c8629f54a9945
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8ff67d09e90712341c7889e0e6f4dc9506f4ad16
+SW_UI_IMAGE_TAG ?= 593bd056f695cf51d4ca84b9954c8629f54a9945
SW_CLI_IMAGE ?=
ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
SW_EVENT_EXPORTER_IMAGE ?=
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
index f2c3700..0546b91 100644
--- a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
+++ b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
@@ -57,9 +57,9 @@ spec:
- name: ROVER_BACKEND_ADDR
value: {{ template "skywalking.collector.address" . }}
- name:
ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_ISTIO_ENVOY_SERVICE_NAME
- value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}
+ value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
- name:
ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_ISTIO_APPLICATION_SERVICE_NAME
- value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}
+ value: mesh-svr::{{"{{"}}.Pod.LabelValue
"service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
- name:
ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_K8S_SERVICE_NAME
value:
skywalking-showcase::{{"{{"}}.Pod.ServiceName{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
- name: ROVER_HOST_MAPPING
diff --git a/deploy/platform/kubernetes/values.yaml
b/deploy/platform/kubernetes/values.yaml
index 180778f..f9fa608 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -43,7 +43,7 @@ skywalking:
SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES:
vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/*
SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self
o11y through prometheus
SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS: "mx-mesh,persistence" # @feature:
als; enable mesh analyzer (mx-mesh) to analyze ALS logs
- K8S_SERVICE_NAME_RULE: "mesh-svr::${service.metadata.name}"
+ K8S_SERVICE_NAME_RULE:
"mesh-svr::${service.metadata.name}.${service.metadata.namespace}"
SW_CONFIGURATION: k8s-configmap
SW_ENVOY_METRIC_ALS_TCP_ANALYSIS: "mx-mesh"
SW_ENABLE_UPDATE_UI_TEMPLATE: "false"
@@ -58,7 +58,7 @@ skywalking:
config:
metadata-service-mapping.yaml: |
-serviceName:
mesh-svr::${LABELS."service.istio.io/canonical-name",LABELS."app.kubernetes.io/name",LABELS.app}
+serviceName:
mesh-svr::${LABELS."service.istio.io/canonical-name",LABELS."app.kubernetes.io/name",LABELS.app}.${NAMESPACE}
serviceInstanceName: ${NAME}
alarm-settings.yml: |
rules:
Re: [I] [Bug] 数据计算方法和逻辑是什么 [skywalking]
wu-sheng commented on issue #11744: URL: https://github.com/apache/skywalking/issues/11744#issuecomment-1884041238 Chinese discussion should move to slack CN channel. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] 数据计算方法和逻辑是什么 [skywalking]
wu-sheng closed issue #11744: [Bug] 数据计算方法和逻辑是什么 URL: https://github.com/apache/skywalking/issues/11744 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Bug] 数据计算方法和逻辑是什么 [skywalking]
asdw123456wdsa opened a new issue, #11744: URL: https://github.com/apache/skywalking/issues/11744 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar issues. ### Apache SkyWalking Component UI (apache/skywalking-booster-ui) ### What happened    为什么两天延迟的数据和单天无法关联，延迟数据的计算方法或者逻辑是什么呢 ### What you expected to happen 数据计算方法或逻辑情况是什么 ### How to reproduce    ### Anything else _No response_ ### Are you willing to submit a pull request to fix on your own? - [ ] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch master updated: Support Service Hierarchy auto matching. (#11743)
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 593bd056f6 Support Service Hierarchy auto matching. (#11743)
593bd056f6 is described below
commit 593bd056f695cf51d4ca84b9954c8629f54a9945
Author: Wan Kai
AuthorDate: Wed Jan 10 08:59:04 2024 +0800
Support Service Hierarchy auto matching. (#11743)
---
docs/en/changes/changes.md | 2 +
docs/en/setup/backend/configuration-vocabulary.md | 4 +-
docs/en/swip/SWIP-1.md | 75 +---
oap-server/server-core/pom.xml | 4 +
.../oap/server/core/CoreModuleProvider.java| 5 +-
.../core/config/HierarchyDefinitionService.java| 49 -
.../server/core/hierarchy/HierarchyService.java| 186 +--
.../instance/InstanceHierarchyRelationTraffic.java | 7 +-
.../service/ServiceHierarchyRelation.java | 18 ++
.../service/ServiceHierarchyRelationTraffic.java | 19 +-
.../server/core/query/HierarchyQueryService.java | 206 +
.../server/core/query/MetadataQueryService.java| 8 +
.../oap/server/core/query/type/Attribute.java | 2 +
.../core/query/type/HierarchyInstanceRelation.java | 2 +
.../server/core/query/type/ServiceHierarchy.java | 6 +-
.../core/storage/query/IMetadataQueryDAO.java | 5 +-
.../src/main/resources/application.yml | 4 +-
.../src/main/resources/hierarchy-definition.yml| 37 +++-
.../main/resources/metadata-service-mapping.yaml | 2 +-
.../banyandb/measure/BanyanDBMetadataQueryDAO.java | 6 +-
.../elasticsearch/query/MetadataQueryEsDAO.java| 13 +-
.../jdbc/common/dao/JDBCMetadataQueryDAO.java | 22 ++-
22 files changed, 508 insertions(+), 174 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 6d7366ab91..16d6d3cc6b 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -15,6 +15,8 @@
* Support build Service/Instance Hierarchy and query.
* Change the string field in Elasticsearch storage from **keyword** type to
**text** type if it set more than `32766` length.
* [Break Change] Change the configuration field of `ui_template` and `ui_menu`
in Elasticsearch storage from **keyword** type to **text**.
+* Support Service Hierarchy auto matching.
+* Add `namespace` suffix for `K8S_SERVICE_NAME_RULE/ISTIO_SERVICE_NAME_RULE`
and `metadata-service-mapping.yaml` as default.
UI
diff --git a/docs/en/setup/backend/configuration-vocabulary.md
b/docs/en/setup/backend/configuration-vocabulary.md
index c9a7c301a9..88cc4c4b4b 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -189,8 +189,8 @@ The Configuration Vocabulary lists all available
configurations provided by `app
| - | - | acceptMetricsService
| Starts Envoy Metrics
Service analysis.
[...]
| - | - | alsHTTPAnalysis
| Starts Envoy HTTP
Access Log Service analysis. Value = `k8s-mesh` means starting the analysis.
[...]
| - | - | alsTCPAnalysis
| Starts Envoy TCP Access
Log Service analysis. Value = `k8s-mesh` means starting the analysis.
[...]
-| - | - | k8sServiceNameRule
| `k8sServiceNameRule`
allows you to customize the service name in ALS via Kubernetes metadata. The
available variables are `pod` and `service`. E.g. you can use
`${service.metadata.name}-${pod.metadata.labels.version}` to append the version
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wu-sheng merged PR #11743: URL: https://github.com/apache/skywalking/pull/11743 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wu-sheng closed pull request #11743: Support Service Hierarchy auto matching. URL: https://github.com/apache/skywalking/pull/11743 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wankai123 commented on code in PR #11743: URL: https://github.com/apache/skywalking/pull/11743#discussion_r1446111282 ## oap-server/server-starter/src/main/resources/hierarchy-definition.yml: ## @@ -13,17 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Define the hierarchy of layers, the layers under the specific layer are lower of the layer. +# Define the hierarchy of service layers, the layers under the specific layer are related lower of the layer. +# The relation could have a matching rule for auto matching, which are defined in the `auto-matching-rules` section. # All the layers are defined in the file `org.apache.skywalking.oap.server.core.analysis.Layers.java`. -MESH: - - MESH_DP - - K8S_SERVICE - - K8S +hierarchy: + MESH: +MESH_DP: name +K8S_SERVICE: short-name -MESH_DP: - - K8S_SERVICE - - K8S + MESH_DP: +K8S_SERVICE: short-name + + GENERAL: +K8S_SERVICE: lower-short-name-remove-ns + + MYSQL: +K8S_SERVICE: lower-short-name-remove-ns + + VIRTUAL_DATABASE: +MYSQL: ~ Review Comment: yes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wu-sheng commented on code in PR #11743: URL: https://github.com/apache/skywalking/pull/11743#discussion_r1446109852 ## oap-server/server-starter/src/main/resources/hierarchy-definition.yml: ## @@ -13,17 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Define the hierarchy of layers, the layers under the specific layer are lower of the layer. +# Define the hierarchy of service layers, the layers under the specific layer are related lower of the layer. +# The relation could have a matching rule for auto matching, which are defined in the `auto-matching-rules` section. # All the layers are defined in the file `org.apache.skywalking.oap.server.core.analysis.Layers.java`. -MESH: - - MESH_DP - - K8S_SERVICE - - K8S +hierarchy: + MESH: +MESH_DP: name +K8S_SERVICE: short-name -MESH_DP: - - K8S_SERVICE - - K8S + MESH_DP: +K8S_SERVICE: short-name + + GENERAL: +K8S_SERVICE: lower-short-name-remove-ns + + MYSQL: +K8S_SERVICE: lower-short-name-remove-ns + + VIRTUAL_DATABASE: +MYSQL: ~ Review Comment: It means there is no auto rule, right? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wankai123 commented on code in PR #11743: URL: https://github.com/apache/skywalking/pull/11743#discussion_r1446066973 ## oap-server/server-starter/src/main/resources/hierarchy-definition.yml: ## @@ -13,17 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Define the hierarchy of layers, the layers under the specific layer are lower of the layer. +# Define the hierarchy of service layers, the layers under the specific layer are related lower of the layer. +# The relation could have a matching rule for auto matching, which are defined in the `auto-matching-rules` section. # All the layers are defined in the file `org.apache.skywalking.oap.server.core.analysis.Layers.java`. -MESH: - - MESH_DP - - K8S_SERVICE - - K8S +hierarchy: + MESH: +MESH_DP: name +K8S_SERVICE: short-name -MESH_DP: - - K8S_SERVICE - - K8S + MESH_DP: +K8S_SERVICE: short-name + + GENERAL: +K8S_SERVICE: lower-short-name-remove-ns + + MYSQL: +K8S_SERVICE: lower-short-name-remove-ns + + VIRTUAL_DATABASE: +MYSQL: ~ Review Comment: It's represent `null` in yaml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wu-sheng commented on code in PR #11743: URL: https://github.com/apache/skywalking/pull/11743#discussion_r1446063970 ## oap-server/server-starter/src/main/resources/hierarchy-definition.yml: ## @@ -13,17 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Define the hierarchy of layers, the layers under the specific layer are lower of the layer. +# Define the hierarchy of service layers, the layers under the specific layer are related lower of the layer. +# The relation could have a matching rule for auto matching, which are defined in the `auto-matching-rules` section. # All the layers are defined in the file `org.apache.skywalking.oap.server.core.analysis.Layers.java`. -MESH: - - MESH_DP - - K8S_SERVICE - - K8S +hierarchy: + MESH: +MESH_DP: name +K8S_SERVICE: short-name -MESH_DP: - - K8S_SERVICE - - K8S + MESH_DP: +K8S_SERVICE: short-name + + GENERAL: +K8S_SERVICE: lower-short-name-remove-ns + + MYSQL: +K8S_SERVICE: lower-short-name-remove-ns + + VIRTUAL_DATABASE: +MYSQL: ~ Review Comment: What does `~` mean? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
kezhenxu94 commented on code in PR #11743:
URL: https://github.com/apache/skywalking/pull/11743#discussion_r1445972232
##
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/hierarchy/HierarchyService.java:
##
@@ -60,84 +67,149 @@ private Map> getHierarchyDefinition()
{
return hierarchyDefinition;
}
+private MetadataQueryService getMetadataQueryService() {
+if (metadataQueryService == null) {
+this.metadataQueryService = moduleManager.find(CoreModule.NAME)
+ .provider()
+
.getService(MetadataQueryService.class);
+}
+return metadataQueryService;
+}
+
/**
* Build the hierarchy relation between the 2 services. the `serviceLayer`
and `relatedServiceLayer` hierarchy
- * relations should be defined in `config/hierarchy-definition.yml`.
Generally, if service A and service B could detect
- * each other, then build the hierarchy in one side is enough.
+ * relations should be defined in `config/hierarchy-definition.yml`.
*
- * @param serviceName the name of the source service (self)
- * @param serviceLayerthe layer of the source service
- * @param relatedServiceName the name of the detected related service
- * @param relatedServiceLayer the layer of the detected related service
+ * @param upperServiceName the name of the service
+ * @param upperServiceLayerthe layer of the service
+ * @param lowerServiceName the name of the lower service
+ * @param lowerServiceLayer the layer of the lower service
*/
-public void toServiceHierarchyRelation(String serviceName,
- Layer serviceLayer,
- String relatedServiceName,
- Layer relatedServiceLayer) {
+public void toServiceHierarchyRelation(String upperServiceName,
+ Layer upperServiceLayer,
+ String lowerServiceName,
+ Layer lowerServiceLayer) {
if (!this.isEnableHierarchy) {
return;
}
-if (!checkHierarchyDefinition(serviceLayer, relatedServiceLayer)) {
+Map lowerLayers =
getHierarchyDefinition().get(upperServiceLayer.name());
+if (lowerLayers == null ||
!lowerLayers.containsKey(lowerServiceLayer.name())) {
+log.error("upperServiceLayer " + upperServiceLayer.name() + " or
lowerServiceLayer " + lowerServiceLayer.name()
+ + " is not defined in hierarchy-definition.yml.");
return;
}
-ServiceHierarchyRelation serviceHierarchy = new
ServiceHierarchyRelation();
-serviceHierarchy.setServiceName(serviceName);
-serviceHierarchy.setServiceLayer(serviceLayer);
-serviceHierarchy.setRelatedServiceName(relatedServiceName);
-serviceHierarchy.setRelatedServiceLayer(relatedServiceLayer);
-
serviceHierarchy.setTimeBucket(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis()));
-this.getSourceReceiver().receive(serviceHierarchy);
+autoMatchingServiceRelation(upperServiceName, upperServiceLayer,
lowerServiceName, lowerServiceLayer);
}
/**
* Build the hierarchy relation between the 2 instances. the
`serviceLayer` and `relatedServiceLayer` hierarchy
- * relations should be defined in `config/hierarchy-definition.yml`.
Generally, if instance A and instance B could detect
- * each other, then build the hierarchy in one side is enough.
+ * relations should be defined in `config/hierarchy-definition.yml`.
*
- * @param instanceNamethe name of the source instance (self)
- * @param serviceName the name of the source service (self)
- * @param serviceLayerthe layer of the source service
- * @param relatedInstanceName the name of the detected related instance
- * @param relatedServiceName the name of the detected related service
- * @param relatedServiceLayer the layer of the detected related service
+ * @param upperInstanceNamethe name of the upper instance
+ * @param upperServiceName the name of the upper service
+ * @param upperServiceLayerthe layer of the upper service
+ * @param lowerInstanceName the name of the lower related instance
+ * @param lowerServiceName the name of the lower related service
+ * @param lowerServiceLayer the layer of the lower related service
*/
-public void toInstanceHierarchyRelation(String instanceName,
-String serviceName,
-Layer serviceLayer,
-String
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
kezhenxu94 commented on code in PR #11743:
URL: https://github.com/apache/skywalking/pull/11743#discussion_r1445972232
##
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/hierarchy/HierarchyService.java:
##
@@ -60,84 +67,149 @@ private Map> getHierarchyDefinition()
{
return hierarchyDefinition;
}
+private MetadataQueryService getMetadataQueryService() {
+if (metadataQueryService == null) {
+this.metadataQueryService = moduleManager.find(CoreModule.NAME)
+ .provider()
+
.getService(MetadataQueryService.class);
+}
+return metadataQueryService;
+}
+
/**
* Build the hierarchy relation between the 2 services. the `serviceLayer`
and `relatedServiceLayer` hierarchy
- * relations should be defined in `config/hierarchy-definition.yml`.
Generally, if service A and service B could detect
- * each other, then build the hierarchy in one side is enough.
+ * relations should be defined in `config/hierarchy-definition.yml`.
*
- * @param serviceName the name of the source service (self)
- * @param serviceLayerthe layer of the source service
- * @param relatedServiceName the name of the detected related service
- * @param relatedServiceLayer the layer of the detected related service
+ * @param upperServiceName the name of the service
+ * @param upperServiceLayerthe layer of the service
+ * @param lowerServiceName the name of the lower service
+ * @param lowerServiceLayer the layer of the lower service
*/
-public void toServiceHierarchyRelation(String serviceName,
- Layer serviceLayer,
- String relatedServiceName,
- Layer relatedServiceLayer) {
+public void toServiceHierarchyRelation(String upperServiceName,
+ Layer upperServiceLayer,
+ String lowerServiceName,
+ Layer lowerServiceLayer) {
if (!this.isEnableHierarchy) {
return;
}
-if (!checkHierarchyDefinition(serviceLayer, relatedServiceLayer)) {
+Map lowerLayers =
getHierarchyDefinition().get(upperServiceLayer.name());
+if (lowerLayers == null ||
!lowerLayers.containsKey(lowerServiceLayer.name())) {
+log.error("upperServiceLayer " + upperServiceLayer.name() + " or
lowerServiceLayer " + lowerServiceLayer.name()
+ + " is not defined in hierarchy-definition.yml.");
return;
}
-ServiceHierarchyRelation serviceHierarchy = new
ServiceHierarchyRelation();
-serviceHierarchy.setServiceName(serviceName);
-serviceHierarchy.setServiceLayer(serviceLayer);
-serviceHierarchy.setRelatedServiceName(relatedServiceName);
-serviceHierarchy.setRelatedServiceLayer(relatedServiceLayer);
-
serviceHierarchy.setTimeBucket(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis()));
-this.getSourceReceiver().receive(serviceHierarchy);
+autoMatchingServiceRelation(upperServiceName, upperServiceLayer,
lowerServiceName, lowerServiceLayer);
}
/**
* Build the hierarchy relation between the 2 instances. the
`serviceLayer` and `relatedServiceLayer` hierarchy
- * relations should be defined in `config/hierarchy-definition.yml`.
Generally, if instance A and instance B could detect
- * each other, then build the hierarchy in one side is enough.
+ * relations should be defined in `config/hierarchy-definition.yml`.
*
- * @param instanceNamethe name of the source instance (self)
- * @param serviceName the name of the source service (self)
- * @param serviceLayerthe layer of the source service
- * @param relatedInstanceName the name of the detected related instance
- * @param relatedServiceName the name of the detected related service
- * @param relatedServiceLayer the layer of the detected related service
+ * @param upperInstanceNamethe name of the upper instance
+ * @param upperServiceName the name of the upper service
+ * @param upperServiceLayerthe layer of the upper service
+ * @param lowerInstanceName the name of the lower related instance
+ * @param lowerServiceName the name of the lower related service
+ * @param lowerServiceLayer the layer of the lower related service
*/
-public void toInstanceHierarchyRelation(String instanceName,
-String serviceName,
-Layer serviceLayer,
-String
Re: [PR] Support Service Hierarchy auto matching. [skywalking]
wu-sheng commented on code in PR #11743:
URL: https://github.com/apache/skywalking/pull/11743#discussion_r1445908886
##
docs/en/swip/SWIP-1.md:
##
@@ -116,44 +116,73 @@ type Node {
# The service hierarchy of the node.
serviceHierarchy: ServiceHierarchy!
}
-
-# Node in ServiceInstanceTopology
-type ServiceInstanceNode {
- ...
- # The service instance hierarchy of the node.
- instanceHierarchy: InstanceHierarchy!
-}
+```
## New data models
- service_hierarchy_relation
| Column name | Data type | Description
|
-
|---|---|-|
- | id| String| entityId
|
- | entity_id | String|
serviceId.servicelayer-relatedServiceId.relatedServiceLayer |
- | service_id| String|
|
- | service_layer | int | service layer value
|
- | related_service_id| String|
|
- | related_service_layer | int | related service layer value
|
+
|---|---|-|
+ | id| String|
serviceId.servicelayer-relatedServiceId.relatedServiceLayer |
+ | service_id| String| upper service id
|
+ | service_layer | int | upper service layer value
|
+ | related_service_id| String| lower service id
|
+ | related_service_layer | int | lower service layer value
|
| time_bucket | long |
|
- instance_hierarchy_relation
| Column name | Data type | Description
|
-
|---|---|--|
- | id| String| entityId
|
- | entity_id | String|
instanceId.servicelayer-relateInstanceId.relatedServiceLayer |
- | instance_id | String|
|
- | service_layer | int | service layer value
|
- | related_instance_id | String|
|
- | related_service_layer | int | related service layer value
|
+
|---|---|--|
+ | id| String|
instanceId.servicelayer-relateInstanceId.relatedServiceLayer |
+ | instance_id | String| upper instance id
|
+ | service_layer | int | upper service layer value
|
+ | related_instance_id | String| lower instance id
|
+ | related_service_layer | int | lower service layer value
|
| time_bucket | long |
|
## Internal APIs
Internal APIs should be exposed in the Core module to support building the
hierarchy relationship.
```java
-public void toServiceHierarchyRelation(String serviceName, Layer serviceLayer,
String relatedServiceName, Layer relatedServiceLayer);
-public void toInstanceHierarchyRelation(String instanceName, String
serviceName, Layer serviceLayer, String relatedInstanceName, String
relatedServiceName, Layer relateServiceLayer);
+public void toServiceHierarchyRelation(String upperServiceName, Layer
upperServiceLayer, String lowerServiceName, Layer lowerServiceLayer);
+public void toInstanceHierarchyRelation(String upperInstanceName, String
upperServiceName, Layer upperServiceLayer, String lowerInstanceName, String
lowerServiceName, Layer lowerServiceLayer);
+```
+
+## Hierarchy Definition
+All layers hierarchy relations are defined in the `hierarchy-definition.yml`
file.
+OAP will check the hierarchy relations before building and use the matching
rules to auto match the relations. Here is an example:
+
+```yaml
+# Define the hierarchy of service layers, the layers under the specific layer
are related lower of the layer.
+# The relation could have a matching rule for auto matching, which are defined
in the `auto-matching-rules` section.
+# All the layers are defined in
Re: [PR] Update NOTICE [skywalking-php]
wu-sheng commented on PR #103: URL: https://github.com/apache/skywalking-php/pull/103#issuecomment-1882803987 Could you check why the tests all fail? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Update NOTICE [skywalking-rust]
wu-sheng commented on PR #64: URL: https://github.com/apache/skywalking-rust/pull/64#issuecomment-1882803338 Could you check why the tests all fail? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Update NOTICE [skywalking-php]
jmjoy opened a new pull request, #103: URL: https://github.com/apache/skywalking-php/pull/103 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Update NOTICE [skywalking-rust]
codecov-commenter commented on PR #64: URL: https://github.com/apache/skywalking-rust/pull/64#issuecomment-1882795873 ## [Codecov](https://app.codecov.io/gh/apache/skywalking-rust/pull/64?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache) Report All modified and coverable lines are covered by tests :white_check_mark: > Comparison is base [(`e6990d1`)](https://app.codecov.io/gh/apache/skywalking-rust/commit/e6990d1dfbb685cf5f9a8e0e8d5ebae98b34528d?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache) 14.60% compared to head [(`6d16eb7`)](https://app.codecov.io/gh/apache/skywalking-rust/pull/64?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache) 14.50%. Additional details and impacted files ```diff @@Coverage Diff @@ ## master #64 +/- ## == - Coverage 14.60% 14.50% -0.10% == Files 20 20 Lines 712 710 -2 == - Hits 104 103 -1 + Misses608 607 -1 ``` [:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/skywalking-rust/pull/64?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache). :loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Update NOTICE [skywalking-rust]
jmjoy opened a new pull request, #64: URL: https://github.com/apache/skywalking-rust/pull/64 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Support Service Hierarchy auto matching. [skywalking]
wankai123 opened a new pull request, #11743: URL: https://github.com/apache/skywalking/pull/11743 relate to [11669](https://github.com/apache/skywalking/discussions/11669) - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [X] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/docs/en/changes/changes.md). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
zchengz commented on issue #11742: URL: https://github.com/apache/skywalking/issues/11742#issuecomment-1882693655 Okay, I'll try 9.7.0 again. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
wu-sheng commented on issue #11742: URL: https://github.com/apache/skywalking/issues/11742#issuecomment-1882616363 Use English on Github please. CN channel is in the slack. And we don't provide debug and dev support from basic. Sorry. We can't afford that. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
zchengz commented on issue #11742: URL: https://github.com/apache/skywalking/issues/11742#issuecomment-1882615522 Ui I use the master branch, oap is also the master branch, oapserver I think is normal, because I debug breakpoint into the com.linecorp.armeria.server.graphql.DefaultGraphqlService#executeGraphql ![Uploading .png…]() -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
zchengz commented on issue #11742: URL: https://github.com/apache/skywalking/issues/11742#issuecomment-1882614478 ui 我使用的是master分支,oap 同样是master分支,oapserver我认为是正常的，因为我debug断点进入到了com.linecorp.armeria.server.graphql.DefaultGraphqlService#executeGraphql ![Uploading .png…]() -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
wu-sheng commented on issue #11742: URL: https://github.com/apache/skywalking/issues/11742#issuecomment-1882608665 If you use latest, you should know the codes and details. Otherwise, use the release versions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
wu-sheng closed issue #11742: [Bug] ui white screen URL: https://github.com/apache/skywalking/issues/11742 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] ui white screen [skywalking]
wu-sheng commented on issue #11742: URL: https://github.com/apache/skywalking/issues/11742#issuecomment-1882606446 Please debug first. This usually means, your oap server is not booted successfully. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Bug] ui white screen [skywalking]
zchengz opened a new issue, #11742: URL: https://github.com/apache/skywalking/issues/11742 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar issues. ### Apache SkyWalking Component UI (apache/skywalking-booster-ui) ### What happened When I use "npm run dev" to start the UI, there is a white screen, and the interface "http://localhost:3000/graphql; shows an error message: "Validation error of type FieldUndefined: Field 'getMenuItems' in type 'Query' is undefined @ 'getMenuItems'". oap server is normal.  ### What you expected to happen I hope you can help me solve this problem. ### How to reproduce git clone https://github.com/apache/skywalking-booster-ui.git npm install npm run dev ### Anything else _No response_ ### Are you willing to submit a pull request to fix on your own? - [ ] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
