(skywalking) branch master updated: Fix table exists check in the JDBC Storage Plugin. (#11897)
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 a61b3bb1f7 Fix table exists check in the JDBC Storage Plugin. (#11897)
a61b3bb1f7 is described below
commit a61b3bb1f760c5dc91650a1f4fb3704f527b3e16
Author: Chen Ziyan
AuthorDate: Tue Feb 20 15:01:11 2024 +0800
Fix table exists check in the JDBC Storage Plugin. (#11897)
---
docs/en/changes/changes.md | 1 +
.../oap/server/library/client/jdbc/hikaricp/JDBCClient.java | 6 +++---
.../server/storage/plugin/jdbc/common/dao/JDBCHistoryDeleteDAO.java | 2 +-
.../oap/server/storage/plugin/jdbc/common/dao/JDBCSQLExecutor.java | 2 +-
.../storage/plugin/jdbc/common/dao/JDBCHistoryDeleteDAOIT.java | 6 +++---
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index fde1695012..f63a3cd727 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -51,6 +51,7 @@
- ROCKETMQ -> K8S_SERVICE
- VIRTUAL_MQ -> ROCKETMQ
* Fix ServiceInstance `in` query.
+* Fix table exists check in the JDBC Storage Plugin.
UI
diff --git
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCClient.java
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCClient.java
index 65c83b9ac8..f84bbeede8 100644
---
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCClient.java
+++
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCClient.java
@@ -152,7 +152,7 @@ public class JDBCClient implements Client, HealthCheckable {
public boolean indexExists(final String table,
final String index) throws SQLException {
try (final var connection = getConnection();
- final var resultSet =
connection.getMetaData().getIndexInfo(connection.getCatalog(), null, table,
false, false)) {
+ final var resultSet =
connection.getMetaData().getIndexInfo(connection.getCatalog(),
connection.getSchema(), table, false, false)) {
while (resultSet.next()) {
if (resultSet.getString("INDEX_NAME").equalsIgnoreCase(index))
{
return true;
@@ -164,14 +164,14 @@ public class JDBCClient implements Client,
HealthCheckable {
public boolean tableExists(final String table) throws SQLException {
try (final var conn = getConnection();
- final var result =
conn.getMetaData().getTables(conn.getCatalog(), null, table, null)) {
+ final var result =
conn.getMetaData().getTables(conn.getCatalog(), conn.getSchema(), table, null))
{
return result.next();
}
}
public Set getTableColumns(final String table) throws SQLException
{
try (final var conn = getConnection();
- final var result =
conn.getMetaData().getColumns(conn.getCatalog(), null, table, null)) {
+ final var result =
conn.getMetaData().getColumns(conn.getCatalog(), conn.getSchema(), table,
null)) {
final var columns = new HashSet();
while (result.next()) {
columns.add(result.getString("COLUMN_NAME").toLowerCase());
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/JDBCHistoryDeleteDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCHistoryDeleteDAO.java
index e91c474057..0270a76c27 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCHistoryDeleteDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCHistoryDeleteDAO.java
@@ -78,7 +78,7 @@ public class JDBCHistoryDeleteDAO implements
IHistoryDeleteDAO {
final var tableName = TableHelper.getTableName(model);
try (final var conn = jdbcClient.getConnection();
- final var result =
conn.getMetaData().getTables(conn.getCatalog(), null, tableName + "%", new
String[]{"TABLE"})) {
+ final var result =
conn.getMetaData().getTables(conn.getCatalog(), conn.getSchema(), tableName +
"%", new String[]{"TABLE"})) {
while (result.next()) {
tablesToDrop.add(result.getString("TABLE_NAME"));
}
diff --git
a/oap-server/server-storage-plugin/st
Re: [I] [Bug] table exists check error with two schemas in a database [skywalking]
wu-sheng closed issue #11894: [Bug] table exists check error with two schemas in a database URL: https://github.com/apache/skywalking/issues/11894 -- 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] Fix table exists check in the JDBC Storage Plugin. [skywalking]
wu-sheng merged PR #11897: URL: https://github.com/apache/skywalking/pull/11897 -- 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] Inject skywalking context. [skywalking-php]
wu-sheng commented on PR #107: URL: https://github.com/apache/skywalking-php/pull/107#issuecomment-1953487834 Should we consider the whole trace context? -- 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] Fix table exists check in the JDBC Storage Plugin. [skywalking]
CzyerChen opened a new pull request, #11897: URL: https://github.com/apache/skywalking/pull/11897 ### Fix [11894](https://github.com/apache/skywalking/issues/11894) - [x] Explain briefly why the bug exists and how to fix it. - [x] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes https://github.com/apache/skywalking/issues/11894. - [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: [PR] feature: add support for AMQP [skywalking-go]
CodePrometheus commented on PR #165: URL: https://github.com/apache/skywalking-go/pull/165#issuecomment-1953440410 Thanks all for your time as well. -- 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: feature: add support for AMQP (#165)
This is an automated email from the ASF dual-hosted git repository. liuhan 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 8573c6f feature: add support for AMQP (#165) 8573c6f is described below commit 8573c6f8ccb24ba1d8fe67cfde1cd544a7fb4ae0 Author: Starry AuthorDate: Tue Feb 20 11:40:51 2024 +0800 feature: add support for AMQP (#165) --- .github/workflows/plugin-tests.yaml | 1 + CHANGES.md | 1 + docs/en/agent/support-plugins.md| 1 + go.work | 2 + plugins/amqp/consumer.go| 37 plugins/amqp/consumer_with_ctx.go | 37 plugins/amqp/dial_hook.go | 58 ++ plugins/amqp/general_consumer.go| 70 +++ plugins/amqp/go.mod | 5 + plugins/amqp/go.sum | 28 +++ plugins/amqp/instrument.go | 116 plugins/amqp/producer.go| 85 + plugins/amqp/structures.go | 46 + test/plugins/scenarios/amqp/bin/startup.sh | 22 +++ test/plugins/scenarios/amqp/config/excepted.yml | 135 + test/plugins/scenarios/amqp/go.mod | 19 ++ test/plugins/scenarios/amqp/go.sum | 186 ++ test/plugins/scenarios/amqp/main.go | 240 test/plugins/scenarios/amqp/plugin.yml | 39 tools/go-agent/instrument/plugins/register.go | 2 + tools/go-agent/tools/dst.go | 2 + tools/go-agent/tools/enhancement.go | 14 ++ 22 files changed, 1146 insertions(+) diff --git a/.github/workflows/plugin-tests.yaml b/.github/workflows/plugin-tests.yaml index de6c719..acb180d 100644 --- a/.github/workflows/plugin-tests.yaml +++ b/.github/workflows/plugin-tests.yaml @@ -97,6 +97,7 @@ jobs: - fiber - echov4 - rocketmq + - amqp steps: - uses: actions/checkout@v2 with: diff --git a/CHANGES.md b/CHANGES.md index 53b43cd..9e329ec 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Release Notes. * Add `redis.max_args_bytes` parameter for redis plugin. * Changing intercept point for gin, make sure interfaces could be grouped when params defined in relativePath. * Support [RocketMQ](https://github.com/apache/rocketmq-client-go) MQ. +* Support [AMQP](https://github.com/rabbitmq/amqp091-go) MQ. Documentation diff --git a/docs/en/agent/support-plugins.md b/docs/en/agent/support-plugins.md index c6c3832..b0a455a 100644 --- a/docs/en/agent/support-plugins.md +++ b/docs/en/agent/support-plugins.md @@ -29,6 +29,7 @@ metrics based on the tracing data. * `go-redisv9`: [go-redis](https://github.com/redis/go-redis) tested v9.0.3 to v9.0.5. * MQ Client * `rocketMQ`: [rocketmq-client-go](https://github.com/apache/rocketmq-client-go) tested v2.1.2. + * `amqp`: [AMQP](https://github.com/rabbitmq/amqp091-go) tested v1.9.0. # Metrics Plugins The meter plugin provides the advanced metrics collections. diff --git a/go.work b/go.work index e19cdc4..08b1e93 100644 --- a/go.work +++ b/go.work @@ -24,6 +24,7 @@ use ( ./plugins/fiber ./plugins/echov4 ./plugins/rocketmq + ./plugins/amqp ./test/benchmark-codebase/consumer ./test/benchmark-codebase/provider @@ -54,6 +55,7 @@ use ( ./test/plugins/scenarios/runtime_metrics ./test/plugins/scenarios/echov4 ./test/plugins/scenarios/rocketmq + ./test/plugins/scenarios/amqp ./tools/go-agent diff --git a/plugins/amqp/consumer.go b/plugins/amqp/consumer.go new file mode 100644 index 000..0bbb335 --- /dev/null +++ b/plugins/amqp/consumer.go @@ -0,0 +1,37 @@ +// 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 +// ownership. Apache Software Foundation (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. + +package amqp + +import ( + "github.com/rabbitmq/amqp091-go" + + "github.com/apache/skywalking-go/plugins/core/operator" +) + +type ConsumerInterc
Re: [PR] feature: add support for AMQP [skywalking-go]
mrproliu merged PR #165: URL: https://github.com/apache/skywalking-go/pull/165 -- 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-website) branch try-fix-kapa-again deleted (was 04d05fe9274)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch try-fix-kapa-again in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was 04d05fe9274 Remove trailing slash 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: Remove trailing slash (#679)
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 1f5ccd7267a Remove trailing slash (#679)
1f5ccd7267a is described below
commit 1f5ccd7267a8d9e91137e1d97f2a35c8d46c51be
Author: Superskyyy
AuthorDate: Mon Feb 19 22:02:37 2024 -0500
Remove trailing slash (#679)
---
themes/docsy/layouts/partials/head.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/docsy/layouts/partials/head.html
b/themes/docsy/layouts/partials/head.html
index 8d08e398f51..c4e5613cd01 100644
--- a/themes/docsy/layouts/partials/head.html
+++ b/themes/docsy/layouts/partials/head.html
@@ -4,7 +4,7 @@
https://skywalking.apache.org/images/skywalking_400x400.png";>
https://skywalking.apache.org/images/skywalking_400x400.png";>
-https://www.google.com/ https://app.netlify.com/;";>
+https://www.google.com https://app.netlify.com;";>
{{ hugo.Generator }}
Re: [PR] Remove trailing slash [skywalking-website]
wu-sheng merged PR #679: URL: https://github.com/apache/skywalking-website/pull/679 -- 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] Modifying the limit size of yaml and GRPC inbound message [skywalking]
wu-sheng commented on PR #11892: URL: https://github.com/apache/skywalking/pull/11892#issuecomment-1953402024 > > Which configuration file is over 4M? Alerting rule? > > yes Please follow the comment above. -- 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] table exists check error with two schemas in a database [skywalking]
wu-sheng commented on issue #11894: URL: https://github.com/apache/skywalking/issues/11894#issuecomment-1953401271 FYI @kezhenxu94 -- 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] table exists check error with two schemas in a database [skywalking]
CzyerChen opened a new issue, #11894:
URL: https://github.com/apache/skywalking/issues/11894
### 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
OAP server (apache/skywalking)
### What happened
```
storage:
selector: postgresql
postgresql:
properties:
jdbcUrl:
${SW_JDBC_URL:"jdbc:postgresql://localhost:5432/skywalking?currentSchema=test1"}
```
test1 in skywalking: check tables not exist and create tables
and switch schema :
```
storage:
selector: postgresql
postgresql:
properties:
jdbcUrl:
${SW_JDBC_URL:"jdbc:postgresql://localhost:5432/skywalking?currentSchema=test2"}
```
test2 in skywalking: check tables exist in information_schema.tables without
filter schemaPattern (default: pg_catalog & information_schema)
```
public boolean tableExists(final String table) throws SQLException {
try (final var conn = getConnection();
final var result =
conn.getMetaData().getTables(conn.getCatalog(), null, table, null)) {
return result.next();
}
}
```
### What you expected to happen
Checking and creating tables works with different schemas in one db.
### How to reproduce
- step one
oap server config:
```
storage:
selector: postgresql
postgresql:
properties:
jdbcUrl:
${SW_JDBC_URL:"jdbc:postgresql://localhost:5432/skywalking?currentSchema=test1"}
```
start up
- step two:
oap server config:
```
storage:
selector: postgresql
postgresql:
properties:
jdbcUrl:
${SW_JDBC_URL:"jdbc:postgresql://localhost:5432/skywalking?currentSchema=test2"}
```
start up with error:
```
com.zaxxer.hikari.pool.HikariProxyPreparedStatement.executeQuery(HikariProxyPreparedStatement.java)
~[HikariCP-3.1.0.jar:?]
at
org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCClient.executeQuery(JDBCClient.java:118)
[classes/:?]
at
org.apache.skywalking.oap.server.storage.plugin.jdbc.common.dao.JDBCUITemplateManagementDAO.getAllTemplates(JDBCUITemplateManagementDAO.java:101)
[classes/:?]
at
org.apache.skywalking.oap.server.core.management.ui.template.UITemplateManagementService.getAllTemplates(UITemplateManagementService.java:56)
[classes/:?]
at
org.apache.skywalking.oap.server.core.management.ui.template.UITemplateInitializer.verifyNameConflict(UITemplateInitializer.java:124)
[classes/:?]
at
org.apache.skywalking.oap.server.core.management.ui.template.UITemplateInitializer.initTemplate(UITemplateInitializer.java:114)
[classes/:?]
at
org.apache.skywalking.oap.server.core.management.ui.template.UITemplateInitializer.initAll(UITemplateInitializer.java:94)
[classes/:?]
at
org.apache.skywalking.oap.server.core.CoreModuleProvider.notifyAfterCompleted(CoreModuleProvider.java:446)
[classes/:?]
at
org.apache.skywalking.oap.server.library.module.BootstrapFlow.notifyAfterCompleted(BootstrapFlow.java:52)
[classes/:?]
at
org.apache.skywalking.oap.server.library.module.ModuleManager.init(ModuleManager.java:76)
[classes/:?]
at
org.apache.skywalking.oap.server.starter.OAPServerBootstrap.start(OAPServerBootstrap.java:52)
[classes/:?]
at
org.apache.skywalking.oap.server.starter.OAPServerStartUp.main(OAPServerStartUp.java:23)
[classes/:?]
2024-02-19 18:17:21,469
org.apache.skywalking.oap.server.starter.OAPServerBootstrap 64 [main] ERROR []
- [10.0.0-SNAPSHOT-a471b85] ERROR: relation "ui_template" does not exist
位置：15
org.postgresql.util.PSQLException: ERROR: relation "ui_template" does not
exist
位置：15
at
org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:2676)
~[postgresql-42.4.1.jar:42.4.1]
at
org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:2366)
~[postgresql-42.4.1.jar:42.4.1]
at
org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:356)
~[postgresql-42.4.1.jar:42.4.1]
at
org.postgresql.jdbc.PgStatement.executeInternal(PgStatement.java:490)
~[postgresql-42.4.1.jar:42.4.1]
at org.postgresql.jdbc.PgStatement.execute(PgStatement.java:408)
~[postgresql-42.4.1.jar:42.4.1]
at
org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:181)
~[postgresql-42.4.1.jar:42.4.1]
at
org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:133)
~[postgresql-42.4.1.jar:42.4.1]
at
com.zaxxer.hikari.pool.ProxyPreparedStatement.executeQuery(ProxyPreparedStatement.java:52)
~[HikariCP-3.1.0.jar:?]
at
com.zaxxer.hikari.pool.HikariProxyPrepared
Re: [PR] Remove trailing slash [skywalking-website]
netlify[bot] commented on PR #679: URL: https://github.com/apache/skywalking-website/pull/679#issuecomment-1953389824 ### 👷 Deploy Preview for *skywalking-website-preview* processing. | Name | Link | |:-:|| |🔨 Latest commit | 04d05fe927441b08d3abed81ad4471c1060a6562 | |🔍 Latest deploy log | https://app.netlify.com/sites/skywalking-website-preview/deploys/65d40f0ee37088069c05 | -- 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-website) branch try-fix-kapa-again updated: Remove trailing slash
This is an automated email from the ASF dual-hosted git repository.
yihaochen pushed a commit to branch try-fix-kapa-again
in repository https://gitbox.apache.org/repos/asf/skywalking-website.git
The following commit(s) were added to refs/heads/try-fix-kapa-again by this
push:
new 04d05fe9274 Remove trailing slash
04d05fe9274 is described below
commit 04d05fe927441b08d3abed81ad4471c1060a6562
Author: Superskyyy
AuthorDate: Mon Feb 19 21:31:24 2024 -0500
Remove trailing slash
---
themes/docsy/layouts/partials/head.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/docsy/layouts/partials/head.html
b/themes/docsy/layouts/partials/head.html
index 8d08e398f51..c4e5613cd01 100644
--- a/themes/docsy/layouts/partials/head.html
+++ b/themes/docsy/layouts/partials/head.html
@@ -4,7 +4,7 @@
https://skywalking.apache.org/images/skywalking_400x400.png";>
https://skywalking.apache.org/images/skywalking_400x400.png";>
-https://www.google.com/ https://app.netlify.com/;";>
+https://www.google.com https://app.netlify.com;";>
{{ hugo.Generator }}
[PR] Remove trailing slash [skywalking-website]
Superskyyy opened a new pull request, #679: URL: https://github.com/apache/skywalking-website/pull/679 (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-website) branch try-fix-kapa-again created (now 6640d3c6c87)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch try-fix-kapa-again in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at 6640d3c6c87 Try fix kapa with CSP for google.com (#678) No new revisions were added by this update.
Re: [PR] Modifying the limit size of yaml and GRPC inbound message [skywalking]
ooi22 commented on PR #11892: URL: https://github.com/apache/skywalking/pull/11892#issuecomment-1953384740 > Which configuration file is over 4M? Alerting rule? 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
(skywalking-website) branch fix-kapa deleted (was 20083924e22)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was 20083924e22 Fix 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: Try fix kapa with CSP for google.com (#678)
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 6640d3c6c87 Try fix kapa with CSP for google.com (#678)
6640d3c6c87 is described below
commit 6640d3c6c87fa3960b03c3170ad71f11be3afcaa
Author: Superskyyy
AuthorDate: Mon Feb 19 20:17:36 2024 -0500
Try fix kapa with CSP for google.com (#678)
---
themes/docsy/layouts/partials/head.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/themes/docsy/layouts/partials/head.html
b/themes/docsy/layouts/partials/head.html
index aafadfdc644..8d08e398f51 100644
--- a/themes/docsy/layouts/partials/head.html
+++ b/themes/docsy/layouts/partials/head.html
@@ -3,6 +3,9 @@
https://skywalking.apache.org/images/skywalking_400x400.png";>
https://skywalking.apache.org/images/skywalking_400x400.png";>
+
+https://www.google.com/ https://app.netlify.com/;";>
+
{{ hugo.Generator }}
Re: [PR] Try fix kapa with CSP for google.com [skywalking-website]
wu-sheng merged PR #678: URL: https://github.com/apache/skywalking-website/pull/678 -- 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-website) branch latest-docs deleted (was 68f83055062)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch latest-docs in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was 68f83055062 Update data/docs.yml 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 latest docs to generated docs to help kapa.ai to lock URL path (#676)
This is an automated email from the ASF dual-hosted git repository. yihaochen 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 0c85ea97f8b Add latest docs to generated docs to help kapa.ai to lock URL path (#676) 0c85ea97f8b is described below commit 0c85ea97f8b62a00d0e7773d6d322ff742442adf Author: 吴晟 Wu Sheng AuthorDate: Tue Feb 20 08:59:41 2024 +0800 Add latest docs to generated docs to help kapa.ai to lock URL path (#676) * Add latest labels to generated docs. * Update data/docs.yml Co-authored-by: Superskyyy - Co-authored-by: Superskyyy --- data/docs.yml | 30 ++ 1 file changed, 30 insertions(+) diff --git a/data/docs.yml b/data/docs.yml index 70198179895..68a37d19464 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -37,6 +37,9 @@ docs: - version: Next link: /docs/main/next/readme/ +- version: Latest + link: /docs/main/latest/readme/ + commitId: 772f9a40f54052defc24f8c6b716f9e9b3fe127c - version: v9.7.0 link: /docs/main/v9.7.0/readme/ commitId: 772f9a40f54052defc24f8c6b716f9e9b3fe127c @@ -97,6 +100,9 @@ docs: - version: Next link: /docs/skywalking-java/next/readme/ +- version: Latest + link: /docs/skywalking-java/latest/readme/ + commitId: bf18ab1496c253cffb3663f4228e2d63586b30ed - version: v9.1.0 link: /docs/skywalking-java/v9.1.0/readme/ commitId: bf18ab1496c253cffb3663f4228e2d63586b30ed @@ -122,6 +128,9 @@ docs: - version: Next link: /docs/skywalking-python/next/readme/ +- version: Latest + link: /docs/skywalking-python/latest/readme/ + commitId: 4717e1b66da9fd9025ef8e7f5f9bab1c4b1e409e - version: v1.0.1 link: /docs/skywalking-python/next/readme/ commitId: 4717e1b66da9fd9025ef8e7f5f9bab1c4b1e409e @@ -144,6 +153,9 @@ docs: - version: Next link: /docs/skywalking-go/next/readme/ +- version: Latest + link: /docs/skywalking-go/latest/readme/ + commitId: 316433e71808ec6a130e81c287caa8b2a98f45a5 - version: v0.3.0 link: /docs/skywalking-go/v0.3.0/readme/ commitId: 316433e71808ec6a130e81c287caa8b2a98f45a5 @@ -168,6 +180,9 @@ docs: - version: Next link: /docs/skywalking-php/next/readme/ +- version: Latest + link: /docs/skywalking-php/latest/readme/ + commitId: 3f44db45feb44d5ee5bc1846fd300ba7cfdd8e13 - version: v0.7.0 link: /docs/skywalking-php/v0.7.0/readme/ commitId: 3f44db45feb44d5ee5bc1846fd300ba7cfdd8e13 @@ -208,6 +223,9 @@ docs: - version: Next link: /docs/skywalking-satellite/next/readme/ +- version: Latest + link: /docs/skywalking-satellite/latest/readme/ + commitId: 38a86a5408c30b805bce2b5c79b7e8000e917a68 - version: v1.2.0 link: /docs/skywalking-satellite/v1.2.0/readme/ commitId: 38a86a5408c30b805bce2b5c79b7e8000e917a68 @@ -232,6 +250,9 @@ docs: - version: Next link: /docs/skywalking-rover/next/readme/ +- version: Latest + link: /docs/skywalking-rover/latest/readme/ + commitId: 9da447851549b20d12e762d8e180be47f7b7b986 - version: v0.5.0 link: /docs/skywalking-rover/v0.5.0/readme/ commitId: 9da447851549b20d12e762d8e180be47f7b7b986 @@ -266,6 +287,9 @@ docs: - version: Next link: /docs/skywalking-swck/next/readme/ +- version: Latest + link: /docs/skywalking-swck/latest/readme/ + commitId: 502610b1cc71940cb36107ec335bd47aa829a781 - version: v0.8.0 link: /docs/skywalking-swck/v0.8.0/readme/ commitId: 502610b1cc71940cb36107ec335bd47aa829a781 @@ -306,6 +330,9 @@ docs: - version: Next link: /docs/skywalking-banyandb/next/readme/ +- version: Latest + link: /docs/skywalking-banyandb/latest/readme/ + commitId: 84f32b3969cdcc676aaee428383b34b3b67dbdf5 - version: v0.5.0 link: /docs/skywalking-banyandb/v0.5.0/readme/ commitId: 84f32b3969cdcc676aaee428383b34b3b67dbdf5 @@ -358,6 +385,9 @@ docs: - version: Next link: /docs/skywalking-infra-e2e/next/readme/ +- version: Latest + link: /docs/skywalking-infra-e2e/latest/readme/ + commitId: 1485ae03f0ad90496ad7626a5ae4a6a73a1f6296 - version: v1.3.0 link: /docs/skywalking-infra-e2e/v1.3.0/readme/ commitId: 1485ae03f0ad90496ad7626a5ae4a6a73a1f6296
Re: [PR] Add latest docs to generated docs to help kapa.ai to lock URL path [skywalking-website]
Superskyyy merged PR #676: URL: https://github.com/apache/skywalking-website/pull/676 -- 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-website) branch fix-kapa updated (240ede135ed -> 20083924e22)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from 240ede135ed Add wildcard add 20083924e22 Fix No new revisions were added by this update. Summary of changes: themes/docsy/layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-website) branch fix-kapa updated (46aac541624 -> 240ede135ed)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from 46aac541624 Add netlify add 240ede135ed Add wildcard No new revisions were added by this update. Summary of changes: themes/docsy/layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-website) branch fix-kapa updated (7723cf0bd99 -> 46aac541624)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from 7723cf0bd99 Fix add 46aac541624 Add netlify No new revisions were added by this update. Summary of changes: themes/docsy/layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Add support for amqp [skywalking-go]
CodePrometheus commented on PR #165: URL: https://github.com/apache/skywalking-go/pull/165#issuecomment-1952947913 > Are you using a HTTP handler to trigger consumer? I think you can't create another entry span when the first one not finished. You will need a local span in the middle, or use a timer to trigger consuming periodically. Thanks, after several attempts, I think it should be able to meet our expectations. https://github.com/apache/skywalking-go/assets/66550292/fed391a3-f73e-4288-ab3e-10557d6d1574";> -- 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-website) branch fix-kapa updated (d6ef8beb66d -> 7723cf0bd99)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from d6ef8beb66d Try fix kapa with CSP for google.com add 7723cf0bd99 Fix No new revisions were added by this update. Summary of changes: themes/docsy/layouts/partials/head.html| 3 +++ themes/docsy/layouts/partials/scripts.html | 5 + 2 files changed, 4 insertions(+), 4 deletions(-)
Re: [PR] Try fix kapa with CSP for google.com [skywalking-website]
Superskyyy commented on PR #678: URL: https://github.com/apache/skywalking-website/pull/678#issuecomment-1952903134 Ok that didnt fix it still ``` The Content Security Policy 'frame-src 'self' google.com;' was delivered via a element outside the document's , which is disallowed. The policy has been ignored. ``` Any idea where to put it? -- 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] Try fix kapa with CSP for google.com [skywalking-website]
netlify[bot] commented on PR #678: URL: https://github.com/apache/skywalking-website/pull/678#issuecomment-1952894102 ### 👷 Deploy Preview for *skywalking-website-preview* processing. | Name | Link | |:-:|| |🔨 Latest commit | d6ef8beb66da886825c5e2530903236cad9392c8 | |🔍 Latest deploy log | https://app.netlify.com/sites/skywalking-website-preview/deploys/65d38a7c3258d7000865387d | -- 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] Try fix kapa with CSP for google.com [skywalking-website]
Superskyyy opened a new pull request, #678: URL: https://github.com/apache/skywalking-website/pull/678 See if it works. -- 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-website) branch fix-kapa updated: Try fix kapa with CSP for google.com
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a commit to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git The following commit(s) were added to refs/heads/fix-kapa by this push: new d6ef8beb66d Try fix kapa with CSP for google.com d6ef8beb66d is described below commit d6ef8beb66da886825c5e2530903236cad9392c8 Author: Superskyyy AuthorDate: Mon Feb 19 12:05:33 2024 -0500 Try fix kapa with CSP for google.com --- themes/docsy/layouts/partials/scripts.html | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/themes/docsy/layouts/partials/scripts.html b/themes/docsy/layouts/partials/scripts.html index 792c65d5c6e..4855fed7bf1 100644 --- a/themes/docsy/layouts/partials/scripts.html +++ b/themes/docsy/layouts/partials/scripts.html @@ -20,7 +20,10 @@ window.onload = () => mermaid.init(undefined, ".language-mermaid"); - + + + +
Re: [PR] Modifying the limit size of yaml and GRPC inbound message [skywalking]
Superskyyy commented on PR #11892: URL: https://github.com/apache/skywalking/pull/11892#issuecomment-1952860980 > Your current change is too reckless, and could cause OOM easily for loading a wrong file or malicious file This is a very valid point, please adjust to a setting instead of hardcoded. @ooi22 -- 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-website) branch fix-kapa created (now fa26f8af8fa)
This is an automated email from the ASF dual-hosted git repository. yihaochen pushed a change to branch fix-kapa in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at fa26f8af8fa fix version auto-selected (#677) No new revisions were added by this update.
(skywalking-website) branch master updated: fix version auto-selected (#677)
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 fa26f8af8fa fix version auto-selected (#677)
fa26f8af8fa is described below
commit fa26f8af8fa9cad6e8658f553ff84ca403957974
Author: Juntao Zhang <719284...@qq.com>
AuthorDate: Mon Feb 19 23:38:44 2024 +0800
fix version auto-selected (#677)
---
docs.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs.js b/docs.js
index 974790fdf46..78f0ce70a68 100644
--- a/docs.js
+++ b/docs.js
@@ -162,11 +162,11 @@ async function traverseDocsList(result) {
${description}
- {{ $currentVersion :=
.Site.Data.docSidebar.${menuFileName}.version }}
+ {{ $currentVersion := lower
.Site.Data.docSidebar.${menuFileName}.version }}
Version:
{{range .Site.Data.docSidebar.${menuFileName}.repoDocs}}
-{{$version := .version}}
+{{$version := lower .version}}
{{$versionName := .versionName}}
{{if $versionName}}
Re: [PR] fix version auto-selected [skywalking-website]
wu-sheng merged PR #677: URL: https://github.com/apache/skywalking-website/pull/677 -- 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] Add latest docs to generated docs to help kapa.ai to lock URL path [skywalking-website]
Jtrust commented on PR #676: URL: https://github.com/apache/skywalking-website/pull/676#issuecomment-1952712926 > @Jtrust It seems the version selector is not auto-selected when I want to jump from `/docs` to a specific latest version. Next and other versions are good though. > > https://private-user-images.githubusercontent.com/5441976/305757560-bbccaa0c-141a-40c0-a6a9-05a99637c2f6.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDgzNTcxNjMsIm5iZiI6MTcwODM1Njg2MywicGF0aCI6Ii81NDQxOTc2LzMwNTc1NzU2MC1iYmNjYWEwYy0xNDFhLTQwYzAtYTZhOS0wNWE5OTYzN2MyZjYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDIxOSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDAyMTlUMTUzNDIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MGZhODZjYjYyZmIwNzUwYTZiNzc1YWU1N2I5NTQwNmFlMjE1NzdkY2QxOWVjYWU0Mjg4NmQzYjIzOGI2YmY4NSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.yCnM53jmPMF8oRLklvOL9HdpHVxnPjLPjJ3o8JL2QG4";> > This will jump to https://deploy-preview-676--skywalking-website-preview.netlify.app/docs/main/latest/readme/ correctly, but the sidebar shows **Next**. > > https://private-user-images.githubusercontent.com/5441976/305757614-6f9038b0-062d-4a4f-8b9f-f4b1c041788d.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDgzNTcxNjMsIm5iZiI6MTcwODM1Njg2MywicGF0aCI6Ii81NDQxOTc2LzMwNTc1NzYxNC02ZjkwMzhiMC0wNjJkLTRhNGYtOGI5Zi1mNGIxYzA0MTc4OGQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDIxOSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDAyMTlUMTUzNDIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MzZkYjIzYzliNDJhNjRmZDMzMTVlMGRjMzUyN2QyYjlhZjQ2NWNjZjlhM2NhMTEwNDM0MjUzODUzMjA0YzkxOCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.nwMdAGvbD5e8f0zqrlE3tg6GxQeqX_RgZmySY4Ej8SA";> > And, when I switch `next` and `latest` in the https://deploy-preview-676--skywalking-website-preview.netlify.app/docs/main/latest/readme/ page, it is not working too. [fixed](https://github.com/apache/skywalking-website/pull/677) -- 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] fix version auto-selected [skywalking-website]
netlify[bot] commented on PR #677: URL: https://github.com/apache/skywalking-website/pull/677#issuecomment-1952709450 ### 👷 Deploy Preview for *skywalking-website-preview* processing. | Name | Link | |:-:|| |🔨 Latest commit | 142d6d30e89b630e008a3c49ffcc3e8c3618350c | |🔍 Latest deploy log | https://app.netlify.com/sites/skywalking-website-preview/deploys/65d374daf44fcf00089868ff | -- 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] fix version auto-selected [skywalking-website]
Jtrust opened a new pull request, #677: URL: https://github.com/apache/skywalking-website/pull/677 (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] Modifying the limit size of yaml and GRPC inbound message [skywalking]
wu-sheng commented on PR #11892: URL: https://github.com/apache/skywalking/pull/11892#issuecomment-1952628529 This change should be applied for certain use case, rather than making all YAML files adopting this change. And the max length should not be hard coded, it should be configurable. For example, if you are talking about alerting case, we should make alerting file reader to accept a configurable size as a parameter. Your current change is too reckless, and could cause OOM easily for loading a wrong file or malicious file -- 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] Modifying the limit size of yaml and GRPC inbound message [skywalking]
wu-sheng commented on PR #11892: URL: https://github.com/apache/skywalking/pull/11892#issuecomment-1952616654 Which configuration file is over 4M? Alerting rule? -- 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] Modifying the limit size of yaml and GRPC inbound message [skywalking]
ooi22 opened a new pull request, #11892: URL: https://github.com/apache/skywalking/pull/11892 ### Fix - [ ] Add a unit test to verify that the fix works. - [x] The default size is 4M,modifying the limit size to maximum. - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [ ] 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] apm-spring-cloud-gateway-3.x-plugin-8.9.0 generate the same tid [skywalking]
wu-sheng commented on issue #11891: URL: https://github.com/apache/skywalking/issues/11891#issuecomment-1952155864 1. 8.9 is too old. 2. We can't afford to debug plugins, you are better to learn debug and check on your own. -- 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] apm-spring-cloud-gateway-3.x-plugin-8.9.0 generate the same tid [skywalking]
wu-sheng closed issue #11891: apm-spring-cloud-gateway-3.x-plugin-8.9.0 generate the same tid URL: https://github.com/apache/skywalking/issues/11891 -- 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] apm-spring-cloud-gateway-3.x-plugin-8.9.0 generate the same tid [skywalking]
netfreeperson opened a new issue, #11891: URL: https://github.com/apache/skywalking/issues/11891 ### 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 Java Agent (apache/skywalking-java) ### What happened 1: I used apm-spring-cloud-gateway-3.x-plugin-8.9.0, but the generated traceid is the same. (apm-spring-cloud-gateway-2.1.x-plugin-8.9.0.jar can't generate traceid) 2: The traceid generated by the gateway cannot be delivered to the back-end service 【The environment is as follows:】 spring cloud gateway version: spring-cloud-gateway-server-2.2.6.RELEASE.jar skywalking plugin version: apm-spring-cloud-gateway-3.x-plugin-8.9.0.jar apm-spring-webflux-5.x-plugin-8.9.0.jar gateway log: 2024-02-19 18:02:10.137|reactor-http-nio-2|TID:N/A|c.m.scg.TestFilter|15 : 测试. 2024-02-19 18:02:11.758|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:12.646|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:13.434|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:14.421|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:15.369|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:16.248|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:17.089|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:18.167|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:19.195|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:20.042|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:20.934|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:22.124|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:23.240|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:24.106|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : 2024-02-19 18:02:24.641|reactor-http-nio-2|TID:641d749d444e465fbff5fdc981979656.109.17083369297820001|TestFilter|15 : Business service log: 2024-02-19 18:02:08.128|INFO |RMI TCP Connection(3)-2.0.0.1|TID:N/A|o.s.w.s.DispatcherServlet|547 : Completed initialization in 24 ms 2024-02-19 18:02:10.604|http-nio--exec-1|TID:bbfdff065fc34526b673c3ac5a32f07b.58.17083369304970001|Test 2024-02-19 18:02:11.768|http-nio--exec-3|TID:bbfdff065fc34526b673c3ac5a32f07b.60.17083369317660001|Test 2024-02-19 18:02:12.659|http-nio--exec-4|TID:bbfdff065fc34526b673c3ac5a32f07b.61.17083369326560001|Test 2024-02-19 18:02:13.441|http-nio--exec-5|TID:bbfdff065fc34526b673c3ac5a32f07b.62.1708336933441|Test 2024-02-19 18:02:14.428|http-nio--exec-6|TID:bbfdff065fc34526b673c3ac5a32f07b.63.17083369344270001|Test 2024-02-19 18:02:15.375|http-nio--exec-7|TID:bbfdff065fc34526b673c3ac5a32f07b.64.17083369353740001|Test 2024-02-19 18:02:16.253|http-nio--exec-8|TID:bbfdff065fc34526b673c3ac5a32f07b.65.17083369362520001|Test 2024-02-19 18:02:17.093|http-nio--exec-9|TID:bbfdff065fc34526b673c3ac5a32f07b.66.17083369370920001|Test 2024-02-19 18:02:18.174|http-nio--exec-1|TID:bbfdff065fc34526b673c3ac5a32f07b.58.17083369381720003|Test 2024-02-19 18:02:19.202|http-nio--exec-3|TID:bbfdff065fc34526b673c3ac5a32f07b.60.1708336939203|Test 2024-02-19 18:02:20.047|http-nio--exec-4|TID:bbfdff065fc34526b673c3ac5a32f07b.61.17083369400450003|Test 2024-02-19 18:02:20.938|http-nio--exec-5|TID:bbfdff065fc34526b673c3ac5a32f07b.62.17083369409370003|Test 2024-02-19 18:02:22.130|http-nio--exec-7|TID:bbfdff065fc34526b673c3ac5a32f07b.64.17083369421290003|Test 2024-02-19 18:02:23.245|http-nio--exec-9|TID:bbfdff065fc34526b673c3ac5a32f07b.66.17083369432450003|Test 2024-02-19 18:02:24.111|http-nio--exec-10|TID:bbfdff065fc34526b673c3ac5a32f07b.67.1708336944111.Tes 2024-02-19 18:02:24.648|http-nio--exec-1|TID:bbfdff065fc34526b673c3ac5a32f07b.58.17083369446450005|Test ### What you expected to happen 1： The gateway generates a new tid each time 2： The back-end service should be able to obtain the traceid generated by the gateway
(skywalking-graalvm-distro) branch wu-sheng-patch-1 deleted (was a970a12)
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-graalvm-distro.git was a970a12 Update README.md 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-graalvm-distro) branch main updated: Add Experimental Label and statement (#7)
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-graalvm-distro.git The following commit(s) were added to refs/heads/main by this push: new a5b766c Add Experimental Label and statement (#7) a5b766c is described below commit a5b766c0b2dc52cdf07a993c77030bd6dfcbc1d8 Author: 吴晟 Wu Sheng AuthorDate: Mon Feb 19 16:21:36 2024 +0800 Add Experimental Label and statement (#7) --- README.md | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc70f67..0929e58 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SkyWalking GraalVM Distro +# SkyWalking GraalVM Distro (Experimental) http://skywalking.apache.org/assets/logo.svg"; alt="Sky Walking logo" height="90px" align="right" /> GraalVM compiles your Java applications ahead of time into standalone binaries. These binaries are smaller, start up to 100x faster, @@ -9,6 +9,12 @@ This distro could bring the OAP benefits from the native build powered by Graal But as the limitation of the GraalVM, this distro may provide features in different implementations, and require recompilation rather than change config files. +⚠️ This distro is facing the lack of support about Groovy on GraalVM issues, only OAL relative analysis codes can't be compiled and run on GraalVM. ⚠️ + +**MAL, LAL and (Service/Instance) Hierarchy Analysis(since v10) are heavily relying on Groovy and GroovyShell, so all of these are not support in this distro.** + +## ⚠️ Release Policy ⚠️ +This repository is only on the experimental stage, no release will be made and driven by the PMC by the current status, until we have a way out. # License -Apache 2.0 \ No newline at end of file +Apache 2.0
Re: [PR] Add Experimental Label and statement [skywalking-graalvm-distro]
wu-sheng merged PR #7: URL: https://github.com/apache/skywalking-graalvm-distro/pull/7 -- 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) branch master updated: Fix ServiceInstance `in` query. (#11888)
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 a471b85ac2 Fix ServiceInstance `in` query. (#11888)
a471b85ac2 is described below
commit a471b85ac2648d4a93ec4e853e4ee101324cf1bd
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Mon Feb 19 16:20:45 2024 +0800
Fix ServiceInstance `in` query. (#11888)
---
docs/en/changes/changes.md | 1 +
.../plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java | 4 +++-
.../storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java | 10 ++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 0cad776e92..fde1695012 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -50,6 +50,7 @@
* Add Service Hierarchy auto matching layer relationships (upper -> lower) as
following:
- ROCKETMQ -> K8S_SERVICE
- VIRTUAL_MQ -> ROCKETMQ
+* Fix ServiceInstance `in` query.
UI
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
index 957c15ab31..07333538d1 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
@@ -162,7 +162,9 @@ public class BanyanDBMetadataQueryDAO extends
AbstractBanyanDBDAO implements IMe
List
instanceRelationsQueryConditions = new ArrayList<>(instanceIds.size());
for (final String instanceId : instanceIds) {
final
IDManager.ServiceInstanceID.InstanceIDDefinition def =
IDManager.ServiceInstanceID.analysisId(instanceId);
-
and(Lists.newArrayList(eq(InstanceTraffic.SERVICE_ID, def.getServiceId()),
eq(InstanceTraffic.NAME, def.getName(;
+instanceRelationsQueryConditions.add(
+
and(Lists.newArrayList(eq(InstanceTraffic.SERVICE_ID, def.getServiceId()),
eq(InstanceTraffic.NAME, def.getName(
+);
}
query.criteria(or(instanceRelationsQueryConditions));
}
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/JDBCMetadataQueryDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
index ff163df875..1ed5a6259a 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
@@ -23,6 +23,7 @@ import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.linecorp.armeria.common.annotation.Nullable;
+import java.util.stream.Collectors;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
@@ -186,10 +187,11 @@ public class JDBCMetadataQueryDAO implements
IMetadataQueryDAO {
sql.append("select * from ").append(table).append(" where ")
.append(JDBCTableInstaller.TABLE_COLUMN).append(" = ?");
condition.add(InstanceTraffic.INDEX_NAME);
-for (String instanceId : instanceIds) {
-sql.append(" and
").append(JDBCTableInstaller.ID_COLUMN).append(" = ?");
-condition.add(instanceId);
-}
+sql.append(" and ").append(JDBCTableInstaller.ID_COLUMN).append("
in ")
+ .append(
+ instanceIds.stream().map(instanceId ->
"?").collect(Collectors.joining(",", "(", ")"))
+ );
+condition.addAll(instanceIds);
sql.append(" limit ").append(instanceIds.size());
final var result = jdbcClient.executeQuery(sql.toString(),
resultSet -> buildInstances(resultSet), condition.toArray(new Object[0]));
Re: [PR] Fix ServiceInstance `in` query. [skywalking]
wu-sheng merged PR #11888: URL: https://github.com/apache/skywalking/pull/11888 -- 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] Add Experimental Label and statement [skywalking-graalvm-distro]
wu-sheng opened a new pull request, #7: URL: https://github.com/apache/skywalking-graalvm-distro/pull/7 (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-graalvm-distro) 01/01: Update README.md
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-graalvm-distro.git commit a970a128ee80ba6af3835abdf4af5b2059ef1b01 Author: 吴晟 Wu Sheng AuthorDate: Mon Feb 19 16:18:34 2024 +0800 Update README.md --- README.md | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc70f67..0929e58 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SkyWalking GraalVM Distro +# SkyWalking GraalVM Distro (Experimental) http://skywalking.apache.org/assets/logo.svg"; alt="Sky Walking logo" height="90px" align="right" /> GraalVM compiles your Java applications ahead of time into standalone binaries. These binaries are smaller, start up to 100x faster, @@ -9,6 +9,12 @@ This distro could bring the OAP benefits from the native build powered by Graal But as the limitation of the GraalVM, this distro may provide features in different implementations, and require recompilation rather than change config files. +⚠️ This distro is facing the lack of support about Groovy on GraalVM issues, only OAL relative analysis codes can't be compiled and run on GraalVM. ⚠️ + +**MAL, LAL and (Service/Instance) Hierarchy Analysis(since v10) are heavily relying on Groovy and GroovyShell, so all of these are not support in this distro.** + +## ⚠️ Release Policy ⚠️ +This repository is only on the experimental stage, no release will be made and driven by the PMC by the current status, until we have a way out. # License -Apache 2.0 \ No newline at end of file +Apache 2.0
(skywalking-graalvm-distro) branch wu-sheng-patch-1 created (now a970a12)
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-graalvm-distro.git at a970a12 Update README.md This branch includes the following new commits: new a970a12 Update README.md 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.
