(skywalking) branch sync deleted (was fe6143b960)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync in repository https://gitbox.apache.org/repos/asf/skywalking.git was fe6143b960 Sync UI The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Sync UI - fix: change log widget and loading mask style (#11564)
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 a970143386 Sync UI - fix: change log widget and loading mask style (#11564) a970143386 is described below commit a970143386c748891b03d430376754dae961bcc7 Author: 吴晟 Wu Sheng AuthorDate: Sun Nov 19 08:26:19 2023 +0800 Sync UI - fix: change log widget and loading mask style (#11564) --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index c6d1c49569..02c5724859 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit c6d1c495699c2f55cd9abe79233b802c69454a5b +Subproject commit 02c572485967a8ee41cb63d649d5141e9ca5e721
(skywalking) branch sync created (now fe6143b960)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync in repository https://gitbox.apache.org/repos/asf/skywalking.git at fe6143b960 Sync UI This branch includes the following new commits: new fe6143b960 Sync UI The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) 01/01: Sync UI
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch sync in repository https://gitbox.apache.org/repos/asf/skywalking.git commit fe6143b9600d062340847a06527fe73e9a1cf75b Author: Wu Sheng AuthorDate: Sun Nov 19 08:17:14 2023 +0800 Sync UI --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index c6d1c49569..02c5724859 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit c6d1c495699c2f55cd9abe79233b802c69454a5b +Subproject commit 02c572485967a8ee41cb63d649d5141e9ca5e721
(skywalking-java) branch main updated: Fix PostgreSQL Jdbc URL parsing exception (#649)
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 e71b9e899e Fix PostgreSQL Jdbc URL parsing exception (#649)
e71b9e899e is described below
commit e71b9e899e7a6b590476fd49d3d722fc21728720
Author: Chen Ziyan
AuthorDate: Fri Nov 17 21:37:13 2023 +0800
Fix PostgreSQL Jdbc URL parsing exception (#649)
---
CHANGES.md | 1 +
.../core/context/IgnoredTracerContextTest.java | 6 +-
.../connectionurl/parser/PostgreSQLURLParser.java | 101 +++--
.../jdbc/connectionurl/parser/URLParserTest.java | 75 ++-
4 files changed, 170 insertions(+), 13 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0032844b61..7dcf73cb16 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Release Notes.
* Bump byte-buddy to 1.14.9 for JDK21 support.
* Add JDK21 plugin tests for Spring 6.
* Bump Lombok to 1.18.30 to adopt JDK21 compiling.
+* Fix PostgreSQL Jdbc URL parsing exception.
Documentation
* Fix JDK requirement in the compiling docs.
diff --git
a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java
b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java
index b46fcdc5d1..38247386ab 100644
---
a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java
+++
b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java
@@ -28,6 +28,7 @@ import
org.apache.skywalking.apm.agent.core.test.tools.SegmentStorage;
import org.apache.skywalking.apm.agent.core.test.tools.SegmentStoragePoint;
import org.apache.skywalking.apm.agent.core.test.tools.TracingSegmentRunner;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -73,9 +74,8 @@ public class IgnoredTracerContextTest {
ContextManager.createLocalSpan("/test4");
ContextManager.stopSpan();
-assertThat(storage.getIgnoredTracerContexts().size(), is(3));
-assertThat(storage.getTraceSegments().size(), is(1));
-
+Assert.assertTrue(storage.getIgnoredTracerContexts().size() < 4);
+Assert.assertTrue(storage.getTraceSegments().size() > 0);
}
@Test
diff --git
a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java
b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java
index e7ab769e29..e7336fb73c 100644
---
a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java
+++
b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java
@@ -28,6 +28,8 @@ public class PostgreSQLURLParser extends AbstractURLParser {
private static final int DEFAULT_PORT = 5432;
private static final String DB_TYPE = "PostgreSQL";
+private static final String URL_PARAMS_HOST_KEY = "host";
+private static final String URL_PARAMS_PORT_KEY = "port";
public PostgreSQLURLParser(String url) {
super(url);
@@ -37,15 +39,29 @@ public class PostgreSQLURLParser extends AbstractURLParser {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+if (hostLabelEndIndex == -1) {
+hostLabelEndIndex = url.length();
+}
return new URLLocation(hostLabelStartIndex + 2, hostLabelEndIndex);
}
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
-int databaseStartTag = url.lastIndexOf("/");
-int databaseEndTag = url.indexOf("?", databaseStartTag);
+int databaseLabelStartIndex = url.indexOf("//");
+int databaseStartTag = url.indexOf("/", databaseLabelStartIndex + 2);
+int databaseEndTag = url.indexOf("?", databaseLabelStartIndex + 2);
+if (databaseEndTag < databaseStartTag && databaseEndTag != -1) {
+//database parse fail
+return new URLLocation(0, 0);
+}
+if (databaseStartTag == -1) {
+//database empty
+return new URLLocation(0, 0);
+}
if (databaseEndTag == -1) {
databaseEndTag = url.length();
+} else {
+databas
(skywalking) branch master updated: Support Nginx monitoring. (#11558)
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 8bff0aa38d Support Nginx monitoring. (#11558) 8bff0aa38d is described below commit 8bff0aa38ddbaa711c3297df12ca1a5ab253cee8 Author: weixiang1862 <652048...@qq.com> AuthorDate: Fri Nov 17 14:16:10 2023 +0800 Support Nginx monitoring. (#11558) --- .github/workflows/skywalking.yaml | 2 + docs/en/changes/changes.md | 1 + docs/en/setup/backend/backend-nginx-monitoring.md | 141 ++ docs/menu.yml | 2 + .../skywalking/oap/server/core/analysis/Layer.java | 7 +- .../ui/template/UITemplateInitializer.java | 1 + .../src/main/resources/application.yml | 8 +- .../src/main/resources/lal/nginx.yaml | 60 + .../src/main/resources/log-mal-rules/nginx.yaml| 36 +++ .../resources/otel-rules/nginx/nginx-endpoint.yaml | 49 .../resources/otel-rules/nginx/nginx-instance.yaml | 51 .../resources/otel-rules/nginx/nginx-service.yaml | 51 .../resources/ui-initialized-templates/menu.yaml | 5 + .../nginx/nginx-endpoint.json | 166 .../nginx/nginx-instance.json | 214 +++ .../ui-initialized-templates/nginx/nginx-root.json | 47 .../nginx/nginx-service.json | 294 + test/e2e-v2/cases/nginx/Dockerfile.nginx | 19 ++ test/e2e-v2/cases/nginx/docker-compose.yml | 72 + test/e2e-v2/cases/nginx/e2e.yaml | 96 +++ test/e2e-v2/cases/nginx/expected/logs.yml | 34 +++ .../nginx/expected/metrics-has-value-label.yml | 35 +++ .../cases/nginx/expected/metrics-has-value.yml | 31 +++ .../cases/nginx/expected/service-endpoint.yml | 19 ++ .../cases/nginx/expected/service-instance.yml | 22 ++ test/e2e-v2/cases/nginx/expected/service.yml | 24 ++ test/e2e-v2/cases/nginx/fluent-bit-script.lua | 36 +++ test/e2e-v2/cases/nginx/fluent-bit.conf| 48 test/e2e-v2/cases/nginx/nginx.conf | 74 ++ test/e2e-v2/cases/nginx/otel-collector-config.yaml | 44 +++ 30 files changed, 1684 insertions(+), 5 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 12d60d7d10..488588ac14 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -611,6 +611,8 @@ jobs: - name: Zipkin BanyanDB config: test/e2e-v2/cases/zipkin/banyandb/e2e.yaml + - name: Nginx +config: test/e2e-v2/cases/nginx/e2e.yaml - name: APISIX metrics config: test/e2e-v2/cases/apisix/otel-collector/e2e.yaml - name: Exporter Kafka diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 99a6978f11..679064c655 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -42,6 +42,7 @@ * Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue implementation. * Change the policy of the queue(DataCarrier) in the L1 metric aggregate worker to IF_POSSIBLE mode. * Add self-observability metric `metrics_aggregator_abandon` to count the number of abandon metrics. +* Support Nginx monitoring. UI diff --git a/docs/en/setup/backend/backend-nginx-monitoring.md b/docs/en/setup/backend/backend-nginx-monitoring.md new file mode 100644 index 00..696aa93db8 --- /dev/null +++ b/docs/en/setup/backend/backend-nginx-monitoring.md @@ -0,0 +1,141 @@ +# Nginx monitoring +## Nginx performance from nginx-lua-prometheus +The [nginx-lua-prometheus](https://github.com/knyar/nginx-lua-prometheus) is a lua library that can be used with Nginx to collect metrics +and expose them on a separate web page. +To use this library, you will need Nginx with [lua-nginx-module](https://github.com/openresty/lua-nginx-module) or directly [OpenResty](https://openresty.org/). + +SkyWalking leverages OpenTelemetry Collector to transfer the metrics to [OpenTelemetry receiver](opentelemetry-receiver.md) and into the [Meter System](./../../concepts-and-designs/meter.md). + +### Data flow +1. [nginx-lua-prometheus](https://github.com/knyar/nginx-lua-prometheus) collects metrics from Nginx and expose them to an endpoint. +2. OpenTelemetry Collector fetches metrics from the endpoint expose above via Prometheus Receiver and pushes metrics to SkyWalking OAP Server via OpenTelemetry gRPC exporter. +3. The SkyWalking OAP Server parses the expression with [MAL](../../concepts-and-designs/mal.md) to filter/calculate/aggregate and store the results. + +### Set up +1. Collect Nginx metrics and expose the following four metrics by [nginx-lua-prom
(skywalking-booster-ui) branch main updated: fix: change log widget and loading mask style (#340)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new 02c57248 fix: change log widget and loading mask style (#340)
02c57248 is described below
commit 02c572485967a8ee41cb63d649d5141e9ca5e721
Author: Fine0830
AuthorDate: Fri Nov 17 13:16:48 2023 +0800
fix: change log widget and loading mask style (#340)
---
src/styles/theme.scss | 4
src/views/dashboard/related/log/LogTable/LogDetail.vue | 6 ++
src/views/dashboard/related/log/LogTable/LogService.vue | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 56e8fe13..e41085c3 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -157,6 +157,10 @@ $active-background: var(--el-color-primary);
$font-size-smaller: 12px;
$font-size-normal: 14px;
+.el-loading-mask {
+ background-color: var(--theme-background);
+}
+
.el-menu {
--el-menu-item-height: 50px;
}
diff --git a/src/views/dashboard/related/log/LogTable/LogDetail.vue
b/src/views/dashboard/related/log/LogTable/LogDetail.vue
index 3cb92193..cf6def6f 100644
--- a/src/views/dashboard/related/log/LogTable/LogDetail.vue
+++ b/src/views/dashboard/related/log/LogTable/LogDetail.vue
@@ -20,7 +20,7 @@ limitations under the License. -->
{{ dateFormat(currentLog[item.label]) }}
.content {
-max-width: 700px;
-min-width: 500px;
min-height: 500px;
border: none;
outline: none;
color: $font-color;
overflow: auto;
-padding: 5px;
+background-color: var(--el-dialog-bg-color);
}
diff --git a/src/views/dashboard/related/log/LogTable/LogService.vue
b/src/views/dashboard/related/log/LogTable/LogService.vue
index 61cb4ffb..cfcfab1f 100644
--- a/src/views/dashboard/related/log/LogTable/LogService.vue
+++ b/src/views/dashboard/related/log/LogTable/LogService.vue
@@ -25,9 +25,9 @@ limitations under the License. -->
{{ dateFormat(data.timestamp) }}
>
-
+
-
+
{{ data[item.label] }}
(skywalking-showcase) branch main updated: Apply new log theme
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-showcase.git The following commit(s) were added to refs/heads/main by this push: new a4da68e Apply new log theme a4da68e is described below commit a4da68e737e5ce9af49d8c782e91e0f841931967 Author: 吴晟 Wu Sheng AuthorDate: Fri Nov 17 10:38:42 2023 +0800 Apply new log theme --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index ac0509f..d604916 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 ?= 798c55ce8ac4124498474de65ecf1d631bf3904a +SW_OAP_IMAGE_TAG ?= cb3e830f088ad74b4c0ab565d59cd690ec4bfaf6 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= 798c55ce8ac4124498474de65ecf1d631bf3904a +SW_UI_IMAGE_TAG ?= cb3e830f088ad74b4c0ab565d59cd690ec4bfaf6 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
(skywalking) branch master updated: sync ui (#11560)
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 cb3e830f08 sync ui (#11560) cb3e830f08 is described below commit cb3e830f088ad74b4c0ab565d59cd690ec4bfaf6 Author: Fine0830 AuthorDate: Fri Nov 17 10:33:59 2023 +0800 sync ui (#11560) --- docs/en/changes/changes.md | 2 ++ skywalking-ui | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index bef119bce2..99a6978f11 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -61,6 +61,8 @@ * Refactor Logs view. * Implement the Dark Theme. * Change UI templates for Text widgets. +* Add Nginx menu i18n. +* Fix the height for trace widget. Documentation diff --git a/skywalking-ui b/skywalking-ui index a4271bb479..c6d1c49569 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit a4271bb4797034e5921e4ef795cb6df131cdc8c8 +Subproject commit c6d1c495699c2f55cd9abe79233b802c69454a5b
(skywalking-booster-ui) branch main updated: refactor: enhance the Log widget (#339)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new c6d1c495 refactor: enhance the Log widget (#339)
c6d1c495 is described below
commit c6d1c495699c2f55cd9abe79233b802c69454a5b
Author: Fine0830
AuthorDate: Fri Nov 17 10:15:39 2023 +0800
refactor: enhance the Log widget (#339)
---
src/styles/theme.scss | 6 +++-
src/views/dashboard/related/log/LogTable/Index.vue | 5 ++--
.../dashboard/related/log/LogTable/LogDetail.vue | 1 +
.../dashboard/related/log/LogTable/LogService.vue | 34 --
src/views/dashboard/related/log/LogTable/data.ts | 10 +++
.../related/trace/components/Table/TableItem.vue | 2 --
6 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 2fb0dd27..56e8fe13 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -15,6 +15,10 @@
* limitations under the License.
*/
@use "element-plus/theme-chalk/src/dark/css-vars.scss" as *;
+:root {
+ --sw-green: #70c877;
+ --sw-orange: #e6a23c;
+}
html {
--el-color-primary: #409eff;
@@ -58,7 +62,7 @@ html {
}
html.dark {
- --el-color-primary: rgb(64, 158, 255);
+ --el-color-primary: #409eff;
--theme-background: #212224;
--font-color: #fafbfc;
--disabled-color: #ccc;
diff --git a/src/views/dashboard/related/log/LogTable/Index.vue
b/src/views/dashboard/related/log/LogTable/Index.vue
index 125345e3..0162ca5f 100644
--- a/src/views/dashboard/related/log/LogTable/Index.vue
+++ b/src/views/dashboard/related/log/LogTable/Index.vue
@@ -88,7 +88,7 @@ limitations under the License. -->
border-bottom: 1px solid var(--sw-trace-list-border);
.traceId {
- width: 140px;
+ width: 20px;
}
.content {
@@ -96,7 +96,7 @@ limitations under the License. -->
}
.tags {
- width: 100px;
+ width: 15px;
}
.serviceName {
@@ -107,7 +107,6 @@ limitations under the License. -->
.log-header div {
padding: 0 5px;
border: 1px solid transparent;
-border-right: 1px dotted silver;
line-height: 30px;
background-color: var(--sw-table-header);
overflow: hidden;
diff --git a/src/views/dashboard/related/log/LogTable/LogDetail.vue
b/src/views/dashboard/related/log/LogTable/LogDetail.vue
index 6a17b2cc..3cb92193 100644
--- a/src/views/dashboard/related/log/LogTable/LogDetail.vue
+++ b/src/views/dashboard/related/log/LogTable/LogDetail.vue
@@ -73,5 +73,6 @@ limitations under the License. -->
outline: none;
color: $font-color;
overflow: auto;
+padding: 5px;
}
diff --git a/src/views/dashboard/related/log/LogTable/LogService.vue
b/src/views/dashboard/related/log/LogTable/LogService.vue
index bd388723..61cb4ffb 100644
--- a/src/views/dashboard/related/log/LogTable/LogService.vue
+++ b/src/views/dashboard/related/log/LogTable/LogService.vue
@@ -24,10 +24,12 @@ limitations under the License. -->
{{ dateFormat(data.timestamp) }}
-
-{{ level }}
-
- trace
+ >
+
+
+
+
+
{{ data[item.label] }}
@@ -87,6 +89,9 @@ limitations under the License. -->
.traceId {
cursor: pointer;
+ width: 20px;
+ text-align: center;
+ position: relative;
span {
display: inline-block;
@@ -94,12 +99,16 @@ limitations under the License. -->
}
.blue {
-color: #448dfe;
+color: var(--el-color-primary);
}
}
.tags {
- width: 100px;
+ width: 15px;
+ text-align: center;
+ color: var(--sw-green);
+ font-weight: 400;
+ font-size: 14px;
}
.content {
@@ -112,15 +121,14 @@ limitations under the License. -->
}
.log-item:hover {
-background: rgb(0 0 0 / 4%);
+background: var(--sw-list-hover);
}
.log-item > div {
-width: 140px;
+width: 60px;
padding: 0 5px;
display: inline-block;
border: 1px solid transparent;
-border-right: 1px dotted silver;
white-space: normal;
word-break: break-all;
overflow: hidden;
@@ -137,4 +145,12 @@ limitations under the License. -->
height: 100%;
padding: 3px 8px;
}
+
+ .error {
+color: var(--sw-orange);
+ }
+
+ .warning {
+color: var(--sw-orange);
+ }
diff --git a/src/views/dashboard/related/log/LogTable/data.ts
b/src/views/dashboard/related/log/LogTable/data.ts
index 0978688d..96f42aa3 100644
--- a/src/views/dashboard/related/log/LogTable/data.ts
+++ b/src/views/dashboard/related/log/LogTable/data.ts
@@ -16,18 +16,18 @@
*/
export const ServiceLogConstants = [
- {
-label: "content",
-value: "content",
(skywalking) branch abandon deleted (was b21986d9d5)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch abandon in repository https://gitbox.apache.org/repos/asf/skywalking.git was b21986d9d5 Update ArrayBlockingQueueBuffer.java The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode (#11554)
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 257684a0b8 Change the policy of the queue(DataCarrier) L1 in the
metric aggregate worker to IF_POSSIBLE mode (#11554)
257684a0b8 is described below
commit 257684a0b8da98c127c0256fa052e4bc0ada008d
Author: 吴晟 Wu Sheng
AuthorDate: Thu Nov 16 19:50:24 2023 +0800
Change the policy of the queue(DataCarrier) L1 in the metric aggregate
worker to IF_POSSIBLE mode (#11554)
---
docs/en/changes/changes.md | 3 +
.../analysis/worker/MetricsAggregateWorker.java| 13 +++-
.../buffer/ArrayBlockingQueueBuffer.java | 4 +-
.../server/library/datacarrier/buffer/Buffer.java | 76 --
.../library/datacarrier/buffer/Channels.java | 6 +-
.../datacarrier/consumer/ConsumerThread.java | 4 --
6 files changed, 18 insertions(+), 88 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 5c360c2e14..bef119bce2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -39,6 +39,9 @@
* Fix `limit` doesn't work for `findEndpoint` API in ES storage.
* Isolate MAL CounterWindow cache by metric name.
* Fix JDBC Log query order.
+* Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue
implementation.
+* Change the policy of the queue(DataCarrier) in the L1 metric aggregate
worker to IF_POSSIBLE mode.
+* Add self-observability metric `metrics_aggregator_abandon` to count the
number of abandon metrics.
UI
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
index 698341144f..255aa44306 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
@@ -25,6 +25,7 @@ import
org.apache.skywalking.oap.server.core.analysis.data.MergableBufferedData;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
import org.apache.skywalking.oap.server.library.datacarrier.DataCarrier;
+import
org.apache.skywalking.oap.server.library.datacarrier.buffer.BufferStrategy;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.BulkConsumePool;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.ConsumerPoolFactory;
import org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer;
@@ -46,6 +47,7 @@ public class MetricsAggregateWorker extends
AbstractWorker {
private AbstractWorker nextWorker;
private final DataCarrier dataCarrier;
private final MergableBufferedData mergeDataCache;
+private CounterMetrics abandonCounter;
private CounterMetrics aggregationCounter;
private long lastSendTime = 0;
@@ -68,7 +70,7 @@ public class MetricsAggregateWorker extends
AbstractWorker {
queueBufferSize = 1_000;
}
this.dataCarrier = new DataCarrier<>(
-"MetricsAggregateWorker." + modelName, name, queueChannelSize,
queueBufferSize);
+"MetricsAggregateWorker." + modelName, name, queueChannelSize,
queueBufferSize, BufferStrategy.IF_POSSIBLE);
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(
name, BulkConsumePool.Creator.recommendMaxSize() * 2, 20);
@@ -82,6 +84,11 @@ public class MetricsAggregateWorker extends
AbstractWorker {
MetricsCreator metricsCreator =
moduleDefineHolder.find(TelemetryModule.NAME)
.provider()
.getService(MetricsCreator.class);
+abandonCounter = metricsCreator.createCounter(
+"metrics_aggregator_abandon", "The abandon number of rows received
in aggregation",
+new MetricsTag.Keys("metricName", "level", "dimensionality"),
+new MetricsTag.Values(modelName, "1", "minute")
+);
aggregationCounter = metricsCreator.createCounter(
"metrics_aggregation", "The number of rows in aggregation",
new MetricsTag.Keys("metricName", "level", "dimensionality"),
@@ -95,7 +102,9 @@ public class MetricsAggregateWorker extends
AbstractWorker {
*/
@Override
public final void in(Metrics metrics) {
-dataCarrier.produce(metrics);
+
(skywalking) branch abandon updated (b61b7a80f0 -> b21986d9d5)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch abandon in repository https://gitbox.apache.org/repos/asf/skywalking.git from b61b7a80f0 Fix words. add b21986d9d5 Update ArrayBlockingQueueBuffer.java No new revisions were added by this update. Summary of changes: .../server/library/datacarrier/buffer/ArrayBlockingQueueBuffer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(skywalking-booster-ui) branch main updated: fix: set the height for trace widget (#337)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git The following commit(s) were added to refs/heads/main by this push: new 2085dc84 fix: set the height for trace widget (#337) 2085dc84 is described below commit 2085dc84b95e964c34bd1d3089d221171f47e5b6 Author: Fine0830 AuthorDate: Thu Nov 16 11:44:34 2023 +0800 fix: set the height for trace widget (#337) --- src/views/dashboard/related/trace/Index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/dashboard/related/trace/Index.vue b/src/views/dashboard/related/trace/Index.vue index e7f25de9..1d525917 100644 --- a/src/views/dashboard/related/trace/Index.vue +++ b/src/views/dashboard/related/trace/Index.vue @@ -59,5 +59,6 @@ limitations under the License. --> width: 100%; overflow: auto; min-width: 1200px; +height: calc(100% - 100px); }
(skywalking) branch abandon updated (49e090debe -> b61b7a80f0)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch abandon in repository https://gitbox.apache.org/repos/asf/skywalking.git from 49e090debe Fix add b61b7a80f0 Fix words. No new revisions were added by this update. Summary of changes: docs/en/changes/changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking) branch abandon updated: Fix
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch abandon
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/abandon by this push:
new 49e090debe Fix
49e090debe is described below
commit 49e090debedcd907fb3d3c03ccd822a6e36bc57d
Author: Wu Sheng
AuthorDate: Thu Nov 16 10:13:26 2023 +0800
Fix
---
.../oap/server/library/datacarrier/consumer/ConsumerThread.java | 4
1 file changed, 4 deletions(-)
diff --git
a/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/ConsumerThread.java
b/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/ConsumerThread.java
index d5013f1c7b..30caa739b5 100644
---
a/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/ConsumerThread.java
+++
b/oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/ConsumerThread.java
@@ -20,7 +20,6 @@ package
org.apache.skywalking.oap.server.library.datacarrier.consumer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.skywalking.oap.server.library.datacarrier.buffer.Buffer;
import org.apache.skywalking.oap.server.library.datacarrier.buffer.QueueBuffer;
public class ConsumerThread extends Thread {
@@ -88,9 +87,6 @@ public class ConsumerThread extends Thread {
running = false;
}
-/**
- * DataSource is a refer to {@link Buffer}.
- */
class DataSource {
private QueueBuffer sourceBuffer;
(skywalking) branch abandon created (now ceb9a63a4d)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch abandon in repository https://gitbox.apache.org/repos/asf/skywalking.git at ceb9a63a4d * Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue implementation. * Change the policy of the queue(DataCarrier) L1 metric aggregate worker to IF_POSSIBLE mode. * Add self-observability metric `metrics_aggregator_abandon` to count the number of abandon metrics. This branch includes the following new commits: new ceb9a63a4d * Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue implementation. * Change the policy of the queue(DataCarrier) L1 metric aggregate worker to IF_POSSIBLE mode. * Add self-observability metric `metrics_aggregator_abandon` to count the number of abandon metrics. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) 01/01: * Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue implementation. * Change the policy of the queue(DataCarrier) L1 metric aggregate worker to IF_POSSIBLE mode
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch abandon
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ceb9a63a4d39358db4093169e70bfe4fc021ad3e
Author: Wu Sheng
AuthorDate: Thu Nov 16 09:58:53 2023 +0800
* Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue
implementation.
* Change the policy of the queue(DataCarrier) L1 metric aggregate worker to
IF_POSSIBLE mode.
* Add self-observability metric `metrics_aggregator_abandon` to count the
number of abandon metrics.
---
docs/en/changes/changes.md | 3 +
.../analysis/worker/MetricsAggregateWorker.java| 13 +++-
.../buffer/ArrayBlockingQueueBuffer.java | 4 +-
.../server/library/datacarrier/buffer/Buffer.java | 76 --
.../library/datacarrier/buffer/Channels.java | 6 +-
5 files changed, 18 insertions(+), 84 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 5c360c2e14..d1dc0c81c6 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -39,6 +39,9 @@
* Fix `limit` doesn't work for `findEndpoint` API in ES storage.
* Isolate MAL CounterWindow cache by metric name.
* Fix JDBC Log query order.
+* Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue
implementation.
+* Change the policy of the queue(DataCarrier) L1 metric aggregate worker to
IF_POSSIBLE mode.
+* Add self-observability metric `metrics_aggregator_abandon` to count the
number of abandon metrics.
UI
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
index 698341144f..255aa44306 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
@@ -25,6 +25,7 @@ import
org.apache.skywalking.oap.server.core.analysis.data.MergableBufferedData;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
import org.apache.skywalking.oap.server.library.datacarrier.DataCarrier;
+import
org.apache.skywalking.oap.server.library.datacarrier.buffer.BufferStrategy;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.BulkConsumePool;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.ConsumerPoolFactory;
import org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer;
@@ -46,6 +47,7 @@ public class MetricsAggregateWorker extends
AbstractWorker {
private AbstractWorker nextWorker;
private final DataCarrier dataCarrier;
private final MergableBufferedData mergeDataCache;
+private CounterMetrics abandonCounter;
private CounterMetrics aggregationCounter;
private long lastSendTime = 0;
@@ -68,7 +70,7 @@ public class MetricsAggregateWorker extends
AbstractWorker {
queueBufferSize = 1_000;
}
this.dataCarrier = new DataCarrier<>(
-"MetricsAggregateWorker." + modelName, name, queueChannelSize,
queueBufferSize);
+"MetricsAggregateWorker." + modelName, name, queueChannelSize,
queueBufferSize, BufferStrategy.IF_POSSIBLE);
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(
name, BulkConsumePool.Creator.recommendMaxSize() * 2, 20);
@@ -82,6 +84,11 @@ public class MetricsAggregateWorker extends
AbstractWorker {
MetricsCreator metricsCreator =
moduleDefineHolder.find(TelemetryModule.NAME)
.provider()
.getService(MetricsCreator.class);
+abandonCounter = metricsCreator.createCounter(
+"metrics_aggregator_abandon", "The abandon number of rows received
in aggregation",
+new MetricsTag.Keys("metricName", "level", "dimensionality"),
+new MetricsTag.Values(modelName, "1", "minute")
+);
aggregationCounter = metricsCreator.createCounter(
"metrics_aggregation", "The number of rows in aggregation",
new MetricsTag.Keys("metricName", "level", "dimensionality"),
@@ -95,7 +102,9 @@ public class MetricsAggregateWorker extends
AbstractWorker {
*/
@Override
public final void in(Metrics metrics) {
-dataCarrier.produce(metrics);
+if (!dataCarrier.produce(metrics)) {
+abandonCounter.inc();
+}
}
(skywalking-showcase) branch main updated: Update Dark theme
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-showcase.git The following commit(s) were added to refs/heads/main by this push: new 6e50e20 Update Dark theme 6e50e20 is described below commit 6e50e20df4d499361e559aae1fcc4c680dca43b4 Author: 吴晟 Wu Sheng AuthorDate: Wed Nov 15 21:02:18 2023 +0800 Update Dark theme --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 19e8cab..ac0509f 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 ?= 9fee0922a8d60321f9b46aecebf3832fe34c0ddd +SW_OAP_IMAGE_TAG ?= 798c55ce8ac4124498474de65ecf1d631bf3904a SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= 9fee0922a8d60321f9b46aecebf3832fe34c0ddd +SW_UI_IMAGE_TAG ?= 798c55ce8ac4124498474de65ecf1d631bf3904a 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
(skywalking) branch master updated: sync ui (#11551)
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 798c55ce8a sync ui (#11551) 798c55ce8a is described below commit 798c55ce8ac4124498474de65ecf1d631bf3904a Author: Fine0830 AuthorDate: Wed Nov 15 20:22:44 2023 +0800 sync ui (#11551) --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 832dc1676b..a4271bb479 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 832dc1676b7a79ed74759be3cb4f35ff522ac9b4 +Subproject commit a4271bb4797034e5921e4ef795cb6df131cdc8c8
(skywalking-booster-ui) branch main updated: feat: enhance the Dark Theme (#336)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new a4271bb4 feat: enhance the Dark Theme (#336)
a4271bb4 is described below
commit a4271bb4797034e5921e4ef795cb6df131cdc8c8
Author: Fine0830
AuthorDate: Wed Nov 15 19:53:23 2023 +0800
feat: enhance the Dark Theme (#336)
---
src/components/Graph.vue | 8 +-
src/hooks/data.ts | 40 ++
src/hooks/useLegendProcessor.ts| 39 ++
src/styles/reset.scss | 86 -
src/styles/theme.scss | 88 ++
src/views/dashboard/controls/Tab.vue | 2 +-
src/views/dashboard/graphs/Bar.vue | 2 +-
src/views/dashboard/graphs/Line.vue| 2 +-
src/views/dashboard/graphs/components/Legend.vue | 3 +-
src/views/dashboard/panel/Layout.vue | 2 +-
.../related/topology/components/Sankey.vue | 6 ++
11 files changed, 151 insertions(+), 127 deletions(-)
diff --git a/src/components/Graph.vue b/src/components/Graph.vue
index 2ad0b48f..5ed35d1d 100644
--- a/src/components/Graph.vue
+++ b/src/components/Graph.vue
@@ -252,11 +252,11 @@ limitations under the License. -->
display: block;
white-space: nowrap;
z-index: 999;
-box-shadow: #ddd 1px 2px 10px;
+box-shadow: var(--sw-topology-box-shadow);
transition: all cubic-bezier(0.075, 0.82, 0.165, 1) linear;
-background-color: rgb(255 255 255);
+background-color: var(--sw-bg-color-overlay);
border-radius: 4px;
-color: rgb(51 51 51);
+color: $font-color;
padding: 5px;
}
@@ -267,7 +267,7 @@ limitations under the License. -->
&:hover {
color: $active-color;
- background-color: #eee;
+ background-color: $popper-hover-bg-color;
}
}
diff --git a/src/hooks/data.ts b/src/hooks/data.ts
index 8d88e076..3d45a00d 100644
--- a/src/hooks/data.ts
+++ b/src/hooks/data.ts
@@ -130,3 +130,43 @@ export const RespFields: Indexable = {
error
}`,
};
+
+export const DarkChartColors = [
+ "#79bbff",
+ "#a0a7e6",
+ "#30A4EB",
+ "#45BFC0",
+ "#ebbf93",
+ "#884dde",
+ "#1bbf93",
+ "#7289ab",
+ "#f56c6c",
+ "#81feb7",
+ "#4094fa",
+ "#ff894d",
+ "#884dde",
+ "#ebbf93",
+ "#fedc6d",
+ "#da7cfa",
+ "#b88230",
+ "#a0cfff",
+];
+
+export const LightChartColors = [
+ "#3f96e3",
+ "#a0a7e6",
+ "#45BFC0",
+ "#FFCC55",
+ "#FF6A84",
+ "#c23531",
+ "#2f4554",
+ "#61a0a8",
+ "#d48265",
+ "#91c7ae",
+ "#749f83",
+ "#ca8622",
+ "#bda29a",
+ "#6e7074",
+ "#546570",
+ "#c4ccd3",
+];
diff --git a/src/hooks/useLegendProcessor.ts b/src/hooks/useLegendProcessor.ts
index 11c4e4b4..e9439a09 100644
--- a/src/hooks/useLegendProcessor.ts
+++ b/src/hooks/useLegendProcessor.ts
@@ -16,6 +16,9 @@
*/
import type { LegendOptions } from "@/types/dashboard";
import { isDef } from "@/utils/is";
+import { DarkChartColors, LightChartColors } from "./data";
+import { useAppStoreWithOut } from "@/store/modules/app";
+import { Themes } from "@/constants/data";
export default function useLegendProcess(legend?: LegendOptions) {
let isRight = false;
@@ -96,37 +99,11 @@ export default function useLegendProcess(legend?:
LegendOptions) {
return { source, headers };
}
- function chartColors(keys: string[]) {
-let color: string[] = [];
-switch (keys.length) {
- case 2:
-color = ["#FF6A84", "#a0b1e6"];
-break;
- case 1:
-color = ["#3f96e3"];
-break;
- default:
-color = [
- "#30A4EB",
- "#45BFC0",
- "#FFCC55",
- "#FF6A84",
- "#a0a7e6",
- "#c23531",
- "#2f4554",
- "#61a0a8",
- "#d48265",
- "#91c7ae",
- "#749f83",
- "#ca8622",
- "#bda29a",
- "#6e7074",
- "#546570",
- "#c4ccd3",
-];
-break;
-}
-return color;
+ function chartColors() {
+const appStore = useAppStoreWithOut();
+const list = appStore.theme === Themes.Dark ? DarkChartColors :
LightChartColors;
+
+return list;
}
(skywalking) branch master updated: Fix JDBC Log query order. (#11544)
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 eaac1c3ec4 Fix JDBC Log query order. (#11544)
eaac1c3ec4 is described below
commit eaac1c3ec44094b2810c65d7d087e646f1128f02
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Wed Nov 15 10:20:20 2023 +0800
Fix JDBC Log query order. (#11544)
---
docs/en/changes/changes.md | 1 +
.../oap/server/storage/plugin/jdbc/common/dao/JDBCLogQueryDAO.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index cfa8befdb9..5c360c2e14 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -38,6 +38,7 @@
* Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC
related storage.
* Fix `limit` doesn't work for `findEndpoint` API in ES storage.
* Isolate MAL CounterWindow cache by metric name.
+* Fix JDBC Log query order.
UI
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCLogQueryDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCLogQueryDAO.java
index 52dc2cbc96..7c96b59f1e 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCLogQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCLogQueryDAO.java
@@ -122,7 +122,7 @@ public class JDBCLogQueryDAO implements ILogQueryDAO {
)
);
}
-final var comparator = Order.DES.equals(queryOrder) ?
+final var comparator = Order.ASC.equals(queryOrder) ?
comparing(Log::getTimestamp) :
comparing(Log::getTimestamp).reversed();
(skywalking-showcase) branch main updated: Update to dark mode
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-showcase.git The following commit(s) were added to refs/heads/main by this push: new d3d13af Update to dark mode d3d13af is described below commit d3d13afcbdb5dc8faa20120757dbdd9f522cb4cd Author: 吴晟 Wu Sheng AuthorDate: Wed Nov 15 10:05:28 2023 +0800 Update to dark mode --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2b119f2..19e8cab 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 ?= bc5f63b59918c5f05bdfcf14aa335122bfe9ec27 +SW_OAP_IMAGE_TAG ?= 9fee0922a8d60321f9b46aecebf3832fe34c0ddd SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= bc5f63b59918c5f05bdfcf14aa335122bfe9ec27 +SW_UI_IMAGE_TAG ?= 9fee0922a8d60321f9b46aecebf3832fe34c0ddd 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
(skywalking-banyandb-helm) branch banyandb-0.5 deleted (was 10a1486)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch banyandb-0.5 in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git was 10a1486 change var name to avoid misunderstanding The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb-helm) branch master updated: Upgrade banyandb to 0.5.0 (#8)
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-banyandb-helm.git
The following commit(s) were added to refs/heads/master by this push:
new d5dc821 Upgrade banyandb to 0.5.0 (#8)
d5dc821 is described below
commit d5dc821be67c688f30b7e9b99c52dbcbca36cfff
Author: Wan Kai
AuthorDate: Wed Nov 15 09:19:16 2023 +0800
Upgrade banyandb to 0.5.0 (#8)
---
.github/workflows/e2e.ci.yaml | 6 +++---
chart/values.yaml | 4 ++--
test/e2e/e2e-banyandb.yaml| 2 +-
test/e2e/env | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index f7e38f3..940b1fd 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -39,9 +39,9 @@ jobs:
config: test/e2e/e2e-banyandb.yaml
name: ${{ matrix.test.name }}
env:
- OAP_TAG: 14fbd975be077082ed6fa604e05479dd9af0d995
+ OAP_TAG: 965dea898986ed2ab1343559fb20d6faed11ada9
OAP_REPO: ghcr.io/apache/skywalking/oap
- UI_TAG: 14fbd975be077082ed6fa604e05479dd9af0d995
+ UI_TAG: 965dea898986ed2ab1343559fb20d6faed11ada9
UI_REPO: ghcr.io/apache/skywalking/ui
SATELLITE_TAG: v35bfaff6352b4dc351a706772796a1f79b651c14
SATELLITE_REPO: ghcr.io/apache/skywalking-satellite/skywalking-satellite
@@ -82,4 +82,4 @@ jobs:
needs: [als]
steps:
- name: dummy
-run: echo
\ No newline at end of file
+run: echo
diff --git a/chart/values.yaml b/chart/values.yaml
index a77b0cc..d7357a6 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -27,7 +27,7 @@ standalone:
# fsGroup: 1000
image:
repository: ghcr.io/apache/skywalking-banyandb
-tag: eecd29e71bc07d07f22aea1496d80dc76a2b2f90
+tag: 84f32b3969cdcc676aaee428383b34b3b67dbdf5
pullPolicy: IfNotPresent
env: []
# - name: BANYANDB_FOO
@@ -143,4 +143,4 @@ serviceAccount:
# If not set and create is true, a name is generated using the fullname
template
name: ""
-fullnameOverride: "banyandb"
\ No newline at end of file
+fullnameOverride: "banyandb"
diff --git a/test/e2e/e2e-banyandb.yaml b/test/e2e/e2e-banyandb.yaml
index 244a189..65d42b9 100644
--- a/test/e2e/e2e-banyandb.yaml
+++ b/test/e2e/e2e-banyandb.yaml
@@ -45,7 +45,7 @@ setup:
- name: Install SkyWalking
command: |
helm -n istio-system install skywalking
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
- --version "$SW_RELEASE_VERSION" \
+ --version "$SW_HELM_VERSION" \
--set fullnameOverride=skywalking \
--set
oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=k8s-mesh \
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=k8s-mesh
\
diff --git a/test/e2e/env b/test/e2e/env
index 2d1ddae..7e1f100 100644
--- a/test/e2e/env
+++ b/test/e2e/env
@@ -24,4 +24,4 @@
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
SW_CTL_COMMIT=9d2d0edccda2afe5cf24f1e632142f40e80e8fa4
-SW_RELEASE_VERSION=0.0.0-331522d46dfb3e46dcc37943a942194720925015
\ No newline at end of file
+SW_HELM_VERSION=0.0.0-e651c381abe661e5a38ab1607758aae893b3dbeb
(skywalking-website) branch master updated: Fix title.
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 8c3379bcd48 Fix title. 8c3379bcd48 is described below commit 8c3379bcd4840532ccad8f193ccdf93f9da59a74 Author: Wu Sheng AuthorDate: Wed Nov 15 08:31:01 2023 +0800 Fix title. --- content/zh/2023-11-04-skywalking-summit-shanghai/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md index 557a07540cf..436b2b45767 100644 --- a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md +++ b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md @@ -27,7 +27,7 @@ zh_tags: * [PDF](ke_zhenxu.pdf) -## 基于 SkyWalking 建 全域一体化观测平台 +## 基于SkyWalking构建全域一体化观测平台 * 陈修能 * [PDF](chen_xiuneng.pdf)
(skywalking-website) branch master updated: Fix typos
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 4d2f64a18f0 Fix typos 4d2f64a18f0 is described below commit 4d2f64a18f0293441cad2a58d9648bf50e52efc9 Author: Wu Sheng AuthorDate: Tue Nov 14 22:55:34 2023 +0800 Fix typos --- content/zh/2023-11-04-skywalking-summit-shanghai/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md index 6d9c505830b..557a07540cf 100644 --- a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md +++ b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md @@ -27,7 +27,7 @@ zh_tags: * [PDF](ke_zhenxu.pdf) -## 基于 skyWalking 建 全域一体化观测平台 +## 基于 SkyWalking 建 全域一体化观测平台 * 陈修能 * [PDF](chen_xiuneng.pdf) @@ -37,7 +37,7 @@ zh_tags: * [PDF](gao_hongtao.pdf) -## 基于skyWalking Agent 的性能剖析和实时诊断 +## 基于 SkyWalking Agent 的性能剖析和实时诊断 * 陆家靖 * [PDF](lu_jiajing.pdf)
(skywalking-website) branch master updated: Fix typo
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 a58979665bd Fix typo a58979665bd is described below commit a58979665bd2fd50d1c938ca6297a99cf57b468f Author: Wu Sheng AuthorDate: Tue Nov 14 22:52:02 2023 +0800 Fix typo --- content/zh/2023-11-04-skywalking-summit-shanghai/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md index 0afdb0edd8f..6d9c505830b 100644 --- a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md +++ b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md @@ -22,7 +22,7 @@ zh_tags: * [PDF](wu_sheng.pdf) -## 使用 Terraform 与 Ansible 快速部署skyWalking 集群 +## 使用 Terraform 与 Ansible 快速部署 SkyWalking 集群 * 柯振旭 * [PDF](ke_zhenxu.pdf)
(skywalking-website) branch master updated: SkyWalking Summit 2023 schedule and PDFs (#659)
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 6b43fea5af2 SkyWalking Summit 2023 schedule and PDFs (#659) 6b43fea5af2 is described below commit 6b43fea5af2015480f20e5fd8cb562be89083328 Author: 吴晟 Wu Sheng AuthorDate: Tue Nov 14 22:16:09 2023 +0800 SkyWalking Summit 2023 schedule and PDFs (#659) --- .../banner.jpg | Bin 0 -> 1159098 bytes .../chen_xiuneng.pdf | Bin 0 -> 14378518 bytes .../gao_hongtao.pdf| Bin 0 -> 6432788 bytes .../huo_bingjie.pdf| Bin 0 -> 5904553 bytes .../2023-11-04-skywalking-summit-shanghai/index.md | 56 + .../ke_zhenxu.pdf | Bin 0 -> 9153723 bytes .../lu_jiajing.pdf | Bin 0 -> 9034209 bytes .../tian_chuan.pdf | Bin 0 -> 10720239 bytes .../wu_sheng.pdf | Bin 0 -> 9136638 bytes .../zhang_wenjie.pdf | Bin 0 -> 11850787 bytes 10 files changed, 56 insertions(+) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/banner.jpg b/content/zh/2023-11-04-skywalking-summit-shanghai/banner.jpg new file mode 100644 index 000..4b004f05d7e Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/banner.jpg differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/chen_xiuneng.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/chen_xiuneng.pdf new file mode 100644 index 000..197fbeffe61 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/chen_xiuneng.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/gao_hongtao.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/gao_hongtao.pdf new file mode 100644 index 000..687491cfcca Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/gao_hongtao.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/huo_bingjie.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/huo_bingjie.pdf new file mode 100644 index 000..ed35de97d04 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/huo_bingjie.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md new file mode 100644 index 000..0afdb0edd8f --- /dev/null +++ b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md @@ -0,0 +1,56 @@ +--- +title: "SkyWalking Summit 2023 @ Shanghai 会议回顾" +author: "SkyWalking" +date: 2023-11-14 +description: "SkyWalking Summit 全天议程录像" +zh_tags: +- Video +- Conference +--- + +# SkyWalking Summit 2023 @ Shanghai + + +会议时间：2023年11月4日 全天 +地点：上海大华虹桥假日酒店 +赞助商：纵目科技，Tetrate + +# 会议议程 与 PDF + +## SkyWalking V9 In 2023 - 5 featured releases +* 吴晟 +* [PDF](wu_sheng.pdf) + + +## 使用 Terraform 与 Ansible 快速部署skyWalking 集群 +* 柯振旭 +* [PDF](ke_zhenxu.pdf) + + +## 基于 skyWalking 建 全域一体化观测平台 +* 陈修能 +* [PDF](chen_xiuneng.pdf) + + +## 云原生可观测性数据库BanyanDB +* 高洪涛 +* [PDF](gao_hongtao.pdf) + + +## 基于skyWalking Agent 的性能剖析和实时诊断 +* 陆家靖 +* [PDF](lu_jiajing.pdf) + + +## 太保科技-多云环境下Zabbix的运用实践 +* 田川 +* [PDF](tian_chuan.pdf) + + +## KubeSphere 在可观测性领域的探索与实践 +* 霍秉杰 +* [PDF](huo_bingjie.pdf) + +## 大型跨国企业的微服务治理 +* 张文杰 +* [PDF](zhang_wenjie.pdf) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/ke_zhenxu.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/ke_zhenxu.pdf new file mode 100644 index 000..0f181b74311 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/ke_zhenxu.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/lu_jiajing.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/lu_jiajing.pdf new file mode 100644 index 000..614f3f6c146 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/lu_jiajing.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/tian_chuan.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/tian_chuan.pdf new file mode 100644 index 000..99561aa1f0f Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/tian_chuan.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/wu_sheng.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/wu_sheng.pdf new file mode 100644 index 000..283ba1c8a36 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/wu_sheng.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/zhang_wenji
(skywalking-website) branch summit deleted (was e510eccab84)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch summit in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was e510eccab84 SkyWalking summit blogs 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 summit created (now e510eccab84)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch summit in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at e510eccab84 SkyWalking summit blogs This branch includes the following new commits: new 71eae2fe5e9 Summit records page. new ef383a69ee5 Merge commit '9aa4e59d5ead9ddbdf0deb26ea604e45da3cc981' into summit new e510eccab84 SkyWalking summit blogs The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-website) 03/03: SkyWalking summit blogs
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch summit in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit e510eccab84484b7f399b68a6c34dcfc466f5a7b Author: Wu Sheng AuthorDate: Tue Nov 14 22:06:56 2023 +0800 SkyWalking summit blogs --- .../chen_xiuneng.pdf | Bin 0 -> 14378518 bytes .../gao_hongtao.pdf | Bin 0 -> 6432788 bytes .../huo_bingjie.pdf | Bin 0 -> 5904553 bytes .../2023-11-04-skywalking-summit-shanghai/index.md | 14 ++ .../ke_zhenxu.pdf| Bin 0 -> 9153723 bytes .../lu_jiajing.pdf | Bin 0 -> 9034209 bytes .../tian_chuan.pdf | Bin 0 -> 10720239 bytes .../wu_sheng.pdf | Bin 0 -> 9136638 bytes .../zhang_wenjie.pdf | Bin 0 -> 11850787 bytes 9 files changed, 10 insertions(+), 4 deletions(-) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/chen_xiuneng.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/chen_xiuneng.pdf new file mode 100644 index 000..197fbeffe61 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/chen_xiuneng.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/gao_hongtao.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/gao_hongtao.pdf new file mode 100644 index 000..687491cfcca Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/gao_hongtao.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/huo_bingjie.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/huo_bingjie.pdf new file mode 100644 index 000..ed35de97d04 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/huo_bingjie.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md index 2e84b70a3e9..0afdb0edd8f 100644 --- a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md +++ b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md @@ -1,7 +1,7 @@ --- title: "SkyWalking Summit 2023 @ Shanghai 会议回顾" author: "SkyWalking" -date: 2023-12-06 +date: 2023-11-14 description: "SkyWalking Summit 全天议程录像" zh_tags: - Video @@ -15,36 +15,42 @@ zh_tags: 地点：上海大华虹桥假日酒店 赞助商：纵目科技，Tetrate -# 会议议程以及录像 +# 会议议程 与 PDF ## SkyWalking V9 In 2023 - 5 featured releases * 吴晟 +* [PDF](wu_sheng.pdf) ## 使用 Terraform 与 Ansible 快速部署skyWalking 集群 * 柯振旭 +* [PDF](ke_zhenxu.pdf) ## 基于 skyWalking 建 全域一体化观测平台 * 陈修能 - +* [PDF](chen_xiuneng.pdf) ## 云原生可观测性数据库BanyanDB * 高洪涛 +* [PDF](gao_hongtao.pdf) ## 基于skyWalking Agent 的性能剖析和实时诊断 * 陆家靖 +* [PDF](lu_jiajing.pdf) ## 太保科技-多云环境下Zabbix的运用实践 * 田川 +* [PDF](tian_chuan.pdf) ## KubeSphere 在可观测性领域的探索与实践 * 霍秉杰 - +* [PDF](huo_bingjie.pdf) ## 大型跨国企业的微服务治理 * 张文杰 +* [PDF](zhang_wenjie.pdf) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/ke_zhenxu.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/ke_zhenxu.pdf new file mode 100644 index 000..0f181b74311 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/ke_zhenxu.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/lu_jiajing.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/lu_jiajing.pdf new file mode 100644 index 000..614f3f6c146 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/lu_jiajing.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/tian_chuan.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/tian_chuan.pdf new file mode 100644 index 000..99561aa1f0f Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/tian_chuan.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/wu_sheng.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/wu_sheng.pdf new file mode 100644 index 000..283ba1c8a36 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/wu_sheng.pdf differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/zhang_wenjie.pdf b/content/zh/2023-11-04-skywalking-summit-shanghai/zhang_wenjie.pdf new file mode 100644 index 000..199b4604761 Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/zhang_wenjie.pdf differ
(skywalking-website) 02/03: Merge commit '9aa4e59d5ead9ddbdf0deb26ea604e45da3cc981' into summit
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch summit in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit ef383a69ee59809f41328ab39882165cb4ca29b0 Merge: 71eae2fe5e9 9aa4e59d5ea Author: Wu Sheng AuthorDate: Fri Nov 10 11:36:13 2023 +0800 Merge commit '9aa4e59d5ead9ddbdf0deb26ea604e45da3cc981' into summit .../index.md | 10 +++ content/zh/2023-11-09-ospp-summary/index.md| 84 + data/docs.yml | 4 +- data/releases.yml | 14 ++-- static/doc-graph/swck/demo-ui.png | Bin 0 -> 51668 bytes 5 files changed, 103 insertions(+), 9 deletions(-)
(skywalking-website) 01/03: Summit records page.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch summit in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 71eae2fe5e9b4731f0c286e5c1e0690cbdd34937 Author: Wu Sheng AuthorDate: Thu Nov 9 14:47:10 2023 +0800 Summit records page. --- .../banner.jpg | Bin 0 -> 1159098 bytes .../2023-11-04-skywalking-summit-shanghai/index.md | 50 + 2 files changed, 50 insertions(+) diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/banner.jpg b/content/zh/2023-11-04-skywalking-summit-shanghai/banner.jpg new file mode 100644 index 000..4b004f05d7e Binary files /dev/null and b/content/zh/2023-11-04-skywalking-summit-shanghai/banner.jpg differ diff --git a/content/zh/2023-11-04-skywalking-summit-shanghai/index.md b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md new file mode 100644 index 000..2e84b70a3e9 --- /dev/null +++ b/content/zh/2023-11-04-skywalking-summit-shanghai/index.md @@ -0,0 +1,50 @@ +--- +title: "SkyWalking Summit 2023 @ Shanghai 会议回顾" +author: "SkyWalking" +date: 2023-12-06 +description: "SkyWalking Summit 全天议程录像" +zh_tags: +- Video +- Conference +--- + +# SkyWalking Summit 2023 @ Shanghai + + +会议时间：2023年11月4日 全天 +地点：上海大华虹桥假日酒店 +赞助商：纵目科技，Tetrate + +# 会议议程以及录像 + +## SkyWalking V9 In 2023 - 5 featured releases +* 吴晟 + + +## 使用 Terraform 与 Ansible 快速部署skyWalking 集群 +* 柯振旭 + + +## 基于 skyWalking 建 全域一体化观测平台 +* 陈修能 + + + +## 云原生可观测性数据库BanyanDB +* 高洪涛 + + +## 基于skyWalking Agent 的性能剖析和实时诊断 +* 陆家靖 + + +## 太保科技-多云环境下Zabbix的运用实践 +* 田川 + + +## KubeSphere 在可观测性领域的探索与实践 +* 霍秉杰 + + +## 大型跨国企业的微服务治理 +* 张文杰
(skywalking) branch master updated: Sync UI: Implement the Dark Theme (#11543)
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 9fee0922a8 Sync UI: Implement the Dark Theme (#11543)
9fee0922a8 is described below
commit 9fee0922a8d60321f9b46aecebf3832fe34c0ddd
Author: Fine0830
AuthorDate: Tue Nov 14 22:02:54 2023 +0800
Sync UI: Implement the Dark Theme (#11543)
---
docs/en/changes/changes.md| 3 +++
.../resources/ui-initialized-templates/apisix/apisix-root.json| 4 ++--
.../ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json | 4 ++--
.../resources/ui-initialized-templates/aws_eks/aws_eks-root.json | 4 ++--
.../ui-initialized-templates/aws_gateway/aws_gateway-root.json| 4 ++--
.../resources/ui-initialized-templates/aws_s3/aws_s3-root.json| 4 ++--
.../ui-initialized-templates/bookkeeper/bookkeeper-root.json | 4 ++--
.../resources/ui-initialized-templates/browser/browser-root.json | 4 ++--
.../elasticsearch/elasticsearch-root.json | 4 ++--
.../main/resources/ui-initialized-templates/faas/faas-root.json | 4 ++--
.../resources/ui-initialized-templates/general/general-root.json | 4 ++--
.../ui-initialized-templates/general/general-service.json | 8
.../src/main/resources/ui-initialized-templates/k8s/k8s-root.json | 4 ++--
.../ui-initialized-templates/k8s_service/k8s-service-root.json| 4 ++--
.../ui-initialized-templates/k8s_service/k8s-service-service.json | 4 ++--
.../main/resources/ui-initialized-templates/kafka/kafka-root.json | 4 ++--
.../ui-initialized-templates/mesh/mesh-proces-relation.json | 4 ++--
.../main/resources/ui-initialized-templates/mesh/mesh-root.json | 4 ++--
.../resources/ui-initialized-templates/mesh/mesh-service.json | 4 ++--
.../ui-initialized-templates/mesh_cp/mesh-control-plane-root.json | 4 ++--
.../ui-initialized-templates/mesh_dp/mesh-data-plane-root.json| 4 ++--
.../ui-initialized-templates/mesh_dp/mesh-data-plane-service.json | 4 ++--
.../resources/ui-initialized-templates/mongodb/mongodb-root.json | 4 ++--
.../main/resources/ui-initialized-templates/mysql/mysql-root.json | 4 ++--
.../resources/ui-initialized-templates/os_linux/linux-root.json | 4 ++--
.../ui-initialized-templates/os_windows/windows-root.json | 4 ++--
.../ui-initialized-templates/postgresql/postgresql-root.json | 4 ++--
.../resources/ui-initialized-templates/pulsar/pulsar-root.json| 4 ++--
.../ui-initialized-templates/rabbitmq/rabbitmq-root.json | 4 ++--
.../main/resources/ui-initialized-templates/redis/redis-root.json | 4 ++--
.../ui-initialized-templates/so11y_oap/so11y-service.json | 4 ++--
.../ui-initialized-templates/so11y_satellite/so11y-root.json | 4 ++--
.../virtual_cache/virtual-cache-root.json | 4 ++--
.../virtual_database/virtual-database-root.json | 4 ++--
skywalking-ui | 2 +-
35 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 4b01ffcd4d..cfa8befdb9 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -54,6 +54,9 @@
* Add a title and a description for trace segments.
* Add Netty icon for Netty HTTP plugin.
* Add Pulsar menu i18n files.
+* Refactor Logs view.
+* Implement the Dark Theme.
+* Change UI templates for Text widgets.
Documentation
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json
index c5f5029113..7137533693 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json
@@ -28,8 +28,8 @@
"i":"1",
"type":"Text",
"graph":{
- "fontColor":"blue",
- "backgroundColor":"white",
+ "fontColor":"theme",
+ "backgroundColor":"theme",
"content":"Provide APISIX monitoring through OpenTelemetry's
Prometheus Receiver",
"fontSize":14,
"textAlign":"left",
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json
index 29b598ccf4..d2472a5c7a 100644
---
a/oa
(skywalking-booster-ui) branch main updated: feat: implement the Dark Theme (#334)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git The following commit(s) were added to refs/heads/main by this push: new 832dc167 feat: implement the Dark Theme (#334) 832dc167 is described below commit 832dc1676b7a79ed74759be3cb4f35ff522ac9b4 Author: Fine0830 AuthorDate: Tue Nov 14 20:37:15 2023 +0800 feat: implement the Dark Theme (#334) --- package-lock.json | 196 + package.json | 2 +- src/App.vue| 5 +- src/assets/img/tools/EXIT.png | Bin 269 -> 259 bytes src/components/SelectSingle.vue| 6 +- src/constants/data.ts | 5 + src/hooks/useEcharts.ts| 7 +- src/layout/components/AppMain.vue | 2 +- src/layout/components/NavBar.vue | 37 ++-- src/store/modules/app.ts | 6 + src/store/modules/profile.ts | 2 +- src/styles/light.scss | 25 --- src/styles/reset.scss | 25 +-- src/styles/theme.scss | 152 src/views/Marketplace.vue | 2 +- src/views/Settings.vue | 4 +- src/views/alarm/Content.vue| 2 +- src/views/alarm/Header.vue | 11 +- src/views/dashboard/Widget.vue | 2 +- .../configuration/ContinuousProfiling.vue | 2 +- src/views/dashboard/configuration/Event.vue| 2 +- src/views/dashboard/configuration/Text.vue | 3 +- .../dashboard/configuration/ThirdPartyApp.vue | 2 +- src/views/dashboard/configuration/TimeRange.vue| 2 +- src/views/dashboard/configuration/Topology.vue | 2 +- src/views/dashboard/configuration/Widget.vue | 6 +- .../configuration/widget/metric/Index.vue | 3 +- .../dashboard/controls/ContinuousProfiling.vue | 6 +- src/views/dashboard/controls/DemandLog.vue | 4 +- src/views/dashboard/controls/Ebpf.vue | 4 +- src/views/dashboard/controls/Event.vue | 4 +- src/views/dashboard/controls/Log.vue | 4 +- src/views/dashboard/controls/NetworkProfiling.vue | 6 +- src/views/dashboard/controls/Profile.vue | 4 +- src/views/dashboard/controls/Tab.vue | 11 +- src/views/dashboard/controls/TaskTimeline.vue | 6 +- src/views/dashboard/controls/Text.vue | 16 +- src/views/dashboard/controls/ThirdPartyApp.vue | 2 +- src/views/dashboard/controls/TimeRange.vue | 2 +- src/views/dashboard/controls/Topology.vue | 3 +- src/views/dashboard/controls/Trace.vue | 4 +- src/views/dashboard/controls/Widget.vue| 4 +- src/views/dashboard/data.ts| 4 +- src/views/dashboard/graphs/Bar.vue | 8 +- src/views/dashboard/graphs/Card.vue| 2 +- src/views/dashboard/graphs/Line.vue| 14 +- src/views/dashboard/graphs/Table.vue | 4 +- src/views/dashboard/graphs/TopList.vue | 10 +- src/views/dashboard/panel/Layout.vue | 4 +- src/views/dashboard/panel/Tool.vue | 30 ++-- .../components/InstanceList.vue| 4 +- .../continuous-profiling/components/Policy.vue | 4 +- .../continuous-profiling/components/PolicyList.vue | 8 +- src/views/dashboard/related/ebpf/Header.vue| 2 +- .../dashboard/related/ebpf/components/TaskList.vue | 12 +- src/views/dashboard/related/log/LogTable/Index.vue | 6 +- .../components/ProcessTopology.vue | 4 +- .../related/network-profiling/components/Tasks.vue | 8 +- .../network-profiling/components/TimeLine.vue | 2 +- src/views/dashboard/related/profile/Header.vue | 2 +- .../related/profile/components/SegmentList.vue | 17 +- .../related/profile/components/Stack/Container.vue | 4 +- .../related/profile/components/Stack/Item.vue | 30 ++-- .../related/profile/components/TaskList.vue| 16 +- .../related/topology/components/Graph.vue | 41 ++--- .../related/topology/components/PodTopology.vue| 12 +- .../related/topology/components/Sankey.vue | 5 +- .../related/topology/components/Settings.vue | 4 +- .../related/topology/components/utils/layout.ts| 1 - src/views/dashboard/related/trace/Detail.vue | 6 +- src/views/dashboard/related/trace/Header.vue | 4 +- src/views/dashboard/related/trace/Index.vue| 2 +- src/views/dashboard/related/trace/TraceList.
(skywalking-swck) branch dep deleted (was 1d3e4c1)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch dep in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git was 1d3e4c1 Bump up dependencies 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-swck) branch master updated: Bump up dependencies (#102)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git The following commit(s) were added to refs/heads/master by this push: new 56846b5 Bump up dependencies (#102) 56846b5 is described below commit 56846b5f04ee32d83b385a7720ab3b2de7cb473d Author: kezhenxu94 AuthorDate: Tue Nov 14 17:00:33 2023 +0800 Bump up dependencies (#102) --- adapter/dist/LICENSE | 26 ++-- ...e-google.golang.org-genproto-googleapis-api.txt | 144 - ...e-google.golang.org-genproto-googleapis-rpc.txt | 144 - adapter/go.mod | 26 ++-- adapter/go.sum | 59 + operator/dist/LICENSE | 22 ++-- operator/go.mod| 22 ++-- operator/go.sum| 39 +++--- 8 files changed, 155 insertions(+), 327 deletions(-) diff --git a/adapter/dist/LICENSE b/adapter/dist/LICENSE index dad5f59..87b4c07 100644 --- a/adapter/dist/LICENSE +++ b/adapter/dist/LICENSE @@ -46,8 +46,10 @@ Apache-2.0 licenses go.opentelemetry.io/otel/trace v0.20.0 Apache-2.0 go.opentelemetry.io/proto/otlp v0.7.0 Apache-2.0 google.golang.org/appengine v1.6.7 Apache-2.0 -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f Apache-2.0 -google.golang.org/grpc v1.53.0 Apache-2.0 +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 Apache-2.0 +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b Apache-2.0 +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 Apache-2.0 +google.golang.org/grpc v1.59.0 Apache-2.0 gopkg.in/yaml.v2 v2.4.0 Apache-2.0 k8s.io/api v0.24.3 Apache-2.0 k8s.io/apimachinery v0.24.3 Apache-2.0 @@ -84,22 +86,22 @@ BSD-3-Clause licenses github.com/evanphx/json-patch v4.12.0+incompatible BSD-3-Clause github.com/fsnotify/fsnotify v1.4.9 BSD-3-Clause github.com/gogo/protobuf v1.3.2 BSD-3-Clause -github.com/golang/protobuf v1.5.2 BSD-3-Clause +github.com/golang/protobuf v1.5.3 BSD-3-Clause github.com/google/go-cmp v0.5.9 BSD-3-Clause -github.com/google/uuid v1.3.0 BSD-3-Clause +github.com/google/uuid v1.3.1 BSD-3-Clause github.com/grpc-ecosystem/grpc-gateway v1.16.0 BSD-3-Clause github.com/imdario/mergo v0.3.10 BSD-3-Clause github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 BSD-3-Clause github.com/spf13/pflag v1.0.5 BSD-3-Clause -golang.org/x/crypto v0.3.0 BSD-3-Clause -golang.org/x/net v0.7.0 BSD-3-Clause -golang.org/x/oauth2 v0.4.0 BSD-3-Clause -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 BSD-3-Clause -golang.org/x/sys v0.10.0 BSD-3-Clause -golang.org/x/term v0.5.0 BSD-3-Clause -golang.org/x/text v0.7.0 BSD-3-Clause +golang.org/x/crypto v0.15.0 BSD-3-Clause +golang.org/x/net v0.18.0 BSD-3-Clause +golang.org/x/oauth2 v0.11.0 BSD-3-Clause +golang.org/x/sync v0.3.0 BSD-3-Clause +golang.org/x/sys v0.14.0 BSD-3-Clause +golang.org/x/term v0.14.0 BSD-3-Clause +golang.org/x/text v0.14.0 BSD-3-Clause golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 BSD-3-Clause -google.golang.org/protobuf v1.28.1 BSD-3-Clause +google.golang.org/protobuf v1.31.0 BSD-3-Clause gopkg.in/inf.v0 v0.9.1 BSD-3-Clause diff --git a/operator/dist/LICENSE b/adapter/dist/licenses/license-google.golang.org-genproto-googleapis-api.txt similarity index 64% copy from operator/dist/LICENSE copy to adapter/dist/licenses/license-google.golang.org-genproto-googleapis-api.txt index 3841cb3..d645695 100644 --- a/operator/dist/LICENSE +++ b/adapter/dist/licenses/license-google.golang.org-genproto-googleapis-api.txt @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -173,124 +174,29 @@ incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within
(skywalking) branch wu-sheng-patch-1 deleted (was 58fc853b5f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git was 58fc853b5f Update e2e.yaml The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Update Java and node agents in the e2e (#11535)
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 965dea8989 Update Java and node agents in the e2e (#11535)
965dea8989 is described below
commit 965dea898986ed2ab1343559fb20d6faed11ada9
Author: 吴晟 Wu Sheng
AuthorDate: Mon Nov 13 22:23:43 2023 +0800
Update Java and node agents in the e2e (#11535)
---
test/e2e-v2/cases/nodejs/e2e.yaml | 6 +++---
.../cases/nodejs/expected/service-endpoint-consumer-nodejs.yml | 4 ++--
.../cases/nodejs/expected/service-endpoint-provider-nodejs.yml | 4 ++--
test/e2e-v2/cases/nodejs/expected/traces-list.yml | 2 +-
test/e2e-v2/script/env | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/e2e-v2/cases/nodejs/e2e.yaml
b/test/e2e-v2/cases/nodejs/e2e.yaml
index 9b45c51791..031d839918 100644
--- a/test/e2e-v2/cases/nodejs/e2e.yaml
+++ b/test/e2e-v2/cases/nodejs/e2e.yaml
@@ -89,11 +89,11 @@ verify:
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=service_instance_sla --instance-name=provider-instance
--service-name=provider |yq e 'to_entries' -
expected: expected/metrics-has-value.yml
# service endpoint metrics
-- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_cpm --endpoint-name=/users --service-name=consumer |yq e
'to_entries' -
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_cpm --endpoint-name=POST:/users --service-name=consumer |yq e
'to_entries' -
expected: expected/metrics-has-value.yml
-- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_resp_time --endpoint-name=/users --service-name=consumer |yq e
'to_entries' -
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_resp_time --endpoint-name=POST:/users --service-name=consumer
|yq e 'to_entries' -
expected: expected/metrics-has-value.yml
-- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_sla --endpoint-name=/users --service-name=consumer |yq e
'to_entries' -
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_sla --endpoint-name=POST:/users --service-name=consumer |yq e
'to_entries' -
expected: expected/metrics-has-value.yml
# service relation metrics
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=service_relation_client_cpm --service-name=consumer
--dest-service-name=e2e-service-consumer |yq e 'to_entries' -
diff --git
a/test/e2e-v2/cases/nodejs/expected/service-endpoint-consumer-nodejs.yml
b/test/e2e-v2/cases/nodejs/expected/service-endpoint-consumer-nodejs.yml
index 334098db40..825101bbb3 100644
--- a/test/e2e-v2/cases/nodejs/expected/service-endpoint-consumer-nodejs.yml
+++ b/test/e2e-v2/cases/nodejs/expected/service-endpoint-consumer-nodejs.yml
@@ -14,6 +14,6 @@
# limitations under the License.
{{- contains .}}
-- id: {{ b64enc "consumer" }}.1_{{ b64enc "/users" }}
- name: /users
+- id: {{ b64enc "consumer" }}.1_{{ b64enc "POST:/users" }}
+ name: POST:/users
{{- end}}
diff --git
a/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
b/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
index 6872b3576b..8444dcc457 100644
--- a/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
+++ b/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
@@ -14,6 +14,6 @@
# limitations under the License.
{{- contains .}}
-- id: {{ b64enc "provider" }}.1_{{ b64enc "/users" }}
- name: /users
+- id: {{ b64enc "provider" }}.1_{{ b64enc "POST:/users" }}
+ name: POST:/users
{{- end}}
diff --git a/test/e2e-v2/cases/nodejs/expected/traces-list.yml
b/test/e2e-v2/cases/nodejs/expected/traces-list.yml
index 3a63ee564d..127b6adbca 100644
--- a/test/e2e-v2/cases/nodejs/expected/traces-list.yml
+++ b/test/e2e-v2/cases/nodejs/expected/traces-list.yml
@@ -17,7 +17,7 @@ traces:
{{- contains .traces }}
- segmentid: {{ notEmpty .segmentid }}
endpointnames:
-- /users
+- POST:/users
duration: {{ ge .duration 0 }}
start: "{{ notEmpty .start}}"
iserror: false
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 0e82312f73..fe0c72566b 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -13,10 +13,10 @@
# See the Li
(skywalking) branch wu-sheng-patch-1 updated: Update e2e.yaml
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/wu-sheng-patch-1 by this push:
new 58fc853b5f Update e2e.yaml
58fc853b5f is described below
commit 58fc853b5f74eec441f9ee8acd285b0c8f6dc36a
Author: 吴晟 Wu Sheng
AuthorDate: Mon Nov 13 21:37:18 2023 +0800
Update e2e.yaml
---
test/e2e-v2/cases/nodejs/e2e.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/e2e-v2/cases/nodejs/e2e.yaml
b/test/e2e-v2/cases/nodejs/e2e.yaml
index 9b45c51791..031d839918 100644
--- a/test/e2e-v2/cases/nodejs/e2e.yaml
+++ b/test/e2e-v2/cases/nodejs/e2e.yaml
@@ -89,11 +89,11 @@ verify:
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=service_instance_sla --instance-name=provider-instance
--service-name=provider |yq e 'to_entries' -
expected: expected/metrics-has-value.yml
# service endpoint metrics
-- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_cpm --endpoint-name=/users --service-name=consumer |yq e
'to_entries' -
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_cpm --endpoint-name=POST:/users --service-name=consumer |yq e
'to_entries' -
expected: expected/metrics-has-value.yml
-- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_resp_time --endpoint-name=/users --service-name=consumer |yq e
'to_entries' -
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_resp_time --endpoint-name=POST:/users --service-name=consumer
|yq e 'to_entries' -
expected: expected/metrics-has-value.yml
-- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_sla --endpoint-name=/users --service-name=consumer |yq e
'to_entries' -
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=endpoint_sla --endpoint-name=POST:/users --service-name=consumer |yq e
'to_entries' -
expected: expected/metrics-has-value.yml
# service relation metrics
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=service_relation_client_cpm --service-name=consumer
--dest-service-name=e2e-service-consumer |yq e 'to_entries' -
(skywalking) branch wu-sheng-patch-1 updated: Update traces-list.yml
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/wu-sheng-patch-1 by this push:
new f2c236f7f5 Update traces-list.yml
f2c236f7f5 is described below
commit f2c236f7f5ead24a6a20c2ffe2fd636331ca2abe
Author: 吴晟 Wu Sheng
AuthorDate: Mon Nov 13 20:48:39 2023 +0800
Update traces-list.yml
---
test/e2e-v2/cases/nodejs/expected/traces-list.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/e2e-v2/cases/nodejs/expected/traces-list.yml
b/test/e2e-v2/cases/nodejs/expected/traces-list.yml
index 3a63ee564d..127b6adbca 100644
--- a/test/e2e-v2/cases/nodejs/expected/traces-list.yml
+++ b/test/e2e-v2/cases/nodejs/expected/traces-list.yml
@@ -17,7 +17,7 @@ traces:
{{- contains .traces }}
- segmentid: {{ notEmpty .segmentid }}
endpointnames:
-- /users
+- POST:/users
duration: {{ ge .duration 0 }}
start: "{{ notEmpty .start}}"
iserror: false
(skywalking) branch wu-sheng-patch-1 updated (6659d36619 -> ab49775a88)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git from 6659d36619 Update service-endpoint-provider-nodejs.yml add ab49775a88 Update service-endpoint-consumer-nodejs.yml No new revisions were added by this update. Summary of changes: .../e2e-v2/cases/nodejs/expected/service-endpoint-consumer-nodejs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(skywalking) branch wu-sheng-patch-1 updated: Update service-endpoint-provider-nodejs.yml
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/wu-sheng-patch-1 by this push:
new 6659d36619 Update service-endpoint-provider-nodejs.yml
6659d36619 is described below
commit 6659d366198ff64469f532dfe7b66635fadb63d8
Author: 吴晟 Wu Sheng
AuthorDate: Mon Nov 13 20:10:19 2023 +0800
Update service-endpoint-provider-nodejs.yml
---
.../e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
b/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
index 6872b3576b..8444dcc457 100644
--- a/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
+++ b/test/e2e-v2/cases/nodejs/expected/service-endpoint-provider-nodejs.yml
@@ -14,6 +14,6 @@
# limitations under the License.
{{- contains .}}
-- id: {{ b64enc "provider" }}.1_{{ b64enc "/users" }}
- name: /users
+- id: {{ b64enc "provider" }}.1_{{ b64enc "POST:/users" }}
+ name: POST:/users
{{- end}}
(skywalking) 01/01: Update Java and node agents in the e2e
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit d966e73d61002ffbf67488b79c12dd71c2462846 Author: 吴晟 Wu Sheng AuthorDate: Mon Nov 13 14:25:29 2023 +0800 Update Java and node agents in the e2e --- test/e2e-v2/script/env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 0e82312f73..fe0c72566b 100644 --- a/test/e2e-v2/script/env +++ b/test/e2e-v2/script/env @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -SW_AGENT_JAVA_COMMIT=f25e6600b487a440d1104c628f235a122cc7653e +SW_AGENT_JAVA_COMMIT=c82287e1dd1593cf3e7dbc390b92f9224943252a SW_AGENT_SATELLITE_COMMIT=ea27a3f4e126a24775fe12e2aa2695bcb23d99c3 SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa -SW_AGENT_NODEJS_COMMIT=2e7560518aff846befd4d6bc815fe5e38c704a11 +SW_AGENT_NODEJS_COMMIT=4f9a91dad3dfd8cfe5ba8f7bd06b39e11eb5e65e SW_AGENT_GO_COMMIT=4af380c2db6243106b0fc650b6003ce3b3eb82a0 SW_AGENT_PYTHON_COMMIT=c76a6ec51a478ac91abb20ec8f22a99b8d4d6a58 SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
(skywalking) branch wu-sheng-patch-1 created (now d966e73d61)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git at d966e73d61 Update Java and node agents in the e2e This branch includes the following new commits: new d966e73d61 Update Java and node agents in the e2e The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) branch master updated: Isolate MAL CounterWindow cache by metric name. (#11526)
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 019c6feb2e Isolate MAL CounterWindow cache by metric name. (#11526)
019c6feb2e is described below
commit 019c6feb2ef720cddf2a26a1dfcc531070330988
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Sat Nov 11 00:09:37 2023 +0800
Isolate MAL CounterWindow cache by metric name. (#11526)
---
docs/en/changes/changes.md | 1 +
.../skywalking/oap/meter/analyzer/Analyzer.java| 2 +-
.../oap/meter/analyzer/MetricConvert.java | 2 +-
.../skywalking/oap/meter/analyzer/dsl/DSL.java | 5 +++--
.../oap/meter/analyzer/dsl/Expression.java | 24 ++
.../skywalking/oap/meter/analyzer/dsl/Sample.java | 8
.../oap/meter/analyzer/dsl/SampleFamily.java | 12 +--
.../oap/meter/analyzer/dsl/AggregationTest.java| 2 +-
.../oap/meter/analyzer/dsl/ArithmeticTest.java | 2 +-
.../oap/meter/analyzer/dsl/BasicTest.java | 2 +-
.../meter/analyzer/dsl/ExpressionParsingTest.java | 2 +-
.../oap/meter/analyzer/dsl/FilterTest.java | 2 +-
.../oap/meter/analyzer/dsl/FunctionTest.java | 2 +-
.../oap/meter/analyzer/dsl/IncreaseTest.java | 2 +-
.../oap/meter/analyzer/dsl/K8sTagTest.java | 2 +-
.../oap/meter/analyzer/dsl/ScopeTest.java | 2 +-
.../oap/meter/analyzer/dsl/TagFilterTest.java | 2 +-
.../oap/meter/analyzer/dsl/ValueFilterTest.java| 2 +-
18 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index c959d155eb..4b01ffcd4d 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -37,6 +37,7 @@
* Support output key parameters in the booting logs.
* Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC
related storage.
* Fix `limit` doesn't work for `findEndpoint` API in ES storage.
+* Isolate MAL CounterWindow cache by metric name.
UI
diff --git
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
index a87bd47122..27a203c578 100644
---
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
+++
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
@@ -84,7 +84,7 @@ public class Analyzer {
final String filterExpression,
final String expression,
final MeterSystem meterSystem) {
-Expression e = DSL.parse(expression);
+Expression e = DSL.parse(metricName, expression);
FilterExpression filter = null;
if (!Strings.isNullOrEmpty(filterExpression)) {
filter = new FilterExpression(filterExpression);
diff --git
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
index beb56851c4..5c89f42b5e 100644
---
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
+++
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
@@ -120,7 +120,7 @@ public class MetricConvert {
}
private void handleInitExp(String exp) {
-Expression e = DSL.parse(exp);
+Expression e = DSL.parse(null, exp);
final Result result = e.run(ImmutableMap.of());
if (!result.isSuccess() && result.isThrowable()) {
throw new ExpressionParsingException(
diff --git
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
index be576f30a4..d824611be7 100644
---
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
+++
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
@@ -46,10 +46,11 @@ public final class DSL {
/**
* Parse string literal to Expression object, which can be reused.
*
+ * @param metricName the name of metric defined in mal rule
* @param expression string literal represents the DSL expression.
* @return Expression object could be executed.
*/
-public static Expression parse(final String expression) {
+public static Expression parse(final String metricName
(skywalking-java) branch main updated: Add JDK21 Support (#647)
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 c82287e1dd Add JDK21 Support (#647)
c82287e1dd is described below
commit c82287e1dd1593cf3e7dbc390b92f9224943252a
Author: 吴晟 Wu Sheng
AuthorDate: Fri Nov 10 14:56:48 2023 +0800
Add JDK21 Support (#647)
---
.github/workflows/ci.yaml | 3 +++
.github/workflows/plugins-jdk17-test.0.yaml | 2 +-
.github/workflows/plugins-jdk17-test.1.yaml | 2 +-
.../{plugins-jdk17-test.1.yaml => plugins-jdk21-test.0.yaml} | 11 +--
CHANGES.md| 5 +
apm-sniffer/bytebuddy-patch/pom.xml | 7 ---
dist-material/LICENSE | 2 +-
docs/en/contribution/compiling.md | 2 +-
docs/en/setup/service-agent/java-agent/Plugin-test.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 2 +-
pom.xml | 4 ++--
11 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e1a016b394..f286166990 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,6 +49,9 @@ jobs:
matrix:
os: [ ubuntu, macos, windows ]
java-version: [ 17 ]
+include:
+ - os: ubuntu
+java-version: 21
steps:
- uses: actions/checkout@v2
with:
diff --git a/.github/workflows/plugins-jdk17-test.0.yaml
b/.github/workflows/plugins-jdk17-test.0.yaml
index 88ec2e1750..6d2ad4c2b6 100644
--- a/.github/workflows/plugins-jdk17-test.0.yaml
+++ b/.github/workflows/plugins-jdk17-test.0.yaml
@@ -49,7 +49,7 @@ jobs:
test:
needs: [ build ]
-name: ${{ matrix.case }}
+name: ${{ matrix.case }}-jdk17
runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
diff --git a/.github/workflows/plugins-jdk17-test.1.yaml
b/.github/workflows/plugins-jdk17-test.1.yaml
index 69629116e6..a0c7718d64 100644
--- a/.github/workflows/plugins-jdk17-test.1.yaml
+++ b/.github/workflows/plugins-jdk17-test.1.yaml
@@ -49,7 +49,7 @@ jobs:
test:
needs: [ build ]
-name: ${{ matrix.case }}
+name: ${{ matrix.case }}-jdk17
runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
diff --git a/.github/workflows/plugins-jdk17-test.1.yaml
b/.github/workflows/plugins-jdk21-test.0.yaml
similarity index 87%
copy from .github/workflows/plugins-jdk17-test.1.yaml
copy to .github/workflows/plugins-jdk21-test.0.yaml
index 69629116e6..2851619f12 100644
--- a/.github/workflows/plugins-jdk17-test.1.yaml
+++ b/.github/workflows/plugins-jdk21-test.0.yaml
@@ -29,7 +29,7 @@ on:
- '!**.md'
concurrency:
- group: plugins-jdk17-1-${{ github.event.pull_request.number || github.ref }}
+ group: plugins-jdk21-1-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
@@ -44,19 +44,18 @@ jobs:
- name: Build
uses: ./.github/actions/build
with:
- base_image_java: eclipse-temurin:17-jdk
- base_image_tomcat: tomcat:10.1-jdk17-temurin
+ base_image_java: eclipse-temurin:21-jdk
+ base_image_tomcat: tomcat:10.1-jdk21-temurin
test:
needs: [ build ]
-name: ${{ matrix.case }}
+name: ${{ matrix.case }}-jdk21
runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
matrix:
case:
- spring-6.x-scenario
- - resteasy-6.x-scenario
steps:
- uses: actions/checkout@v2
with:
@@ -64,7 +63,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
- java-version: '17'
+ java-version: '21'
- name: Run Test
uses: ./.github/actions/run
with:
diff --git a/CHANGES.md b/CHANGES.md
index 0b38c88c14..0032844b61 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,8 +21,13 @@ Release Notes.
* Fix Impala Jdbc URL (including schema without properties) parsing exception.
* Optimize byte-buddy type description performance.
* Add `eclipse-temurin:21-jre` as another base image.
+* Bump byte-buddy to 1.14.9 for JDK21 support.
+* Add JDK21 plugin tests for Spring 6.
+* Bump Lombok to 1.18.30 to adopt JDK21 compiling.
Documentation
+* Fix JDK requirement in the compiling docs.
+* Add JDK21 support in the compiling docs.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/194?closed=1)
diff --git a/apm-sniffer/bytebuddy-patch/pom.xml
b/apm-sniffer/bytebuddy-patch/pom.xml
index 799e9a5356..fe254f2abb 100644
--- a/apm-sniffer/bytebuddy-patch/pom.xml
+++ b/apm-sniffer/bytebuddy-pa
(skywalking-java) branch jdk21 deleted (was f64915537c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was f64915537c Rename scenarios. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch jdk21 deleted (was a4cbc18cf1)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking.git was a4cbc18cf1 Remove 21 from compiling doc to avoid confusion. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Support packaging the project in JDK21 (#11528)
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 247016fbb5 Support packaging the project in JDK21 (#11528)
247016fbb5 is described below
commit 247016fbb580e9fb52c9240b83894cfc8bacfef5
Author: 吴晟 Wu Sheng
AuthorDate: Fri Nov 10 11:23:02 2023 +0800
Support packaging the project in JDK21 (#11528)
---
.github/workflows/skywalking.yaml | 2 ++
docs/en/changes/changes.md | 1 +
docs/en/guides/How-to-build.md | 2 +-
docs/en/setup/backend/backend-setup.md | 2 +-
pom.xml| 39 +++---
5 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 96b3a0736b..12d60d7d10 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -239,6 +239,8 @@ jobs:
include:
- os: ubuntu
java-version: 17
+ - os: ubuntu
+java-version: 21
steps:
- uses: actions/checkout@v3
with:
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index cb52c4de82..c959d155eb 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,6 +5,7 @@
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
* Update Groovy 3 to 4.0.15.
+* Support packaging the project in JDK21. Compiler source and target remain in
JDK11.
OAP Server
diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md
index 52a51ba28e..a76deaf0ce 100644
--- a/docs/en/guides/How-to-build.md
+++ b/docs/en/guides/How-to-build.md
@@ -16,7 +16,7 @@ If you need to execute build behind the proxy, edit the
*.mvn/jvm.config* and se
```
### Building from GitHub
-1. Prepare git, JDK11+, and Maven 3.6+.
+1. Prepare git, JDK 11 or 17 (LTS versions), and Maven 3.6+.
1. Clone the project.
If you want to build a release from source codes, set a `tag name` by
using `git clone -b [tag_name] ...` while cloning.
diff --git a/docs/en/setup/backend/backend-setup.md
b/docs/en/setup/backend/backend-setup.md
index da53b704fd..56916c0f65 100755
--- a/docs/en/setup/backend/backend-setup.md
+++ b/docs/en/setup/backend/backend-setup.md
@@ -14,7 +14,7 @@ SkyWalking's backend distribution package consists of the
following parts:
## Requirements and default settings
-Requirement: **JDK11 to JDK17 are tested**. Other versions are not tested and
may or may not work.
+Requirement: **JDK11 or JDK17**.
Before you begin, you should understand that the main purpose of the following
quickstart is to help you obtain a basic configuration for previews/demos.
Performance and long-term running are **NOT** among the purposes of the
quickstart.
diff --git a/pom.xml b/pom.xml
index c30d397a65..91a13360e4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -153,11 +153,14 @@
1693572743
+
2.0.9
6.18
5.9.2
4.11.0
-1.18.22
+2.1.4
+1.18.30
+1.14.9
1.53.0
@@ -194,8 +197,6 @@
false
--add-opens java.base/java.lang=ALL-UNNAMED
-2.0.2
-
${project.build.directory}/delombok
@@ -284,6 +285,28 @@
mockito-junit-jupiter
${mockito-core.version}
test
+
+
+net.bytebuddy
+byte-buddy
+
+
+net.bytebuddy
+byte-buddy-agent
+
+
+
+
+net.bytebuddy
+byte-buddy
+${byte-buddy.version}
+test
+
+
+net.bytebuddy
+byte-buddy-agent
+${byte-buddy.version}
+test
@@ -303,6 +326,16 @@
system-stubs-jupiter
${system-stubs.version}
test
+
+
+net.bytebuddy
+byte-buddy
+
+
+net.bytebuddy
+byte-buddy-agent
+
+
(skywalking-java) branch jdk21 updated (4310aaecad -> f64915537c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 4310aaecad Keep runtime as compiler and runtime on jdk21 only. add f64915537c Rename scenarios. No new revisions were added by this update. Summary of changes: .github/workflows/plugins-jdk17-test.0.yaml | 2 +- .github/workflows/plugins-jdk17-test.1.yaml | 2 +- .github/workflows/plugins-jdk21-test.0.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
(skywalking-java) branch jdk21 updated (9f6cf2283b -> 4310aaecad)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 9f6cf2283b Remove JDK 21 tests on macos and windows. add 4310aaecad Keep runtime as compiler and runtime on jdk21 only. No new revisions were added by this update. Summary of changes: .github/workflows/plugins-jdk21-test.0.yaml| 4 +- .../config/expectedData.yaml | 375 - .../jdk21-spring-6.x-scenario/configuration.yml| 23 -- .../scenarios/jdk21-spring-6.x-scenario/pom.xml| 122 --- .../skywalking/apm/testcase/entity/User.java | 53 --- .../testcase/implinterface/TestCaseController.java | 35 -- .../testcase/implinterface/TestCaseInterface.java | 31 -- .../apm/testcase/inherit/ChildController.java | 28 -- .../apm/testcase/inherit/ParentController.java | 32 -- .../apm/testcase/restapi/RestCaseController.java | 77 - .../resttemplate/RestTemplateController.java | 85 - .../apm/testcase/spring3/CaseController.java | 41 --- .../spring3/component/TestComponentBean.java | 29 -- .../testcase/spring3/dao/TestRepositoryBean.java | 29 -- .../testcase/spring3/service/TestServiceBean.java | 38 --- .../src/main/resources/log4j2.xml | 30 -- .../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 30 -- .../src/main/webapp/WEB-INF/web.xml| 35 -- .../jdk21-spring-6.x-scenario/support-version.list | 17 - 19 files changed, 2 insertions(+), 1112 deletions(-) delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/config/expectedData.yaml delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/configuration.yml delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/pom.xml delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/resources/log4j2.xml delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/webapp/WEB-INF/web.xml delete mode 100644 test/plugin/scenarios/jdk21-spring-6.x-scenario/support-version.list
(skywalking-java) branch jdk21 updated (67e9b8be7b -> 9f6cf2283b)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 67e9b8be7b Fix missing codes. add 9f6cf2283b Remove JDK 21 tests on macos and windows. No new revisions were added by this update. Summary of changes: .github/workflows/ci.yaml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
(skywalking-java) branch jdk21 updated (6cddf4e61f -> 67e9b8be7b)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 6cddf4e61f Add test for JDK21 compiling and runtime. add 67e9b8be7b Fix missing codes. No new revisions were added by this update. Summary of changes: .../skywalking/apm/testcase/entity/User.java | 53 ++ .../testcase/implinterface/TestCaseController.java | 35 + .../testcase/implinterface/TestCaseInterface.java | 31 .../apm/testcase/inherit/ChildController.java | 28 +++ .../apm/testcase/inherit/ParentController.java | 32 .../apm/testcase/restapi/RestCaseController.java | 77 .../resttemplate/RestTemplateController.java | 85 ++ .../apm/testcase/spring3/CaseController.java | 41 +++ .../spring3/component/TestComponentBean.java | 29 .../testcase/spring3/dao/TestRepositoryBean.java | 29 .../testcase/spring3/service/TestServiceBean.java | 38 ++ .../src/main/resources/log4j2.xml | 30 .../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 30 .../src/main/webapp/WEB-INF/web.xml| 35 + .../jdk21-spring-6.x-scenario/support-version.list | 17 + 15 files changed, 590 insertions(+)
(skywalking-java) branch jdk21 updated (32373ce892 -> 6cddf4e61f)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch jdk21
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
from 32373ce892 Fix
add 6cddf4e61f Add test for JDK21 compiling and runtime.
No new revisions were added by this update.
Summary of changes:
.../config/expectedData.yaml| 0
.../configuration.yml | 0
.../{spring-6.x-scenario => jdk21-spring-6.x-scenario}/pom.xml | 2 +-
.../src/main/java/test/apache/skywalking/apm/testcase/entity/User.java | 0
.../skywalking/apm/testcase/implinterface/TestCaseController.java | 0
.../apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java | 0
.../test/apache/skywalking/apm/testcase/inherit/ChildController.java| 0
.../test/apache/skywalking/apm/testcase/inherit/ParentController.java | 0
.../test/apache/skywalking/apm/testcase/restapi/RestCaseController.java | 0
.../skywalking/apm/testcase/resttemplate/RestTemplateController.java| 0
.../test/apache/skywalking/apm/testcase/spring3/CaseController.java | 0
.../skywalking/apm/testcase/spring3/component/TestComponentBean.java| 0
.../apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java | 0
.../apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java | 0
.../scenarios/jdk21-spring-6.x-scenario/src/main/resources/log4j2.xml | 0
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 0
.../scenarios/jdk21-spring-6.x-scenario/src/main/webapp/WEB-INF/web.xml | 0
test/plugin/scenarios/jdk21-spring-6.x-scenario/support-version.list| 0
18 files changed, 1 insertion(+), 1 deletion(-)
copy test/plugin/scenarios/{spring-6.x-scenario =>
jdk21-spring-6.x-scenario}/config/expectedData.yaml (100%)
copy test/plugin/scenarios/{spring-6.x-scenario =>
jdk21-spring-6.x-scenario}/configuration.yml (100%)
copy test/plugin/scenarios/{spring-6.x-scenario =>
jdk21-spring-6.x-scenario}/pom.xml (98%)
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/resources/log4j2.xml
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/src/main/webapp/WEB-INF/web.xml
create mode 100644
test/plugin/scenarios/jdk21-spring-6.x-scenario/support-version.list
(skywalking-java) branch jdk21 updated (bf83230973 -> 32373ce892)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from bf83230973 Fix add 32373ce892 Fix No new revisions were added by this update. Summary of changes: .github/workflows/plugins-jdk21-test.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking) branch jdk21 updated: Remove 21 from compiling doc to avoid confusion.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/jdk21 by this push: new a4cbc18cf1 Remove 21 from compiling doc to avoid confusion. a4cbc18cf1 is described below commit a4cbc18cf1723b97c374326e1dc0ca159257aa48 Author: Wu Sheng AuthorDate: Fri Nov 10 10:17:40 2023 +0800 Remove 21 from compiling doc to avoid confusion. --- docs/en/guides/How-to-build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md index 6458f466cf..a76deaf0ce 100644 --- a/docs/en/guides/How-to-build.md +++ b/docs/en/guides/How-to-build.md @@ -16,7 +16,7 @@ If you need to execute build behind the proxy, edit the *.mvn/jvm.config* and se ``` ### Building from GitHub -1. Prepare git, JDK 11/17/21(LTS versions), and Maven 3.6+. +1. Prepare git, JDK 11 or 17 (LTS versions), and Maven 3.6+. 1. Clone the project. If you want to build a release from source codes, set a `tag name` by using `git clone -b [tag_name] ...` while cloning.
(skywalking-java) branch jdk21 updated (8d99468cbe -> bf83230973)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 8d99468cbe Merge commit '2bd500b83120527a164f0131155e928894a2ba28' into jdk21 add bf83230973 Fix No new revisions were added by this update. Summary of changes: CHANGES.md| 3 +++ dist-material/LICENSE | 2 +- docs/en/contribution/compiling.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
(skywalking-java) branch jdk21 updated (d5402a0e05 -> 8d99468cbe)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from d5402a0e05 Add JDK21 support and test. add 2bd500b831 Add JDK 21 image container (#646) new 8d99468cbe Merge commit '2bd500b83120527a164f0131155e928894a2ba28' into jdk21 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(skywalking-java) 01/01: Merge commit '2bd500b83120527a164f0131155e928894a2ba28' into jdk21
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git commit 8d99468cbe4c164e80e16a802c16e402981f5722 Merge: d5402a0e05 2bd500b831 Author: Wu Sheng AuthorDate: Fri Nov 10 09:39:52 2023 +0800 Merge commit '2bd500b83120527a164f0131155e928894a2ba28' into jdk21 # Conflicts: # CHANGES.md
(skywalking-java) 01/01: Add JDK21 support and test.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch jdk21
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit d5402a0e058be2a37363e4ef9c29cdaa5d18f0ba
Author: Wu Sheng
AuthorDate: Fri Nov 10 09:39:16 2023 +0800
Add JDK21 support and test.
---
.github/workflows/ci.yaml | 2 +-
.../{ci.yaml => plugins-jdk21-test.0.yaml} | 70 ++
CHANGES.md | 2 +
apm-sniffer/bytebuddy-patch/pom.xml| 7 ---
.../setup/service-agent/java-agent/Plugin-test.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 2 +-
pom.xml| 4 +-
7 files changed, 39 insertions(+), 49 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e1a016b394..2fca524d71 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,7 +48,7 @@ jobs:
fail-fast: true
matrix:
os: [ ubuntu, macos, windows ]
-java-version: [ 17 ]
+java-version: [ 17, 21 ]
steps:
- uses: actions/checkout@v2
with:
diff --git a/.github/workflows/ci.yaml
b/.github/workflows/plugins-jdk21-test.0.yaml
similarity index 50%
copy from .github/workflows/ci.yaml
copy to .github/workflows/plugins-jdk21-test.0.yaml
index e1a016b394..d15fc0a0a0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/plugins-jdk21-test.0.yaml
@@ -14,63 +14,57 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: CI
+name: Test
on:
pull_request:
- schedule:
-- cron: '0 18 * * *' # TimeZone: UTC 0
+paths:
+ - '.github/workflows/plugins-*.yaml'
+ - 'apm-application-toolkit/**'
+ - 'apm-commons/**'
+ - 'apm-protocol/**'
+ - 'apm-sniffer/**'
+ - 'test/plugin/**'
+ - '**/pom.xml'
+ - '!**.md'
concurrency:
- group: ci-it-${{ github.event.pull_request.number || github.ref }}
+ group: plugins-jdk21-1-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
- license:
-name: Check License
+ build:
+name: Build
runs-on: ubuntu-latest
-timeout-minutes: 10
+timeout-minutes: 30
steps:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Check License Header
-uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Build
+uses: ./.github/actions/build
+with:
+ base_image_java: eclipse-temurin:21-jdk
+ base_image_tomcat: tomcat:10.1-jdk21-temurin
- build:
-name: Java ${{ matrix.java-version }} / ${{ matrix.os }}
-runs-on: ${{ matrix.os }}-latest
-timeout-minutes: 60
-needs: [ license ]
+ test:
+needs: [ build ]
+name: ${{ matrix.case }}
+runs-on: ubuntu-latest
+timeout-minutes: 90
strategy:
- fail-fast: true
matrix:
-os: [ ubuntu, macos, windows ]
-java-version: [ 17 ]
+case:
+ - spring-6.x-scenario
steps:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Cache local Maven repository
-uses: actions/cache@v2
-with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-ci-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-maven-ci-
- uses: actions/setup-java@v2
with:
- distribution: temurin
- java-version: ${{ matrix.java-version }}
- - name: Check Javaagent Plugin List
-run: tools/plugin/check-javaagent-plugin-list.sh
- - name: Install and Test
-run: ./mvnw -q --batch-mode clean verify install javadoc:javadoc
-
- ci:
-name: CI
-runs-on: ubuntu-latest
-needs: [ build ]
-steps:
- - run: echo 'Success'
+ distribution: 'temurin'
+ java-version: '21'
+ - name: Run Test
+uses: ./.github/actions/run
+with:
+ test_case: ${{ matrix.case }}
diff --git a/CHANGES.md b/CHANGES.md
index 0b38c88c14..98afbb9330 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,8 @@ Release Notes.
* Fix Impala Jdbc URL (including schema without properties) parsing exception.
* Optimize byte-buddy type description performance.
* Add `eclipse-temurin:21-jre` as another base image.
+* Bump byte-buddy to 1.14.9 for JDK21 support.
+* Add JDK21 plugin tests for Spring 6.
Documentation
diff --git a/apm-sniffer/bytebuddy-patch/pom.xml
b/apm-sniffer/bytebuddy-patch/pom.xml
index 799e9a5356..fe254f2abb 100644
--- a/apm-sniffer/bytebuddy-patch/pom.xml
+++ b/apm-sniffer/bytebuddy-patch/pom.xml
@@ -38,13 +38,6 @@
byte-buddy
-
-org.projectlombok
-lom
(skywalking-java) branch jdk21 created (now d5402a0e05)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at d5402a0e05 Add JDK21 support and test. This branch includes the following new commits: new d5402a0e05 Add JDK21 support and test. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) branch jdk21 updated: Fix setup docs.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/jdk21 by this push: new ebf47ae84a Fix setup docs. ebf47ae84a is described below commit ebf47ae84ad43c320d0f70819a4371522d0ae5c2 Author: Wu Sheng AuthorDate: Fri Nov 10 08:49:36 2023 +0800 Fix setup docs. --- docs/en/setup/backend/backend-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/setup/backend/backend-setup.md b/docs/en/setup/backend/backend-setup.md index da53b704fd..56916c0f65 100755 --- a/docs/en/setup/backend/backend-setup.md +++ b/docs/en/setup/backend/backend-setup.md @@ -14,7 +14,7 @@ SkyWalking's backend distribution package consists of the following parts: ## Requirements and default settings -Requirement: **JDK11 to JDK17 are tested**. Other versions are not tested and may or may not work. +Requirement: **JDK11 or JDK17**. Before you begin, you should understand that the main purpose of the following quickstart is to help you obtain a basic configuration for previews/demos. Performance and long-term running are **NOT** among the purposes of the quickstart.
(skywalking) 01/01: Support packaging the project in JDK21
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch jdk21
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 0ba167a4690e6c7a02c0bd94a96dc5b558641d61
Author: Wu Sheng
AuthorDate: Fri Nov 10 08:41:28 2023 +0800
Support packaging the project in JDK21
---
.github/workflows/skywalking.yaml | 2 ++
docs/en/changes/changes.md| 1 +
docs/en/guides/How-to-build.md| 2 +-
pom.xml | 39 ---
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 96b3a0736b..12d60d7d10 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -239,6 +239,8 @@ jobs:
include:
- os: ubuntu
java-version: 17
+ - os: ubuntu
+java-version: 21
steps:
- uses: actions/checkout@v3
with:
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index cb52c4de82..c959d155eb 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,6 +5,7 @@
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
* Update Groovy 3 to 4.0.15.
+* Support packaging the project in JDK21. Compiler source and target remain in
JDK11.
OAP Server
diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md
index 52a51ba28e..6458f466cf 100644
--- a/docs/en/guides/How-to-build.md
+++ b/docs/en/guides/How-to-build.md
@@ -16,7 +16,7 @@ If you need to execute build behind the proxy, edit the
*.mvn/jvm.config* and se
```
### Building from GitHub
-1. Prepare git, JDK11+, and Maven 3.6+.
+1. Prepare git, JDK 11/17/21(LTS versions), and Maven 3.6+.
1. Clone the project.
If you want to build a release from source codes, set a `tag name` by
using `git clone -b [tag_name] ...` while cloning.
diff --git a/pom.xml b/pom.xml
index c30d397a65..91a13360e4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -153,11 +153,14 @@
1693572743
+
2.0.9
6.18
5.9.2
4.11.0
-1.18.22
+2.1.4
+1.18.30
+1.14.9
1.53.0
@@ -194,8 +197,6 @@
false
--add-opens java.base/java.lang=ALL-UNNAMED
-2.0.2
-
${project.build.directory}/delombok
@@ -284,6 +285,28 @@
mockito-junit-jupiter
${mockito-core.version}
test
+
+
+net.bytebuddy
+byte-buddy
+
+
+net.bytebuddy
+byte-buddy-agent
+
+
+
+
+net.bytebuddy
+byte-buddy
+${byte-buddy.version}
+test
+
+
+net.bytebuddy
+byte-buddy-agent
+${byte-buddy.version}
+test
@@ -303,6 +326,16 @@
system-stubs-jupiter
${system-stubs.version}
test
+
+
+net.bytebuddy
+byte-buddy
+
+
+net.bytebuddy
+byte-buddy-agent
+
+
(skywalking) branch jdk21 created (now 0ba167a469)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 0ba167a469 Support packaging the project in JDK21 This branch includes the following new commits: new 0ba167a469 Support packaging the project in JDK21 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-banyandb) branch main updated: ui: name search improvement on the measure page (#352)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new 73f463a7 ui: name search improvement on the measure page (#352)
73f463a7 is described below
commit 73f463a79fbc679fc5d86f337957d9b43918b43c
Author: Rick <1450685+linuxsu...@users.noreply.github.com>
AuthorDate: Thu Nov 9 18:04:13 2023 +0800
ui: name search improvement on the measure page (#352)
---
ui/src/components/Aside/index.vue | 7 +++
1 file changed, 7 insertions(+)
diff --git a/ui/src/components/Aside/index.vue
b/ui/src/components/Aside/index.vue
index afd3c9e8..92fe5409 100644
--- a/ui/src/components/Aside/index.vue
+++ b/ui/src/components/Aside/index.vue
@@ -248,14 +248,21 @@ function searchGroup() {
let groupLists = []
data.groupListsCopy.forEach(item => {
let itemCache = JSON.parse(JSON.stringify(item))
+let matched = false
if (Array.isArray(itemCache.children)) {
itemCache.children = itemCache.children.filter(child => {
return child.metadata.name.indexOf(data.search) > -1
})
if (itemCache.children.length > 0) {
groupLists.push(itemCache)
+matched = true
}
}
+
+// check the group name if no child items matched
+if (!matched && itemCache.metadata.name.indexOf(data.search) > -1) {
+groupLists.push(itemCache)
+}
})
data.groupLists = JSON.parse(JSON.stringify(groupLists))
}
(skywalking-php) branch master updated: Fix swoole server on request param. (#100)
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-php.git
The following commit(s) were added to refs/heads/master by this push:
new 981dad9 Fix swoole server on request param. (#100)
981dad9 is described below
commit 981dad929a4c5e9ddbe7cc3e6060a372a7ac08ea
Author: jmjoy
AuthorDate: Thu Nov 9 17:18:29 2023 +0800
Fix swoole server on request param. (#100)
---
.github/workflows/rust.yml | 29 -
Cargo.lock | 2 +-
Cargo.toml | 2 +-
Vagrantfile | 38 --
docker-compose.yml | 10 --
src/plugin/plugin_swoole.rs | 7 ++-
6 files changed, 32 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index bcfbcad..eaa2b12 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -174,15 +174,23 @@ jobs:
- name: Composer install
run: composer install --working-dir=tests/php
- # Build mixture for cargo test.
- - name: Docker compose
-if: matrix.os == 'ubuntu-20.04'
-run: docker compose up -d
+ - name: Setup docker (missing on MacOS)
+if: matrix.os == 'macos-12'
+run: |
+ brew install docker
+ brew install docker-compose
+ mkdir -p ~/.docker/cli-plugins
+ ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose
~/.docker/cli-plugins/docker-compose
+
+ colima start
+
+ # For test containers to find the Colima socket
+ #
https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
+ sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
# Build mixture for cargo test.
- - name: Vagrant up for docker compose
-if: matrix.os == 'macos-12'
-run: vagrant up
+ - name: Docker compose
+run: docker compose up -d --wait
# Try cargo test.
- name: Cargo test
@@ -198,14 +206,9 @@ jobs:
# Rebuild the mixture when cargo test failed.
- name: Docker compose restart
-if: matrix.os == 'ubuntu-20.04' && steps.cargo-test-step.outcome !=
'success'
+if: steps.cargo-test-step.outcome != 'success'
run: docker compose restart
- # Rebuild the mixture when cargo test failed.
- - name: Vagrant reload for docker compose
-if: matrix.os == 'macos-12' && steps.cargo-test-step.outcome !=
'success'
-run: vagrant reload
-
# Delay before retry.
- name: Delay
if: steps.cargo-test-step.outcome != 'success'
diff --git a/Cargo.lock b/Cargo.lock
index 6097847..fb1e6dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2099,7 +2099,7 @@ dependencies = [
[[package]]
name = "skywalking-php"
-version = "0.7.0"
+version = "0.8.0-dev"
dependencies = [
"anyhow",
"axum",
diff --git a/Cargo.toml b/Cargo.toml
index 774d6cd..5647050 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ members = [
[package]
name = "skywalking-php"
-version = "0.7.0"
+version = "0.8.0-dev"
authors = ["Apache Software Foundation", "jmjoy ", "Yanlong
He "]
description = "Apache SkyWalking PHP Agent."
edition = "2021"
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index b58e0aa..000
--- a/Vagrantfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Vagrant.configure("2") do |config|
-config.vm.box = "generic/alpine316"
-config.vm.box_version = "4.1.10"
-config.vm.box_check_update = false
-
-config.vm.network "forwarded_port", guest: 19876, host: 19876
-config.vm.network "forwarded_port", guest: 12800, host: 12800
-config.vm.network "forwarded_port", guest: 3306, host: 3306
-config.vm.network "forwarde
(skywalking-website) branch master updated: Add CN Post for OSPP results. (#657)
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 9aa4e59d5ea Add CN Post for OSPP results. (#657) 9aa4e59d5ea is described below commit 9aa4e59d5ead9ddbdf0deb26ea604e45da3cc981 Author: 吴晟 Wu Sheng AuthorDate: Thu Nov 9 16:31:34 2023 +0800 Add CN Post for OSPP results. (#657) --- content/zh/2023-11-09-ospp-summary/index.md | 84 + 1 file changed, 84 insertions(+) diff --git a/content/zh/2023-11-09-ospp-summary/index.md b/content/zh/2023-11-09-ospp-summary/index.md new file mode 100644 index 000..1936647e1dd --- /dev/null +++ b/content/zh/2023-11-09-ospp-summary/index.md @@ -0,0 +1,84 @@ +--- +title: "开源之夏 2023 SkyWalking 社区项目情况公示" +author: "Apache SkyWalking" +date: 2023-11-09 +description: "开源之夏是由中科院软件所“开源软件供应链点亮计划”发起并长期支持的一项暑期开源活动，旨在鼓励在校学生积极参与开源软件的开发维护，培养和发掘更多优秀的开发者，促进优秀开源软件社区的蓬勃发展，助力开源软件供应链建设。11月9日，官方完成最终审核，并发布结果。" +tags: +- OSPP +--- + +Aapche SkyWalking PMC 和 committer团队参加了"开源之夏 2023"活动，作为导师，共获得了9个官方赞助名额。最终对学生开放如下任务 + +* SkyWalking 支持 GraalVM +* Skywalking Infra E2E 自测试 +* 监控Apache Pulsar +* 统一BanyanDB的查询计划和查询执行器 +* 使用Helm部署BanyanDB +* 编写go agent的gRPC插件 +* 监控Kafka +* 集成SkyWalking PHP到SkyWalking E2E 测试 +* 在线黄金指标异常检测 + +经过3个月的开发，上游评审，PMC成员评议，PMC Chair复议，OSPP官方委员会评审多个步骤，现公布项目参与人员与最终结果 + +# 通过评审项目（共6个） +## SkyWalking 支持 GraalVM +- 学生：张跃骎 +- 学校：辽宁大学 本科 +- 合并PR：[11354](https://github.com/apache/skywalking/pull/11354) +- 后续情况说明：GraalVM因为复杂的生态，替代的代码将被分离到[SkyWalking GraalVM Distro](https://github.com/apache/skywalking-graalvm-distro), 相关讨论，请参见[Issue 11518](https://github.com/apache/skywalking/issues/11518) + +## Skywalking Infra E2E 自测试 +- 学生：王子忱 +- 学校：华中师范大学 本科 +- 合并PR：[115](https://github.com/apache/skywalking-infra-e2e/pull/115), [116](https://github.com/apache/skywalking-infra-e2e/pull/116), [117](https://github.com/apache/skywalking-infra-e2e/pull/117), [118](https://github.com/apache/skywalking-infra-e2e/pull/118), [119](https://github.com/apache/skywalking-infra-e2e/pull/119) +- 后续情况说明：此特性已经包含在发行版skywalking-infra-e2e v1.3.0中 + +## 统一BanyanDB的查询计划和查询执行器 +- 学生：曾家华 +- 学校：电子科技大学 本科 +- 合并PR：[343](https://github.com/apache/skywalking-banyandb/pull/343) + +## 使用Helm部署BanyanDB +- 学生：黄友亮 +- 学校：北京邮电大学 硕士研究生 +- 合并PR：[1](https://github.com/apache/skywalking-banyandb-helm/pull/1) +- 情况说明：因为BanyanDB Helm为新项目，学生承接了项目初始化、功能提交、自动化测试，发布准备等多项任务。所参与功能包含在skywalking-banyandb-helm v0.1.0中 + +## 编写go agent的gRPC插件 +- 学生：胡宇腾 +- 学校：西安邮电大学 +- 合并PR：[88](https://github.com/apache/skywalking-go/pull/88), [94](https://github.com/apache/skywalking-go/pull/94) +- 后续情况说明：该学生在开源之夏相关项目外，完成了[feature: add support for iris #99](https://github.com/apache/skywalking-go/pull/99)和[Go agent APIs](https://github.com/apache/skywalking-go/pull/104)功能开发。并发表文章[SkyWalking Go Toolkit Trace 详解](https://skywalking.apache.org/zh/2023-10-18-skywalking-toolkit-trace/)以及英文译本[Detailed explanation of SkyWalking Go Toolkit Trace](https://skywalking.apache.org/blog/2023-10-18-skywalking-toolkit-trace/) + +## 监控Kafka +- 学生：王竹 +- 学校：美国东北大学 ( Northeastern University) +- 合并PR：[11282](https://github.com/apache/skywalking/pull/11282), [UI 318](https://github.com/apache/skywalking-booster-ui/pull/318) + + +# 未通过评审项目（3个） +下列项目因为质量无法达到社区要求，违规等原因，将被标定为失败。 +**注：在开源之夏中失败的项目，其Pull Reqeust可能因为符合社区功能要求，也被接受合并。** + +## 监控Apache Pulsar +- 学生：孟祥迎 +- 学校：重庆邮电大学 本科 +- 合并PR：[11339](https://github.com/apache/skywalking/pull/11339) +- 失败原因：项目申请成员，作为ASF Pulsar项目的Committer，在担任Pulsar开源之夏项目导师期间，但依然申请了学生参与项目。属于违规行为。SkyWalking PMC审查了此行为并通报开源之夏组委会。开源之夏组委会依据活动规则取消其结项奖金。 + +## 集成SkyWalking PHP到SkyWalking E2E 测试 +- 学生：罗文 +- 学校：San Jose State University B.S. +- 合并PR：[11330](https://github.com/apache/skywalking/pull/11330) +- 失败原因：根据pull reqeust中的提交记录，SkyWalking PMC Chair审查了提交明细，学生参与代码数量大幅度小于导师的提交代码。并在考虑到这个项目难度以及明显低于SkyWalking 开源之夏项目的平均水平的情况下，通报给开源之夏组委会。经过组委会综合评定，项目不合格。 + +## 在线黄金指标异常检测 +- 学生：黄颖 +- 学校：同济大学 研究生 +- 合并PR：无 +- 失败原因：项目在进度延迟后实现较为简单且粗糙，并且没有提供算法评估结果和文档等。在 PR 开启后的为期一个月审核合并期间，学生并未能成功按预定计划改善实现的质量和文档。和导师以及 SkyWalking 社区缺少沟通。 + +# 结语 +SkyWalking社区每年都有近10位PMC成员或Committer参与开源之夏中，帮助在校学生了解顶级开源项目、开源社区的运作方式。我们希望大家在每年经过3个月的时间，能够真正的帮助在校学生了解开源和参与开源。 +因为，社区即使在考虑到学生能力的情况下，不会明显的降低pull request的接受标准。希望今后的学生，能够在早期，积极、主动和导师，社区其他成员保持高频率的沟通，对参与的项目有更深入、准确的了解。 \ No newline at end of file
(skywalking-website) branch ospp deleted (was b86b2c0baa8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was b86b2c0baa8 Add one link. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch scroller-size deleted (was 069f3fe479)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch scroller-size in repository https://gitbox.apache.org/repos/asf/skywalking.git was 069f3fe479 Merge branch 'master' into scroller-size The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Fix `limit` doesn't work for `findEndpoint` API in ES storage (#11523)
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 b514fbcf38 Fix `limit` doesn't work for `findEndpoint` API in ES
storage (#11523)
b514fbcf38 is described below
commit b514fbcf3807c70832c570d0cda365b8e285ecfb
Author: kezhenxu94
AuthorDate: Thu Nov 9 16:25:54 2023 +0800
Fix `limit` doesn't work for `findEndpoint` API in ES storage (#11523)
---
docs/en/changes/changes.md | 1 +
.../elasticsearch/ElasticSearchScroller.java | 8 +++
.../elasticsearch/bulk/ElasticSearchIT.java| 27 ++
.../elasticsearch/query/MetadataQueryEsDAO.java| 2 +-
4 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index df6c7c4f88..cb52c4de82 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -35,6 +35,7 @@
* Support extract timestamp from patterned datetime string in LAL.
* Support output key parameters in the booting logs.
* Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC
related storage.
+* Fix `limit` doesn't work for `findEndpoint` API in ES storage.
UI
diff --git
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
index f414f4c502..62504e83fc 100644
---
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
+++
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
@@ -61,12 +61,12 @@ public class ElasticSearchScroller {
}
for (final var searchHit : response.getHits()) {
results.add(resultConverter.apply(searchHit));
+if (queryMaxSize > 0 && results.size() >= queryMaxSize) {
+return results;
+}
}
if (search.getSize() != null &&
response.getHits().getHits().size() < search.getSize()) {
-break;
-}
-if (queryMaxSize > 0 && results.size() >= queryMaxSize) {
-break;
+return results;
}
response = client.scroll(SCROLL_CONTEXT_RETENTION, scrollId);
}
diff --git
a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ElasticSearchIT.java
b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ElasticSearchIT.java
index cdaca0a2b4..fa6fcb43e9 100644
---
a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ElasticSearchIT.java
+++
b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ElasticSearchIT.java
@@ -26,8 +26,10 @@ import
org.apache.skywalking.library.elasticsearch.requests.search.SearchBuilder
import org.apache.skywalking.library.elasticsearch.response.Document;
import org.apache.skywalking.library.elasticsearch.response.Index;
import org.apache.skywalking.library.elasticsearch.response.Mappings;
+import org.apache.skywalking.library.elasticsearch.response.search.SearchHit;
import
org.apache.skywalking.library.elasticsearch.response.search.SearchResponse;
import
org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
+import
org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchScroller;
import
org.apache.skywalking.oap.server.library.client.elasticsearch.IndexRequestWrapper;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.junit.jupiter.api.Assertions;
@@ -41,6 +43,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import java.util.UUID;
import java.util.function.Function;
@Slf4j
@@ -171,6 +174,30 @@ public class ElasticSearchIT {
.get("message"));
client.deleteById(indexName, id);
Assertions.assertFalse(client.existDoc(indexName, id));
+
+for (int i = 0; i < 100; i++) {
+builder = ImmutableMap.builder()
+ .put("user", "sw")
+ .put("post_date", "2009-11-15T
(skywalking-website) branch ospp updated (ec987f71942 -> b86b2c0baa8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from ec987f71942 Update content/zh/2023-11-09-ospp-summary/index.md add b86b2c0baa8 Add one link. No new revisions were added by this update. Summary of changes: content/zh/2023-11-09-ospp-summary/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-website) branch ospp updated (b401c03168c -> cb3de51148f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from b401c03168c Update content/zh/2023-11-09-ospp-summary/index.md add cb3de51148f Update content/zh/2023-11-09-ospp-summary/index.md No new revisions were added by this update. Summary of changes: content/zh/2023-11-09-ospp-summary/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-website) branch ospp updated (070747f7543 -> b401c03168c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from 070747f7543 Update comments due to OSPP committee request. add b401c03168c Update content/zh/2023-11-09-ospp-summary/index.md No new revisions were added by this update. Summary of changes: content/zh/2023-11-09-ospp-summary/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-website) branch ospp updated (e1cbfebad20 -> 070747f7543)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from e1cbfebad20 Add CN Post for OSPP results. add 070747f7543 Update comments due to OSPP committee request. No new revisions were added by this update. Summary of changes: content/zh/2023-11-09-ospp-summary/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-website) 01/01: Add CN Post for OSPP results.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit e1cbfebad20fcd6349f3cc48f294ed96fd27136a Author: Wu Sheng AuthorDate: Thu Nov 9 15:33:01 2023 +0800 Add CN Post for OSPP results. --- content/zh/2023-11-09-ospp-summary/index.md | 84 + 1 file changed, 84 insertions(+) diff --git a/content/zh/2023-11-09-ospp-summary/index.md b/content/zh/2023-11-09-ospp-summary/index.md new file mode 100644 index 000..2f291c50cad --- /dev/null +++ b/content/zh/2023-11-09-ospp-summary/index.md @@ -0,0 +1,84 @@ +--- +title: "开源之夏 2023 SkyWalking 社区项目情况公示" +author: "Apache SkyWalking" +date: 2023-11-09 +description: "开源之夏是由中科院软件所“开源软件供应链点亮计划”发起并长期支持的一项暑期开源活动，旨在鼓励在校学生积极参与开源软件的开发维护，培养和发掘更多优秀的开发者，促进优秀开源软件社区的蓬勃发展，助力开源软件供应链建设。11月9日，官方完成最终审核，并发布结果。" +tags: +- OSPP +--- + +Aapche SkyWalking PMC 和 committer团队参加了"开源之夏 2023"活动，作为导师，共获得了9个官方赞助名额。最终对学生开放如下任务 + +* SkyWalking 支持 GraalVM +* Skywalking Infra E2E 自测试 +* 监控Apache Pulsar +* 统一BanyanDB的查询计划和查询执行器 +* 使用Helm部署BanyanDB +* 编写go agent的gRPC插件 +* 监控Kafka +* 集成SkyWalking PHP到SkyWalking E2E 测试 +* 在线黄金指标异常检测 + +经过3个月的开发，上游评审，PMC成员评议，PMC Chair复议，OSPP官方委员会评审多个步骤，现公布项目参与人员与最终结果 + +# 通过评审项目（共6个） +## SkyWalking 支持 GraalVM +- 学生：张跃骎 +- 学校：辽宁大学 本科 +- 合并PR：https://github.com/apache/skywalking/pull/11354 +- 后续情况说明：GraalVM因为复杂的生态，替代的代码将被分离到[SkyWalking GraalVM Distro](https://github.com/apache/skywalking-graalvm-distro), 相关讨论，请参见[Issue 11518](https://github.com/apache/skywalking/issues/11518) + +## Skywalking Infra E2E 自测试 +- 学生：王子忱 +- 学校：华中师范大学 +- 合并PR：[115](https://github.com/apache/skywalking-infra-e2e/pull/115), [116](https://github.com/apache/skywalking-infra-e2e/pull/116), [117](https://github.com/apache/skywalking-infra-e2e/pull/117), [118](https://github.com/apache/skywalking-infra-e2e/pull/118), [119](https://github.com/apache/skywalking-infra-e2e/pull/119) +- 后续情况说明：此特性已经包含在发行版skywalking-infra-e2e v1.3.0中 + +## 统一BanyanDB的查询计划和查询执行器 +- 学生：曾家华 +- 学校：电子科技大学 本科 +- 合并PR：[343](https://github.com/apache/skywalking-banyandb/pull/343) + +## 使用Helm部署BanyanDB +- 学生：黄友亮 +- 学校：北京邮电大学 硕士研究生 +- 合并PR：[1](https://github.com/apache/skywalking-banyandb-helm/pull/1) +- 情况说明：因为BanyanDB Helm为新项目，学生承接了项目初始化、功能提交、自动化测试，发布准备等多项任务。所参与功能包含在skywalking-banyandb-helm v0.1.0中 + +## 编写go agent的gRPC插件 +- 学生：胡宇腾 +- 学校：西安邮电大学 +- 合并PR：[88](https://github.com/apache/skywalking-go/pull/88), [94](https://github.com/apache/skywalking-go/pull/94) +- 后续情况说明：此学校在开源之夏相关项目外，完成了[feature: add support for iris #99](https://github.com/apache/skywalking-go/pull/99)和[Go agent APIs](https://github.com/apache/skywalking-go/pull/104)功能开发。并发表文章[SkyWalking Go Toolkit Trace 详解](https://skywalking.apache.org/zh/2023-10-18-skywalking-toolkit-trace/)以及英文译本[Detailed explanation of SkyWalking Go Toolkit Trace](https://skywalking.apache.org/blog/2023-10-18-skywalking-toolkit-trace/) + +## 监控Kafka +- 学生：王竹 +- 学校：美国东北大学 ( Northeastern University) +- 合并PR：[11282](https://github.com/apache/skywalking/pull/11282), [UI 318](https://github.com/apache/skywalking-booster-ui/pull/318) + + +# 未通过评审项目（3个） +下列项目因为质量无法达到社区要求，违规等原因，将被标定为失败。 +**注：在开源之夏中失败的项目，其Pull Reqeust可能因为符合社区功能要求，也被接受合并。** + +## 监控Apache Pulsar +- 学生：孟祥迎 +- 学校：重庆邮电大学 本科 +- 合并PR：[11339](https://github.com/apache/skywalking/pull/11339) +- 失败原因：项目申请成员，作为ASF Pulsar项目的Committer，在担任Pulsar开源之夏项目导师期间，但依然申请了学生参与项目。属于违规行为。SkyWalking PMC审查了此行为并通报开源之夏组委会。 + +## 集成SkyWalking PHP到SkyWalking E2E 测试 +- 学生：罗文 +- 学校：San Jose State University B.S. +- 合并PR：[11330](https://github.com/apache/skywalking/pull/11330) +- 失败原因：根据pull reqeust中的提交记录，SkyWalking PMC Chair审查了提交明细，学生参与代码数量大幅度小于导师的提交代码。并在考虑到这个项目难度以及明显低于SkyWalking 开源之夏项目的平均水平的情况下，通报给开源之夏组委会。经过组委会综合评定，项目不合格。 + +## 在线黄金指标异常检测 +- 学生：黄颖 +- 学校：同济大学 研究生 +- 合并PR：无 +- 失败原因：无法完成相关功能。和导师，以及SkyWalking社区缺少沟通。 + +# 结语 +SkyWalking社区每年都有近10位PMC成员或Committer参与开源之夏中，帮助在校学生了解顶级开源项目、开源社区的运作方式。我们希望大家在每年经过3个月的时间，能够真正的帮助在校学生了解开源和参与开源。 +因为，社区即使在考虑到学生能力的情况下，不会明显的降低pull request的接受标准。希望今后的学生，能够在早期，积极、主动和导师，社区其他成员保持高频率的沟通，对参与的项目有更深入、准确的了解。 \ No newline at end of file
(skywalking-website) branch ospp created (now e1cbfebad20)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch ospp in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at e1cbfebad20 Add CN Post for OSPP results. This branch includes the following new commits: new e1cbfebad20 Add CN Post for OSPP results. 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-graalvm-distro) branch main updated: Add readme
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 4df9c56 Add readme 4df9c56 is described below commit 4df9c56870f9c49fe20bf47be89ff21e0d9d27a9 Author: 吴晟 Wu Sheng AuthorDate: Thu Nov 9 02:58:11 2023 + Add readme --- README.md | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7246354..cc70f67 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,14 @@ -# skywalking-graalvm-distro -Apache skywalking +# SkyWalking GraalVM Distro +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, +provide peak performance with no warmup, and use less memory and CPU than applications running on a Java Virtual Machine (JVM). + +SkyWalking GraalVM Distro is a re-distribution version of the official Apache SkyWalking OAP server. +This distro could bring the OAP benefits from the native build powered by Graal VM. +But as the limitation of the GraalVM, this distro may provide features in different implementations, and require recompilation +rather than change config files. + + +# License +Apache 2.0 \ No newline at end of file
(skywalking-graalvm-distro) branch main created (now 4f1e881)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-graalvm-distro.git at 4f1e881 Initial commit This branch includes the following new commits: new 4f1e881 Initial commit 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-graalvm-distro) 01/01: Initial commit
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 commit 4f1e881d17c5760294a130f7cc4f430a13279176 Author: 吴晟 Wu Sheng AuthorDate: Thu Nov 9 10:51:48 2023 +0800 Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..7246354 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# skywalking-graalvm-distro +Apache skywalking
(skywalking) 02/02: Merge branch 'groovy4' of github.com:apache/skywalking into groovy4
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch groovy4 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 462a5b81fca9281be2194d29692b269db9b4a950 Merge: 7506fc2018 edff66478f Author: Wu Sheng AuthorDate: Thu Nov 9 10:48:13 2023 +0800 Merge branch 'groovy4' of github.com:apache/skywalking into groovy4 .github/workflows/publish-docker.yaml | 5 - docs/en/changes/changes.md| 2 -- 2 files changed, 7 deletions(-) diff --cc docs/en/changes/changes.md index 2b466e92d0,f5d8a74e98..df6c7c4f88 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@@ -2,10 -2,9 +2,8 @@@ Project -* Add distribution/graal module to make preliminary preparations for supporting native-image. * Bump Java agent to 9.1-dev in the e2e tests. * Bump up netty to 4.1.100. - * Add eclipse-temurin:21-jre as a new image runtime. Now, eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre - eclipse-temurin:21-jre are available for every commit and release. * Update Groovy 3 to 4.0.15. OAP Server
(skywalking) branch groovy4 updated (edff66478f -> 462a5b81fc)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch groovy4 in repository https://gitbox.apache.org/repos/asf/skywalking.git from edff66478f Merge branch 'master' into groovy4 new 7506fc2018 Remove GraalVM dist as moving to another repository. new 462a5b81fc Merge branch 'groovy4' of github.com:apache/skywalking into groovy4 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/native-image.yaml| 106 - docs/en/changes/changes.md | 2 - docs/en/setup/backend/backend-graalvm.md |77 - docs/menu.yml | 2 - graal/Makefile |49 - graal/apache-skywalking-native-apm/pom.xml | 121 - .../src/main/assembly/binary-native-pre.xml| 125 - .../src/main/assembly/binary-native.xml| 121 - graal/dist-material/bin/oapService-native-jar.sh |45 - graal/dist-material/bin/oapService-native.sh |32 - graal/docker/oap/Dockerfile|41 - .../pom.xml|40 - .../graal/EnvoyMetricReceiverProviderGraal.java|39 - ...alking.oap.server.library.module.ModuleProvider |19 - graal/graal-config-generator/configGenerator.sh|24 - .../graal-config-generator/deepConfigGenerator.sh |24 - graal/graal-package-IT/pom.xml |62 - .../kafka/provider/KafkaFetcherModuleStartIT.java | 104 - .../StorageModuleBanyanDBProviderFunctionalIT.java |95 - ...ageModuleElasticSearchProviderFunctionalIT.java |94 - .../TelemetryPrometheusModuleStartTestIT.java |52 - graal/graal-server-starter/pom.xml | 186 - .../skywalking/oap/graal/NativeConfigFilter.java | 141 - .../META-INF/native-image/main/jni-config.json | 115 - .../main/predefined-classes-config.json| 8 - .../META-INF/native-image/main/proxy-config.json | 5 - .../META-INF/native-image/main/reflect-config.json | 10600 --- .../native-image/main/resource-config.json | 135 - .../native-image/main/serialization-config.json| 8 - .../META-INF/native-image/native-image.properties |19 - .../src/main/resources/application.yml | 574 - .../src/main/resources/log4j2.xml |48 - graal/library-util-graal-native/pom.xml|93 - .../oap/server/library/util/ResourceUtils.java |91 - graal/log-analyzer-graal-native/pom.xml|40 - .../graal/LogAnalyzerModuleProviderGraal.java |39 - ...alking.oap.server.library.module.ModuleProvider |19 - graal/meter-analyzer-graal-native/pom.xml |79 - .../skywalking/oap/meter/analyzer/Analyzer.java|47 - graal/oal-rt-graal-native/pom.xml |86 - .../org/apache/skywalking/oal/rt/OALRuntime.java | 187 - graal/pom.xml |79 - graal/server-core-graal-native/pom.xml | 134 - .../server/core/oal/rt/OALEngineLoaderService.java | 122 - graal/skywalking-on-graal-compiling-plugin/pom.xml | 124 - .../org/apache/skywalking/graal/OALGenerator.java | 163 - .../apache/skywalking/graal/OALGeneratorMojo.java |68 - pom.xml| 9 - 48 files changed, 14493 deletions(-) delete mode 100644 .github/workflows/native-image.yaml delete mode 100644 docs/en/setup/backend/backend-graalvm.md delete mode 100644 graal/Makefile delete mode 100644 graal/apache-skywalking-native-apm/pom.xml delete mode 100644 graal/apache-skywalking-native-apm/src/main/assembly/binary-native-pre.xml delete mode 100644 graal/apache-skywalking-native-apm/src/main/assembly/binary-native.xml delete mode 100644 graal/dist-material/bin/oapService-native-jar.sh delete mode 100644 graal/dist-material/bin/oapService-native.sh delete mode 100644 graal/docker/oap/Dockerfile delete mode 100644 graal/envoy-metrics-receiver-plugin-graal-native/pom.xml delete mode 100644 graal/envoy-metrics-receiver-plugin-graal-native/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/graal/EnvoyMetricReceiverProviderGraal.java delete mode 100644 graal/envoy-metrics-receiver-plugin-graal-native/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider delete mode 100755 graal/graal-config-generator/configGenerator.sh delete mode 100644 graal/graal-config-generator/deepConfigGenerator.sh delete mode 100644 graal/graal-package-IT/pom.xml delete mode 100644 graal/graal-package-IT/src/test/java/org/apache/skywalking/oap/server/
(skywalking) branch revert-11464-jre-21 deleted (was 9d71555a9e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch revert-11464-jre-21 in repository https://gitbox.apache.org/repos/asf/skywalking.git was 9d71555a9e Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch groovy4 updated (7a30503576 -> edff66478f)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch groovy4 in repository https://gitbox.apache.org/repos/asf/skywalking.git from 7a30503576 Fix native image CI. add 3cd149a46b Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" (#11516) add edff66478f Merge branch 'master' into groovy4 No new revisions were added by this update. Summary of changes: .github/workflows/publish-docker.yaml | 5 - docs/en/changes/changes.md| 2 -- 2 files changed, 7 deletions(-)
(skywalking) branch master updated: Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" (#11516)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 3cd149a46b Revert "Add eclipse-temurin:21-jre as a new image runtime
(#11464)" (#11516)
3cd149a46b is described below
commit 3cd149a46b69607a6eba8e2336bbb4b65ca1c804
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 23:33:21 2023 +0800
Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" (#11516)
This reverts commit 789df669b02db5725879e50e7c9d3482d0fd7343.
---
.github/workflows/publish-docker.yaml | 5 -
docs/en/changes/changes.md| 2 --
2 files changed, 7 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 1410f39555..78f6cceefd 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,10 +79,5 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
- - name: Build and push docker images based on Java 21
-env:
- SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
- TAG: ${{ env.TAG }}-java21
-run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..38c128d72f 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,8 +5,6 @@
* Add distribution/graal module to make preliminary preparations for
supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
-* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
- eclipse-temurin:21-jre are available for every commit and release.
OAP Server
(skywalking) branch groovy4 updated: Fix native image CI.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch groovy4
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/groovy4 by this push:
new 7a30503576 Fix native image CI.
7a30503576 is described below
commit 7a305035764e4af56f81333fa0f792c325d8e821
Author: Wu Sheng
AuthorDate: Wed Nov 8 22:51:31 2023 +0800
Fix native image CI.
---
.github/workflows/native-image.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/native-image.yaml
b/.github/workflows/native-image.yaml
index c0f303cd76..14e4026549 100644
--- a/.github/workflows/native-image.yaml
+++ b/.github/workflows/native-image.yaml
@@ -17,7 +17,6 @@
name: GraalVM Community Edition build
on:
pull_request:
- push:
concurrency:
group: skywalking-graalvm-${{ github.event.pull_request.number || github.ref
}}
(skywalking) branch groovy4 created (now dbfe35aa00)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch groovy4 in repository https://gitbox.apache.org/repos/asf/skywalking.git at dbfe35aa00 Update Groovy 3 to 4.0.15. This branch includes the following new commits: new dbfe35aa00 Update Groovy 3 to 4.0.15. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) 01/01: Update Groovy 3 to 4.0.15.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch groovy4
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit dbfe35aa00666eed9588e65eb3548939480a4e2a
Author: Wu Sheng
AuthorDate: Wed Nov 8 22:31:51 2023 +0800
Update Groovy 3 to 4.0.15.
---
dist-material/release-docs/LICENSE | 2 +-
docs/en/changes/changes.md | 1 +
graal/meter-analyzer-graal-native/pom.xml | 2 +-
oap-server-bom/pom.xml | 4 ++--
oap-server/analyzer/log-analyzer/pom.xml | 2 +-
oap-server/analyzer/meter-analyzer/pom.xml | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index c701cc9e5f..2f5dc1458c 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -340,6 +340,7 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.curator/curator-framework/4.3.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.curator/curator-recipes/4.3.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.curator/curator-x-discovery/4.3.0
Apache-2.0
+https://mvnrepository.com/artifact/org.apache.groovy/groovy/4.0.15
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.3
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.3
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.13
Apache-2.0
@@ -351,7 +352,6 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.yetus/audience-annotations/0.5.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper/3.5.7
Apache-2.0
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper-jute/3.5.7
Apache-2.0
-https://mvnrepository.com/artifact/org.codehaus.groovy/groovy/3.0.8
Apache-2.0
https://mvnrepository.com/artifact/org.freemarker/freemarker/2.3.31
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect/1.7.10
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib/1.7.10
Apache-2.0
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..037c1a2d28 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -7,6 +7,7 @@
* Bump up netty to 4.1.100.
* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
eclipse-temurin:21-jre are available for every commit and release.
+* Update Groovy 3 to 4.0.15.
OAP Server
diff --git a/graal/meter-analyzer-graal-native/pom.xml
b/graal/meter-analyzer-graal-native/pom.xml
index 533793616a..ac83dc1e1e 100644
--- a/graal/meter-analyzer-graal-native/pom.xml
+++ b/graal/meter-analyzer-graal-native/pom.xml
@@ -44,7 +44,7 @@
${project.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 4237dde5c1..7b2975be13 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -61,7 +61,7 @@
2.3.31
3.25.0-GA
0.10.3
-3.0.8
+4.0.15
2.4.8.Final
1.9.4
1.12.0
@@ -488,7 +488,7 @@
${vavr.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
${groovy.version}
diff --git a/oap-server/analyzer/log-analyzer/pom.xml
b/oap-server/analyzer/log-analyzer/pom.xml
index abe621bbd0..cabd78e7e7 100644
--- a/oap-server/analyzer/log-analyzer/pom.xml
+++ b/oap-server/analyzer/log-analyzer/pom.xml
@@ -44,7 +44,7 @@
${project.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
diff --git a/oap-server/analyzer/meter-analyzer/pom.xml
b/oap-server/analyzer/meter-analyzer/pom.xml
index 3af6530b01..f29b8b9e9f 100644
--- a/oap-server/analyzer/meter-analyzer/pom.xml
+++ b/oap-server/analyzer/meter-analyzer/pom.xml
@@ -39,7 +39,7 @@
${project.version}
-org.codehaus.groovy
+org.apache.groovy
groovy
(skywalking) 01/01: Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)"
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch revert-11464-jre-21
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 9d71555a9ef9f43813b855eda7d198bd64617c93
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 21:49:09 2023 +0800
Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)"
This reverts commit 789df669b02db5725879e50e7c9d3482d0fd7343.
---
.github/workflows/publish-docker.yaml | 5 -
docs/en/changes/changes.md| 2 --
2 files changed, 7 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 1410f39555..78f6cceefd 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,10 +79,5 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
- - name: Build and push docker images based on Java 21
-env:
- SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
- TAG: ${{ env.TAG }}-java21
-run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..38c128d72f 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,8 +5,6 @@
* Add distribution/graal module to make preliminary preparations for
supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.
-* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
- eclipse-temurin:21-jre are available for every commit and release.
OAP Server
(skywalking) branch revert-11464-jre-21 created (now 9d71555a9e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch revert-11464-jre-21 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 9d71555a9e Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" This branch includes the following new commits: new 9d71555a9e Revert "Add eclipse-temurin:21-jre as a new image runtime (#11464)" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) branch jre-21-test deleted (was 01c9edef6e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git was 01c9edef6e Update Java agent version to 9.1-dev to support JRE21 container. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch jre-21-test updated: Update Java agent version to 9.1-dev to support JRE21 container.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch jre-21-test in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/jre-21-test by this push: new 01c9edef6e Update Java agent version to 9.1-dev to support JRE21 container. 01c9edef6e is described below commit 01c9edef6e3868644c3bee7d37e28be042328419 Author: Wu Sheng AuthorDate: Wed Nov 8 21:12:02 2023 +0800 Update Java agent version to 9.1-dev to support JRE21 container. --- test/e2e-v2/script/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 0e82312f73..3fded11e70 100644 --- a/test/e2e-v2/script/env +++ b/test/e2e-v2/script/env @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SW_AGENT_JAVA_COMMIT=f25e6600b487a440d1104c628f235a122cc7653e +SW_AGENT_JAVA_COMMIT=2bd500b83120527a164f0131155e928894a2ba28 SW_AGENT_SATELLITE_COMMIT=ea27a3f4e126a24775fe12e2aa2695bcb23d99c3 SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa SW_AGENT_NODEJS_COMMIT=2e7560518aff846befd4d6bc815fe5e38c704a11
(skywalking-infra-e2e) branch fix/lint deleted (was 776429e)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch fix/lint in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git was 776429e make linter happy The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-infra-e2e) branch main updated: make linter happy (#125)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git The following commit(s) were added to refs/heads/main by this push: new 1485ae0 make linter happy (#125) 1485ae0 is described below commit 1485ae03f0ad90496ad7626a5ae4a6a73a1f6296 Author: Hoshea Jiang AuthorDate: Wed Nov 8 18:40:52 2023 +0800 make linter happy (#125) --- .golangci.yml | 9 ++--- Makefile | 2 +- cmd/e2e/main.go | 2 +- commands/cleanup/cleanup.go | 2 +- commands/root.go | 2 +- commands/run/run.go | 2 +- commands/trigger/trigger.go | 2 +- commands/version.go | 2 +- internal/components/trigger/http.go | 1 + internal/components/verifier/funcs.go | 2 +- internal/logger/log.go| 2 +- 11 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 91d074d..1e9901e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -36,11 +36,6 @@ linters-settings: goconst: min-len: 2 min-occurrences: 2 - depguard: -list-type: blacklist -include-go-root: true -packages-with-error-messages: - fmt: "logging is allowed only by logutils.Log" misspell: locale: US ignore-words: @@ -98,7 +93,6 @@ linters-settings: linters: enable: - deadcode -- depguard - dogsled - dupl - errcheck @@ -115,7 +109,6 @@ linters: - ineffassign - lll - misspell -- nakedret - staticcheck - stylecheck - typecheck @@ -125,6 +118,8 @@ linters: - whitespace disable: - structcheck +- depguard +- nakedret service: golangci-lint-version: 1.20.x diff --git a/Makefile b/Makefile index bf5deb6..78797b4 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ all: clean lint test build .PHONY: lint lint: - $(GO_LINT) version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin -d "v1.46.2" + $(GO_LINT) version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin -d "v1.55.2" $(GO_LINT) run -v --timeout 5m ./... .PHONY: fix-lint diff --git a/cmd/e2e/main.go b/cmd/e2e/main.go index 0422241..ee599db 100644 --- a/cmd/e2e/main.go +++ b/cmd/e2e/main.go @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// + package main import ( diff --git a/commands/cleanup/cleanup.go b/commands/cleanup/cleanup.go index 3e7079d..fdc5daa 100644 --- a/commands/cleanup/cleanup.go +++ b/commands/cleanup/cleanup.go @@ -1,4 +1,3 @@ -// // Licensed to Apache Software Foundation (ASF) under one or more contributor // license agreements. See the NOTICE file distributed with // this work for additional information regarding copyright @@ -15,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package cleanup import ( diff --git a/commands/root.go b/commands/root.go index 1fec787..31e3c8f 100644 --- a/commands/root.go +++ b/commands/root.go @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// + package commands import ( diff --git a/commands/run/run.go b/commands/run/run.go index fef97d3..a304779 100644 --- a/commands/run/run.go +++ b/commands/run/run.go @@ -1,4 +1,3 @@ -// // Licensed to Apache Software Foundation (ASF) under one or more contributor // license agreements. See the NOTICE file distributed with // this work for additional information regarding copyright @@ -15,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package run import ( diff --git a/commands/trigger/trigger.go b/commands/trigger/trigger.go index ca82261..cb49b54 100644 --- a/commands/trigger/trigger.go +++ b/commands/trigger/trigger.go @@ -1,4 +1,3 @@ -// // Licensed to Apache Software Foundation (ASF) under one or more contributor // license agreements. See the NOTICE file distributed with // this work for additional information regarding copyright @@ -15,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package trigger import ( diff --git a/commands/version.go b/commands/version.go index 0b07316..3ac0062 100644 --- a/commands/version.go +++ b/commands/version.go @@ -14,7 +14,7 @@ // KIND, either expres
(skywalking-java) branch wu-sheng-patch-1 deleted (was dcd821a6bd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was dcd821a6bd Update makefile for JRE21 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-java) branch main updated: Add JDK 21 image container (#646)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 2bd500b831 Add JDK 21 image container (#646)
2bd500b831 is described below
commit 2bd500b83120527a164f0131155e928894a2ba28
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 18:13:56 2023 +0800
Add JDK 21 image container (#646)
---
.github/workflows/publish-docker.yaml | 2 +-
CHANGES.md| 1 +
Makefile | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 96b90d3fd4..be696af980 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
-java-version: [ 8, 11, 17 ]
+java-version: [ 8, 11, 17, 21 ]
env:
TAG: ${{ github.sha }}
steps:
diff --git a/CHANGES.md b/CHANGES.md
index 3129731e80..0b38c88c14 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Release Notes.
* Add a netty-http 4.1.x plugin to trace HTTP requests.
* Fix Impala Jdbc URL (including schema without properties) parsing exception.
* Optimize byte-buddy type description performance.
+* Add `eclipse-temurin:21-jre` as another base image.
Documentation
diff --git a/Makefile b/Makefile
index c7e4eb8c3a..4e7e9ca834 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,14 @@ dist: build
# Docker build
-base.all := alpine java8 java11 java17
+base.all := alpine java8 java11 java17 java21
base.each = $(word 1, $@)
base.image.alpine := alpine:3
base.image.java8 := eclipse-temurin:8-jre
base.image.java11 := eclipse-temurin:11-jre
base.image.java17 := eclipse-temurin:17-jre
+base.image.java21 := eclipse-temurin:21-jre
docker.%: PLATFORMS =
docker.%: LOAD_OR_PUSH = --load
(skywalking-java) branch wu-sheng-patch-1 updated (6446218d49 -> dcd821a6bd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git from 6446218d49 Add JDK 21 image container add dcd821a6bd Update makefile for JRE21 No new revisions were added by this update. Summary of changes: CHANGES.md | 1 + Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
(skywalking-java) 01/01: Add JDK 21 image container
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 6446218d49e69009d8369511b12012f570c688b1
Author: 吴晟 Wu Sheng
AuthorDate: Wed Nov 8 17:24:48 2023 +0800
Add JDK 21 image container
---
.github/workflows/publish-docker.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 96b90d3fd4..be696af980 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
-java-version: [ 8, 11, 17 ]
+java-version: [ 8, 11, 17, 21 ]
env:
TAG: ${{ github.sha }}
steps:
(skywalking-java) branch wu-sheng-patch-1 created (now 6446218d49)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at 6446218d49 Add JDK 21 image container This branch includes the following new commits: new 6446218d49 Add JDK 21 image container The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
