(skywalking) branch master updated: Add Golang as a supported language for Elasticsearch (#12315)
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 905e0a994f Add Golang as a supported language for Elasticsearch (#12315) 905e0a994f is described below commit 905e0a994f07825c481447217494c420373f6c0a Author: Starry AuthorDate: Tue Jun 11 08:25:21 2024 +0800 Add Golang as a supported language for Elasticsearch (#12315) --- docs/en/changes/changes.md | 1 + oap-server/server-starter/src/main/resources/component-libraries.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index fa0732a064..5e5f262d7f 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -7,6 +7,7 @@ * Fix wrong indices in the eBPF Profiling related models. * Support exclude the specific namespaces traffic in the eBPF Access Log receiver. +* Add Golang as a supported language for Elasticsearch. UI diff --git a/oap-server/server-starter/src/main/resources/component-libraries.yml b/oap-server/server-starter/src/main/resources/component-libraries.yml index 39fc5278e9..5b50d5c27f 100644 --- a/oap-server/server-starter/src/main/resources/component-libraries.yml +++ b/oap-server/server-starter/src/main/resources/component-libraries.yml @@ -185,7 +185,7 @@ activemq-consumer: languages: Java Elasticsearch: id: 47 - languages: Java,Python + languages: Java,Python,Golang transport-client: id: 48 languages: Java
(skywalking) branch marketplace-docs deleted (was a24166c1b3)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch marketplace-docs in repository https://gitbox.apache.org/repos/asf/skywalking.git was a24166c1b3 Add marketplace docs. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Add marketplace docs. (#12317)
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 38ede75f26 Add marketplace docs. (#12317) 38ede75f26 is described below commit 38ede75f2601ddd6a2870284cf4bef2eb2e63e14 Author: 吴晟 Wu Sheng AuthorDate: Mon Jun 10 23:23:38 2024 +0800 Add marketplace docs. (#12317) --- docs/en/changes/changes.md | 6 +- docs/en/setup/backend/marketplace.md | 7 ++ docs/menu.yml| 198 ++- 3 files changed, 111 insertions(+), 100 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index a660906415..fa0732a064 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -4,15 +4,17 @@ OAP Server + * Fix wrong indices in the eBPF Profiling related models. * Support exclude the specific namespaces traffic in the eBPF Access Log receiver. - UI Documentation -* Update the version description supported by zabbix receiver. +* Update the version description supported by zabbix receiver. +* Move the Official Dashboard docs to marketplace docs. +* Add marketplace introduction docs under `quick start` menu to reduce the confusion of finding feature docs. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/205?closed=1) diff --git a/docs/en/setup/backend/marketplace.md b/docs/en/setup/backend/marketplace.md new file mode 100644 index 00..056d4522b3 --- /dev/null +++ b/docs/en/setup/backend/marketplace.md @@ -0,0 +1,7 @@ +# Marketplace + +**Marketplace** is the first UI menu on the SkyWalking native UI. It is the place where you can install and manage SkyWalking +native and 3rd-party components. +The native out-of-box features are listed in the marketplace. Follow the `Documentation` guidance to set up required components. +Once the services of those layers are detected by SkyWalking, the relative menu will show up on the left automatically. + diff --git a/docs/menu.yml b/docs/menu.yml index 8c750719f5..18fd50acbb 100644 --- a/docs/menu.yml +++ b/docs/menu.yml @@ -44,6 +44,106 @@ catalog: path: "/en/setup/backend/backend-docker" - name: "Run with Kubernetes" path: "/en/setup/backend/backend-k8s" + - name: "Find out-of-box Features in Marketplace" +path: "/en/setup/backend/marketplace" + - name: "Marketplace" +catalog: + - name: "General Service" +catalog: + - name: "Server Agents" +path: "/en/setup/service-agent/server-agents" + - name: "Compatibility" +path: "/en/setup/service-agent/agent-compatibility" + - name: "Virtual Database" +path: "/en/setup/service-agent/virtual-database" + - name: "Virtual Cache" +path: "/en/setup/service-agent/virtual-cache" + - name: "Virtual MQ" +path: "/en/setup/service-agent/virtual-mq" + - name: "Service Mesh" +catalog: + - name: "Observe Service Mesh through Access Log Service (ALS)" +path: "/en/setup/envoy/als_setting" + - name: "Observe Service Mesh through Zipkin traces" +path: "/en/setup/zipkin/tracing" + - name: "Observe Control Plane (Istio)" +path: "/en/setup/istio/readme" + - name: "Observe Data Plane (Envoy)" +path: "/en/setup/envoy/metrics_service_setting" + - name: "Profile Pod's Network" +path: "/en/setup/backend/backend-k8s-network-monitoring" + - name: "Kubernetes" +catalog: + - name: "Observe Kubernetes" +path: "/en/setup/backend/backend-k8s-monitoring" + - name: "kube-state-metrics + cAdvisor" +path: "/en/setup/backend/backend-k8s-monitoring-metrics-cadvisor" + - name: "Rover" +path: "/en/setup/backend/backend-k8s-monitoring-rover" + - name: "Profile Pod's Network" +path: "/en/setup/backend/backend-k8s-network-monitoring" + - name: "Infrastructure Monitoring" +catalog: + - name: "Linux Monitoring" +path: "/en/setup/backend/backend-vm-monitoring" + - name: "Windows Monitoring"
(skywalking) 01/01: Add marketplace docs.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch marketplace-docs in repository https://gitbox.apache.org/repos/asf/skywalking.git commit a24166c1b36b3b641772326ed2bc4bc256d12c12 Author: Wu Sheng AuthorDate: Mon Jun 10 23:17:39 2024 +0800 Add marketplace docs. --- docs/en/changes/changes.md | 6 +- docs/en/setup/backend/marketplace.md | 7 ++ docs/menu.yml| 198 ++- 3 files changed, 111 insertions(+), 100 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index a660906415..fa0732a064 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -4,15 +4,17 @@ OAP Server + * Fix wrong indices in the eBPF Profiling related models. * Support exclude the specific namespaces traffic in the eBPF Access Log receiver. - UI Documentation -* Update the version description supported by zabbix receiver. +* Update the version description supported by zabbix receiver. +* Move the Official Dashboard docs to marketplace docs. +* Add marketplace introduction docs under `quick start` menu to reduce the confusion of finding feature docs. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/205?closed=1) diff --git a/docs/en/setup/backend/marketplace.md b/docs/en/setup/backend/marketplace.md new file mode 100644 index 00..056d4522b3 --- /dev/null +++ b/docs/en/setup/backend/marketplace.md @@ -0,0 +1,7 @@ +# Marketplace + +**Marketplace** is the first UI menu on the SkyWalking native UI. It is the place where you can install and manage SkyWalking +native and 3rd-party components. +The native out-of-box features are listed in the marketplace. Follow the `Documentation` guidance to set up required components. +Once the services of those layers are detected by SkyWalking, the relative menu will show up on the left automatically. + diff --git a/docs/menu.yml b/docs/menu.yml index 8c750719f5..18fd50acbb 100644 --- a/docs/menu.yml +++ b/docs/menu.yml @@ -44,6 +44,106 @@ catalog: path: "/en/setup/backend/backend-docker" - name: "Run with Kubernetes" path: "/en/setup/backend/backend-k8s" + - name: "Find out-of-box Features in Marketplace" +path: "/en/setup/backend/marketplace" + - name: "Marketplace" +catalog: + - name: "General Service" +catalog: + - name: "Server Agents" +path: "/en/setup/service-agent/server-agents" + - name: "Compatibility" +path: "/en/setup/service-agent/agent-compatibility" + - name: "Virtual Database" +path: "/en/setup/service-agent/virtual-database" + - name: "Virtual Cache" +path: "/en/setup/service-agent/virtual-cache" + - name: "Virtual MQ" +path: "/en/setup/service-agent/virtual-mq" + - name: "Service Mesh" +catalog: + - name: "Observe Service Mesh through Access Log Service (ALS)" +path: "/en/setup/envoy/als_setting" + - name: "Observe Service Mesh through Zipkin traces" +path: "/en/setup/zipkin/tracing" + - name: "Observe Control Plane (Istio)" +path: "/en/setup/istio/readme" + - name: "Observe Data Plane (Envoy)" +path: "/en/setup/envoy/metrics_service_setting" + - name: "Profile Pod's Network" +path: "/en/setup/backend/backend-k8s-network-monitoring" + - name: "Kubernetes" +catalog: + - name: "Observe Kubernetes" +path: "/en/setup/backend/backend-k8s-monitoring" + - name: "kube-state-metrics + cAdvisor" +path: "/en/setup/backend/backend-k8s-monitoring-metrics-cadvisor" + - name: "Rover" +path: "/en/setup/backend/backend-k8s-monitoring-rover" + - name: "Profile Pod's Network" +path: "/en/setup/backend/backend-k8s-network-monitoring" + - name: "Infrastructure Monitoring" +catalog: + - name: "Linux Monitoring" +path: "/en/setup/backend/backend-vm-monitoring" + - name: "Windows Monitoring" +path: "/en/setup/backend/backend-win-monitoring" + - name: "AWS Cloud Monitoring" +catalo
(skywalking) branch marketplace-docs created (now a24166c1b3)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch marketplace-docs in repository https://gitbox.apache.org/repos/asf/skywalking.git at a24166c1b3 Add marketplace docs. This branch includes the following new commits: new a24166c1b3 Add marketplace docs. 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: [GsoC][BanyanDB] Self-Observability: Create Measure Schema (#462)
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 3c21e3a9 [GsoC][BanyanDB] Self-Observability: Create Measure Schema
(#462)
3c21e3a9 is described below
commit 3c21e3a998e274e0f139e886c86f8abbbef82d1b
Author: Sylvie-Wxr <129717259+sylvie-...@users.noreply.github.com>
AuthorDate: Thu Jun 6 20:21:30 2024 -0700
[GsoC][BanyanDB] Self-Observability: Create Measure Schema (#462)
---
banyand/observability/meter_noop.go | 27 +--
banyand/observability/meter_prom.go | 4 +-
banyand/observability/service.go| 11 +--
pkg/meter/meter.go | 26 --
pkg/meter/native/instruments.go | 27 +++
pkg/meter/native/provider.go| 152
6 files changed, 187 insertions(+), 60 deletions(-)
diff --git a/banyand/observability/meter_noop.go
b/banyand/observability/meter_noop.go
index 6f2918b0..7c1bfb00 100644
--- a/banyand/observability/meter_noop.go
+++ b/banyand/observability/meter_noop.go
@@ -22,38 +22,17 @@ import (
"google.golang.org/grpc"
- commonv1
"github.com/apache/skywalking-banyandb/api/proto/banyandb/common/v1"
"github.com/apache/skywalking-banyandb/banyand/metadata"
"github.com/apache/skywalking-banyandb/pkg/meter"
+ "github.com/apache/skywalking-banyandb/pkg/meter/native"
)
// NewMeterProvider returns a meter.Provider based on the given scope.
-func newNativeMeterProvider(_ meter.Scope) meter.Provider {
- return meter.NoopProvider{}
+func newNativeMeterProvider(ctx context.Context, metadata metadata.Repo)
meter.Provider {
+ return native.NewProvider(ctx, SystemScope, metadata)
}
// MetricsServerInterceptor returns a grpc.UnaryServerInterceptor and a
grpc.StreamServerInterceptor.
func emptyMetricsServerInterceptor() (grpc.UnaryServerInterceptor,
grpc.StreamServerInterceptor) {
return nil, nil
}
-
-func createNativeObservabilityGroup(ctx context.Context, e metadata.Repo)
error {
- g := &commonv1.Group{
- Metadata: &commonv1.Metadata{
- Name: "_monitoring",
- },
- Catalog: commonv1.Catalog_CATALOG_MEASURE,
- ResourceOpts: &commonv1.ResourceOpts{
- ShardNum: 1,
- SegmentInterval: &commonv1.IntervalRule{
- Unit: commonv1.IntervalRule_UNIT_DAY,
- Num: 1,
- },
- Ttl: &commonv1.IntervalRule{
- Unit: commonv1.IntervalRule_UNIT_DAY,
- Num: 1,
- },
- },
- }
- return e.GroupRegistry().CreateGroup(ctx, g)
-}
diff --git a/banyand/observability/meter_prom.go
b/banyand/observability/meter_prom.go
index 7dcb0a3f..e81519ae 100644
--- a/banyand/observability/meter_prom.go
+++ b/banyand/observability/meter_prom.go
@@ -47,8 +47,8 @@ func init() {
}
// NewMeterProvider returns a meter.Provider based on the given scope.
-func newPromMeterProvider(scope meter.Scope) meter.Provider {
- return prom.NewProvider(scope, reg)
+func newPromMeterProvider() meter.Provider {
+ return prom.NewProvider(SystemScope, reg)
}
// MetricsServerInterceptor returns a server interceptor for metrics.
diff --git a/banyand/observability/service.go b/banyand/observability/service.go
index bb355862..b9b68ec2 100644
--- a/banyand/observability/service.go
+++ b/banyand/observability/service.go
@@ -96,6 +96,7 @@ func (p *metricService) Validate() error {
}
func (p *metricService) PreRun(ctx context.Context) error {
+ p.l = logger.GetLogger(p.Name())
p.mutex.Lock()
defer p.mutex.Unlock()
var providers []meter.Provider
@@ -103,13 +104,9 @@ func (p *metricService) PreRun(ctx context.Context) error {
switch mode {
case flagPromethusMode:
MetricsServerInterceptor = promMetricsServerInterceptor
- providers = append(providers,
newPromMeterProvider(SystemScope))
+ providers = append(providers, newPromMeterProvider())
case flagNativeMode:
- err := createNativeObservabilityGroup(ctx, p.metadata)
- if err != nil {
- p.l.Warn().Err(err).Msg("Failed to create
native observability group")
- }
- providers = append(providers,
newNativeMeterProvider(SystemScope))
+ providers = append(providers,
newNativeMeterProvider(ctx, p.metadata))
}
}
(skywalking-website) branch master updated: Add CN online session s01e06 (#719)
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 e228119bdd5 Add CN online session s01e06 (#719) e228119bdd5 is described below commit e228119bdd5c102d15359f3b9109a952a77212e2 Author: mrproliu <741550...@qq.com> AuthorDate: Fri Jun 7 00:38:58 2024 + Add CN online session s01e06 (#719) --- .../zh/2024-06-06-skywalking-in-practice-s01e06/index.md | 16 1 file changed, 16 insertions(+) diff --git a/content/zh/2024-06-06-skywalking-in-practice-s01e06/index.md b/content/zh/2024-06-06-skywalking-in-practice-s01e06/index.md new file mode 100644 index 000..d0153b49aba --- /dev/null +++ b/content/zh/2024-06-06-skywalking-in-practice-s01e06/index.md @@ -0,0 +1,16 @@ +--- +title: "SkyWalking从入门到精通 - 2024系列线上分享活动（第六讲）" +date: 2024-06-06 +author: 刘晗 +description: SkyWalking Go自动增强探针的演示与原理 +--- + +SkyWalking Go自动增强探针可以自动探测Go应用的运行状态，包括服务、实例、端点、拓扑等信息，同时还可以自动探测Go应用的性能指标，包括响应时间、错误率、吞吐量等指标。 +而不需要用户手动埋点，这样可以大大减少用户的工作量，提高用户的使用体验。 + +本次直播由 SkyWalking PMC 刘晗为大家介绍 SkyWalking Go 自动增强探针的原理和实现，主要包含以下几部分内容： +- 如何快速通过将程序与 SkyWalking Go 集成 +- 了解 SkyWalking Go 探针如何利用 Go ToolChain 进行自动增强 +- 了解 SkyWalking Go 如何与 SkyWalking 后端进行交互 + +[B站视频地址](https://www.bilibili.com/video/BV1L4421X7je)
(skywalking-java) branch main updated: Fix the opentracing toolkit SPI config (#696)
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 3a96458495 Fix the opentracing toolkit SPI config (#696)
3a96458495 is described below
commit 3a9645849529736ca3f67170d673daaee0ed0cda
Author: xiaqi1210
AuthorDate: Thu Jun 6 17:33:07 2024 +0800
Fix the opentracing toolkit SPI config (#696)
---
CHANGES.md | 1 +
.../{META-INF.services => META-INF/services}/io.opentracing.Tracer | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0be603455f..c7d88b0784 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Release Notes.
* Fix peer value of Master-Slave mode in Redisson plugin.
* Support for tracing the callbacks of asynchronous methods in
elasticsearch-6.x-plugin/elasticsearch-7.x-plugin.
* Fixed the invalid issue in the isInterface method in PluginFinder.
+* Fix the opentracing toolkit SPI config
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/213?closed=1)
diff --git
a/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
b/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF/services/io.opentracing.Tracer
similarity index 92%
rename from
apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
rename to
apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF/services/io.opentracing.Tracer
index 894da6a64f..4cb914e314 100644
---
a/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
+++
b/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF/services/io.opentracing.Tracer
@@ -16,4 +16,4 @@
#
#
-org.apache.skywalking.apm.toolkit.opentracing.SkyWalkingTracer
+org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer
(skywalking) branch master updated: Adding eBPF Access Log Feature E2E and support exclude specific namespaces traffic (#12304)
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 0b175ffb0a Adding eBPF Access Log Feature E2E and support exclude
specific namespaces traffic (#12304)
0b175ffb0a is described below
commit 0b175ffb0ab946bed9b843a12ae8dbeffebf11a4
Author: mrproliu <741550...@qq.com>
AuthorDate: Thu Jun 6 05:50:10 2024 +
Adding eBPF Access Log Feature E2E and support exclude specific namespaces
traffic (#12304)
---
.github/workflows/skywalking.yaml | 8 +
apm-protocol/apm-network/src/main/proto| 2 +-
docs/en/changes/changes.md | 1 +
.../server/core/query/ProcessTopologyBuilder.java | 6 +-
.../provider/handler/AccessLogServiceHandler.java | 23 ++-
.../profiling/ebpf/access_log/accesslog-cases.yaml | 166 +
.../profiling/ebpf/access_log/banyandb/e2e.yaml| 86 +++
.../cases/profiling/ebpf/access_log/es/e2e.yaml| 85 +++
.../ebpf/access_log/es/es-sharding/e2e.yaml| 86 +++
.../expected/dependency-endpoint-reviews.yml | 40 +
.../access_log/expected/dependency-instance.yml| 41 +
.../access_log/expected/dependency-services.yml| 79 ++
.../ebpf/access_log/expected/metrics-has-value.yml | 31
.../expected/service-endpoint-reviews.yml | 19 +++
.../ebpf/access_log/expected/service-instance.yml | 22 +++
.../profiling/ebpf/access_log/expected/service.yml | 45 ++
.../cases/profiling/ebpf/access_log/rover.yaml | 110 ++
.../profiling/ebpf/access_log/traffic-gen.yaml | 40 +
18 files changed, 886 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 917e2f0444..a6c47db5de 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -531,6 +531,14 @@ jobs:
file: Dockerfile.sqrt
name: test/continuous:test
+ # eBPF Access Log
+ - name: eBPF Access Log BanyanDB
+config:
test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
+ - name: eBPF Access Log ES
+config: test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml
+ - name: eBPF Access Log ES Sharding
+config:
test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml
+
- name: Kafka Basic
config: test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
- name: Kafka Profiling
diff --git a/apm-protocol/apm-network/src/main/proto
b/apm-protocol/apm-network/src/main/proto
index f2f3005155..b5f6ebe281 16
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit f2f3005155339b09714b963e19fea5151d0d6d0b
+Subproject commit b5f6ebe281b96d89968959f55baa3d9aa1bfecee
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 38a98abd42..a660906415 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,6 +5,7 @@
OAP Server
* Fix wrong indices in the eBPF Profiling related models.
+* Support exclude the specific namespaces traffic in the eBPF Access Log
receiver.
UI
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProcessTopologyBuilder.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProcessTopologyBuilder.java
index 42e7af7d24..1b79dcd24a 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProcessTopologyBuilder.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProcessTopologyBuilder.java
@@ -34,6 +34,7 @@ import
org.apache.skywalking.oap.server.core.storage.StorageModule;
import org.apache.skywalking.oap.server.core.storage.model.Model;
import org.apache.skywalking.oap.server.core.storage.model.StorageModels;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
+import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import java.util.HashMap;
import java.util.LinkedList;
@@ -71,6 +72,9 @@ public class ProcessTopologyBuilder {
List serverCalls) throws Exception {
log.debug("building process topology, total found client calls: {},
total found server calls: {}",
clientCalls.size(), serverCalls.size());
+if (CollectionUtils.isEmpty(clientCalls) &&
CollectionUtils.isEmpty(serverCalls)) {
+return new ProcessTopology();
+}
List calls = new LinkedList<>();
HashMap callMap = new HashMap<>();
@@ -88,7 +92,7 @@ public class ProcessTopologyBuilder {
r
(skywalking) branch master updated: Fix wrong indices in the eBPF Profiling related models (#12297)
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 341bdcf1dd Fix wrong indices in the eBPF Profiling related models
(#12297)
341bdcf1dd is described below
commit 341bdcf1dd08a3c829f8d2d78d6bf09a1467ff22
Author: mrproliu <741550...@qq.com>
AuthorDate: Wed Jun 5 07:52:45 2024 +
Fix wrong indices in the eBPF Profiling related models (#12297)
---
docs/en/changes/changes.md | 3 ++-
docs/en/setup/backend/backend-zabbix.md | 2 +-
.../oap/server/core/profiling/ebpf/EBPFProfilingQueryService.java | 2 +-
.../server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java | 2 +-
.../core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java| 5 +++--
.../skywalking/oap/server/core/query/ProcessTopologyBuilder.java| 6 ++
test/e2e-v2/cases/vm/zabbix/docker-compose.yml | 2 +-
7 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index eaf520c883..38a98abd42 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -4,13 +4,14 @@
OAP Server
+* Fix wrong indices in the eBPF Profiling related models.
UI
Documentation
-
+* Update the version description supported by zabbix receiver.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/205?closed=1)
diff --git a/docs/en/setup/backend/backend-zabbix.md
b/docs/en/setup/backend/backend-zabbix.md
index 5a14f96ce8..a5abfeba7e 100644
--- a/docs/en/setup/backend/backend-zabbix.md
+++ b/docs/en/setup/backend/backend-zabbix.md
@@ -1,6 +1,6 @@
# Zabbix Receiver
The Zabbix receiver accepts metrics of [Zabbix Agent Active Checks
protocol](https://www.zabbix.com/documentation/current/manual/appendix/items/activepassive#active_checks)
format into the [Meter System](./../../concepts-and-designs/meter.md).
-Zabbix Agent is based on GPL-2.0 License.
+Zabbix Agent is based on GPL-2.0 License, only version `6.x` and below are
supported.
## Module definition
```yaml
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/EBPFProfilingQueryService.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/EBPFProfilingQueryService.java
index 336b317483..45d01f280d 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/EBPFProfilingQueryService.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/EBPFProfilingQueryService.java
@@ -190,7 +190,7 @@ public class EBPFProfilingQueryService implements Service {
final List tasks =
getTaskDAO().queryTasksByTargets(serviceId, serviceInstanceId, targets,
triggerType, startTime, endTime);
// combine same id tasks
final Map records =
tasks.stream().collect(Collectors.toMap(EBPFProfilingTaskRecord::getLogicalId,
Function.identity(), EBPFProfilingTaskRecord::combine));
-return
records.values().stream().map(this::parseTask).collect(Collectors.toList());
+return records.values().stream().map(this::parseTask).sorted((o1, o2)
-> -Long.compare(o1.getCreateTime(),
o2.getCreateTime())).collect(Collectors.toList());
}
private EBPFProfilingTask parseTask(EBPFProfilingTaskRecord record) {
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
index 41885e3a7c..fe0f123c36 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
@@ -51,8 +51,8 @@ public class EBPFProfilingDataRecord extends Record {
public static final String UPLOAD_TIME = "upload_time";
@Column(name = TASK_ID)
-@BanyanDB.SeriesID(index = 0)
private String taskId;
+@BanyanDB.SeriesID(index = 0)
@Column(name = SCHEDULE_ID)
private String scheduleId;
@Column(name = STACK_ID_LIST)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java
index 9e9f78b5e6..d6349e928e 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/pro
(skywalking-banyandb-helm) branch master updated: Remove redundant "name" and "role" (#18)
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 f0f92b3 Remove redundant "name" and "role" (#18)
f0f92b3 is described below
commit f0f92b3071bd2e5e2c9779aeb2110c004556fcc8
Author: Gao Hongtao
AuthorDate: Wed Jun 5 08:27:37 2024 +0800
Remove redundant "name" and "role" (#18)
---
README.md | 5 -
chart/templates/deployment.yaml | 10 --
chart/templates/grpc_service.yaml | 9 -
chart/templates/http_service.yaml | 9 -
chart/templates/ingress.yaml| 2 +-
chart/templates/pdb.yaml| 6 +++---
chart/templates/serviceaccount.yaml | 1 -
chart/templates/statefulset.yaml| 18 --
chart/values.yaml | 4
test/e2e/values.cluster.yaml| 4
10 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/README.md b/README.md
index 138a4ec..8abd107 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,6 @@ The command removes all the banyandb components associated
with the chart and de
| cluster.data.grpcSvc.annotations | object | `{}` | |
| cluster.data.grpcSvc.labels | object | `{}` | |
| cluster.data.grpcSvc.port | int | `17912` | |
-| cluster.data.name | string | `"banyandb"` | |
| cluster.data.nodeSelector | list | `[]` | |
| cluster.data.podAnnotations | string | `nil` | |
| cluster.data.podDisruptionBudget | object | `{}` | |
@@ -60,7 +59,6 @@ The command removes all the banyandb components associated
with the chart and de
| cluster.data.replicas | int | `3` | |
| cluster.data.resources.limits | list | `[]` | |
| cluster.data.resources.requests | list | `[]` | |
-| cluster.data.role | string | `"data"` | |
| cluster.data.securityContext | object | `{}` | |
| cluster.data.sidecar | list | `[]` | |
| cluster.data.tolerations | list | `[]` | |
@@ -83,7 +81,6 @@ The command removes all the banyandb components associated
with the chart and de
| cluster.liaison.ingress.labels | object | `{}` | |
| cluster.liaison.ingress.rules | list | `[]` | |
| cluster.liaison.ingress.tls | list | `[]` | |
-| cluster.liaison.name | string | `"banyandb"` | |
| cluster.liaison.nodeSelector | list | `[]` | |
| cluster.liaison.podAnnotations | string | `nil` | |
| cluster.liaison.podDisruptionBudget | object | `{}` | |
@@ -91,7 +88,6 @@ The command removes all the banyandb components associated
with the chart and de
| cluster.liaison.replicas | int | `2` | |
| cluster.liaison.resources.limits | list | `[]` | |
| cluster.liaison.resources.requests | list | `[]` | |
-| cluster.liaison.role | string | `"liaison"` | |
| cluster.liaison.securityContext | object | `{}` | |
| cluster.liaison.tolerations | list | `[]` | |
| etcd.auth.client.caFilename | string | `""` | |
@@ -130,7 +126,6 @@ The command removes all the banyandb components associated
with the chart and de
| standalone.ingress.labels | object | `{}` | |
| standalone.ingress.rules | list | `[]` | |
| standalone.ingress.tls | list | `[]` | |
-| standalone.name | string | `"banyandb"` | |
| standalone.nodeSelector | list | `[]` | |
| standalone.podAnnotations.example | string | `"banyandb-foo"` | |
| standalone.podDisruptionBudget | object | `{}` | |
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 56de208..00ebfbb 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -22,25 +22,23 @@ metadata:
labels:
app: {{ template "banyandb.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-component: "{{ .Values.cluster.liaison.name }}"
+component: liaison
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
-role: {{ .Values.cluster.liaison.role }}
name: {{ template "banyandb.fullname" . }}
spec:
replicas: {{ .Values.cluster.liaison.replicas }}
selector:
matchLabels:
app: {{ template "banyandb.name" . }}
- component: "{{ .Values.cluster.liaison.name }}"
+ component: liaison
release: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "banyandb.name" . }}
-component: "{{ .Values.cluster.liaison.name }}"
+component: liaison
release: {{ .Release.Name }}
-role: {{ .Values.cluster.liaison.role }}
{{- if .Values.cluster.liaison.podAnnotations }}
annotations:
{{ toYaml .Values.cluster.liaison.podAnnotations | indent 8 }}
@@ -53,7 +51,7 @@ spec:
{{- end }}
priorityClassName: {{ .Values.cluster.liaison.priorityClassName }}
co
(skywalking-banyandb-helm) branch multiple-etcd deleted (was 2a07fbf)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch multiple-etcd in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git was 2a07fbf Remove redundant "name" and "role" 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-data-collect-protocol) branch master updated: Adding exclude namespace policy in the eBPF Access Log Protocol (#96)
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-data-collect-protocol.git
The following commit(s) were added to refs/heads/master by this push:
new b5f6ebe Adding exclude namespace policy in the eBPF Access Log
Protocol (#96)
b5f6ebe is described below
commit b5f6ebe281b96d89968959f55baa3d9aa1bfecee
Author: mrproliu <741550...@qq.com>
AuthorDate: Tue Jun 4 09:56:27 2024 +
Adding exclude namespace policy in the eBPF Access Log Protocol (#96)
---
ebpf/accesslog.proto | 7 +++
1 file changed, 7 insertions(+)
diff --git a/ebpf/accesslog.proto b/ebpf/accesslog.proto
index 324094b..5678ac1 100644
--- a/ebpf/accesslog.proto
+++ b/ebpf/accesslog.proto
@@ -53,6 +53,13 @@ message EBPFAccessLogNodeInfo {
Instant bootTime = 3;
// Cluster name
string clusterName = 4;
+// Policy for the access log
+EBPFAccessLogPolicy policy = 5;
+}
+
+message EBPFAccessLogPolicy {
+// Which namespaces should be excluded to generate the connection
+repeated string excludeNamespaces = 1;
}
message EBPFAccessLogNodeNetInterface {
(skywalking-website) branch master updated: Add CN online session s01e04 (#717)
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 b887575a45f Add CN online session s01e04 (#717) b887575a45f is described below commit b887575a45f3e0aa4824126fd1d5e4a2db92eb36 Author: yswdqz <74546965+ysw...@users.noreply.github.com> AuthorDate: Tue Jun 4 11:20:29 2024 +0800 Add CN online session s01e04 (#717) --- .../index.md | 48 ++ 1 file changed, 48 insertions(+) diff --git a/content/zh/2024-05-23-skywalking-in-practice-s01e04/index.md b/content/zh/2024-05-23-skywalking-in-practice-s01e04/index.md new file mode 100644 index 000..cdde31e5897 --- /dev/null +++ b/content/zh/2024-05-23-skywalking-in-practice-s01e04/index.md @@ -0,0 +1,48 @@ +--- +title: "SkyWalking从入门到精通 - 2024系列线上分享活动（第四讲）" +date: 2024-05-23 +author: 张跃骎 +description: 理清数据流向；MySQL 数据库的指标是如何一步一步导向 SkyWalking 的。简单介绍 MAL；SkyWalking 如何利用领域特定语言对数据处理。简单介绍 SkyWalking UI；讲解如何打造独属于自己的监控面板。 +--- + +本次直播是 Apache SkyWalking 社区和纵目联合举办分享活动的第四讲，由张跃骎为大家展示 SkyWalking 监控 MySQL Server，主要包含以下几部分内容： + +- 理清数据流向；MySQL 数据库的指标是如何一步一步导向 SkyWalking 的。 +- 简单介绍 MAL；SkyWalking 如何利用领域特定语言对数据处理。 +- 简单介绍 SkyWalking UI；讲解如何打造独属于自己的监控面板。 + +[B站视频地址](https://www.bilibili.com/video/BV177421Z7xn) + +环境准备整理如下： + +# 环境准备 +## MySQL Server +如果读者没有直接可使用的 MySQL Server，可以使用 Docker 通过以下命令直接创建： +``` bash +docker run -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -d mysql:latest +``` +关于账号，创建命令如下(即请确保具有以下权限)： +``` SQL +CREATE USER 'exporter'@'localhost' IDENTIFIED BY '' WITH MAX_USER_CONNECTIONS 3; +GRANT PROCESS, REPLICATION CLIENT, SELECT ON *.* TO 'exporter'@'localhost'; +``` +## MySQL Exporter 安装 +指标导出工具最简单的部署方式是通过 Docker，命令如下： +``` bash +docker run -d \ + -p 9104:9104 \ + -e "DATA_SOURCE_NAME=root:password@(host.docker.internal:3306)/" \ + prom/mysqld-exporter:v0.14.0 +``` +请注意，命令中的 DATA_SOURCE_NAME 部分应该按照实际情况更换。 + +## OTEL Collctor +由于笔者使用的是 macos 系统，而部分版本的 OpenTelemetry Collector 在 docker desktop 上调试会有 bug，因此演示使用本地安装方式，具体安装方式请参考：[OpenTelemetry Collector安装](https://opentelemetry.io/docs/collector/installation/)。 + +安装好后，我们可以执行命令开始运行： +``` bash +./otelcol --config=test.conf +``` + +配置文件，请参考：[OTEL Collector 配置](https://github.com/apache/skywalking/blob/master/test/e2e-v2/cases/mysql/prometheus-mysql-exporter/otel-collector-config.yaml)。 +
(skywalking-website) branch master updated: MQE video ZH blog (#716)
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 2d9b7c8bfab MQE video ZH blog (#716) 2d9b7c8bfab is described below commit 2d9b7c8bfab5e854d4e9f4ed3bed370d1c7f76b2 Author: Wan Kai AuthorDate: Tue Jun 4 09:34:28 2024 +0800 MQE video ZH blog (#716) --- .../index.md | 19 +++ .../2024-05-30-skywalking-in-practice-s01e05/mqe.png | Bin 0 -> 53965 bytes 2 files changed, 19 insertions(+) diff --git a/content/zh/2024-05-30-skywalking-in-practice-s01e05/index.md b/content/zh/2024-05-30-skywalking-in-practice-s01e05/index.md new file mode 100644 index 000..8e73445c0fb --- /dev/null +++ b/content/zh/2024-05-30-skywalking-in-practice-s01e05/index.md @@ -0,0 +1,19 @@ +--- +title: "SkyWalking从入门到精通 - 2024系列线上分享活动（第五讲）" +date: 2024-05-30 +author: 万凯 +description: SkyWalking Metrics Query Expression(MQE)的介绍以及在查询与告警中的应用 +--- + +MQE是SkyWalking的核心metrics查询服务引擎，自从SkyWalking v9.5.0开始支持MQE以来，MQE展现了其强大灵活和便利性，丰富了metrics的查询方式，随后在v9.6.0 中告警规则配置也全面使用MQE， +让告警规则配置更简单并且可以设定更复杂的条件和计算。在SkyWalking v10以后，官方UI已经全面迁移至使用MQE与OAP进行交互。 + + + +本次直播由SkyWalking PMC 万凯为大家介绍 SkyWalking Metrics Query Expression(MQE)，主要包含以下几部分内容： +- 什么是MQE，它的基本原理和在SkyWalking中的架构 +- MQE的基本语法结构和函数 +- MQE在查询中的应用 +- MQE在告警规则中的应用 + +[B站视频地址](https://www.bilibili.com/video/BV1XM4m1z784) diff --git a/content/zh/2024-05-30-skywalking-in-practice-s01e05/mqe.png b/content/zh/2024-05-30-skywalking-in-practice-s01e05/mqe.png new file mode 100644 index 000..17c935ea71f Binary files /dev/null and b/content/zh/2024-05-30-skywalking-in-practice-s01e05/mqe.png differ
(skywalking-website) branch mqe-blog deleted (was 46fb6d2f598)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch mqe-blog in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was 46fb6d2f598 Update content/zh/2024-05-30-skywalking-in-practice-s01e05/index.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-website) branch mqe-blog updated (349281ba992 -> 46fb6d2f598)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch mqe-blog in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from 349281ba992 remove img add 46fb6d2f598 Update content/zh/2024-05-30-skywalking-in-practice-s01e05/index.md No new revisions were added by this update. Summary of changes: content/zh/2024-05-30-skywalking-in-practice-s01e05/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-booster-ui) branch main updated: fix: browser log (#399)
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 c35bdce3 fix: browser log (#399)
c35bdce3 is described below
commit c35bdce3995383084fb17072b9b403a2f6235eb8
Author: Starry
AuthorDate: Tue Jun 4 08:51:43 2024 +0800
fix: browser log (#399)
---
src/locales/lang/en.ts | 3 ++-
src/locales/lang/es.ts | 3 ++-
src/locales/lang/zh.ts | 3 ++-
src/views/dashboard/related/log/LogTable/LogBrowser.vue | 1 -
src/views/dashboard/related/log/LogTable/data.ts| 8 ++--
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 63c2dc2d..4d816ad7 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -284,7 +284,8 @@ const msg = {
errorInfo: "Error Info",
stack: "Stack",
serviceVersion: "Service Version",
- errorPage: "Error Page",
+ pagePath: "Page Path",
+ errorUrl: "Error Url",
category: "Category",
grade: "Grade",
relatedTraceLogs: "Related Logs",
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index d5d738bb..fbf22826 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -283,7 +283,8 @@ const msg = {
errorInfo: "Info Error",
stack: "Pila",
serviceVersion: "Versión Servicio",
- errorPage: "Página de Error",
+ pagePath: "Página de Error",
+ errorUrl: "Ruta de Error",
category: "Categoría",
grade: "Grado",
relatedTraceLogs: "Registro de Datos Relacionados",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 18a8dbfe..0a2d5c0f 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -281,7 +281,8 @@ const msg = {
errorInfo: "错误信息",
stack: "堆栈",
serviceVersion: "服务版本",
- errorPage: "错误页面",
+ pagePath: "错误页面",
+ errorUrl: "错误路径",
category: "类别",
grade: "等级",
relatedTraceLogs: "相关的日志",
diff --git a/src/views/dashboard/related/log/LogTable/LogBrowser.vue
b/src/views/dashboard/related/log/LogTable/LogBrowser.vue
index e215988e..4411eb1c 100644
--- a/src/views/dashboard/related/log/LogTable/LogBrowser.vue
+++ b/src/views/dashboard/related/log/LogTable/LogBrowser.vue
@@ -21,7 +21,6 @@ limitations under the License. -->
:class="['log', ['message', 'stack'].includes(item.label) ? 'max-item' :
'']"
>
{{ dateFormat(data.time) }}
- {{ data.pagePath }}
{{ data[item.label] || "-" }}
diff --git a/src/views/dashboard/related/log/LogTable/data.ts
b/src/views/dashboard/related/log/LogTable/data.ts
index 96f42aa3..607ddcf4 100644
--- a/src/views/dashboard/related/log/LogTable/data.ts
+++ b/src/views/dashboard/related/log/LogTable/data.ts
@@ -74,8 +74,8 @@ export const BrowserLogConstants = [
value: "serviceVersion",
},
{
-label: "errorUrl",
-value: "errorPage",
+label: "pagePath",
+value: "pagePath",
},
{
label: "time",
@@ -87,6 +87,10 @@ export const BrowserLogConstants = [
// drag: true,
method: 350,
},
+ {
+label: "errorUrl",
+value: "errorUrl",
+ },
{
label: "stack",
value: "stack",
(skywalking-banyandb) branch trace-api deleted (was 078c6fcd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch trace-api in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was 078c6fcd Add Trace The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: Add Trace (#461)
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 cca27ddb Add Trace (#461)
cca27ddb is described below
commit cca27ddb2a9b579f197ed119cfc869d879e82045
Author: Gao Hongtao
AuthorDate: Tue Jun 4 08:18:33 2024 +0800
Add Trace (#461)
---
api/proto/banyandb/common/v1/trace.proto | 59 +++
api/proto/banyandb/measure/v1/query.proto | 5 ++
api/proto/banyandb/stream/v1/query.proto | 5 ++
docs/api-reference.md | 78 +++
4 files changed, 147 insertions(+)
diff --git a/api/proto/banyandb/common/v1/trace.proto
b/api/proto/banyandb/common/v1/trace.proto
new file mode 100644
index ..73a4351d
--- /dev/null
+++ b/api/proto/banyandb/common/v1/trace.proto
@@ -0,0 +1,59 @@
+// Licensed to Apache Software Foundation (ASF) under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Apache Software Foundation (ASF) licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+syntax = "proto3";
+
+package banyandb.common.v1;
+
+import "google/protobuf/timestamp.proto";
+
+option go_package =
"github.com/apache/skywalking-banyandb/api/proto/banyandb/common/v1";
+option java_package = "org.apache.skywalking.banyandb.common.v1";
+
+// Trace is the top level message of a trace.
+message Trace {
+ // trace_id is the unique identifier of the trace.
+ string trace_id = 1;
+ // spans is a list of spans in the trace.
+ repeated Span spans = 2;
+ // error indicates whether the trace is an error trace.
+ bool error = 3;
+}
+
+// Span is the basic unit of a trace.
+message Span {
+ // start_time is the start time of the span.
+ google.protobuf.Timestamp start_time = 1;
+ // end_time is the end time of the span.
+ google.protobuf.Timestamp end_time = 2;
+ // error indicates whether the span is an error span.
+ bool error = 3;
+ // tags is a list of tags of the span.
+ repeated Tag tags = 4;
+ // message is the message generated by the span.
+ string message = 5;
+ // children is a list of child spans of the span.
+ repeated Span children = 6;
+}
+
+// Tag is the key-value pair of a span.
+message Tag {
+ // key is the key of the tag.
+ string key = 1;
+ // value is the value of the tag.
+ string value = 2;
+}
diff --git a/api/proto/banyandb/measure/v1/query.proto
b/api/proto/banyandb/measure/v1/query.proto
index 9e07aea6..6cb04417 100644
--- a/api/proto/banyandb/measure/v1/query.proto
+++ b/api/proto/banyandb/measure/v1/query.proto
@@ -19,6 +19,7 @@ syntax = "proto3";
package banyandb.measure.v1;
+import "banyandb/common/v1/trace.proto";
import "banyandb/model/v1/common.proto";
import "banyandb/model/v1/query.proto";
import "google/protobuf/timestamp.proto";
@@ -45,6 +46,8 @@ message DataPoint {
message QueryResponse {
// data_points are the actual data returned
repeated DataPoint data_points = 1;
+ // trace contains the trace information of the query when trace is enabled
+ common.v1.Trace trace = 2;
}
// QueryRequest is the request contract for query.
@@ -101,4 +104,6 @@ message QueryRequest {
uint32 limit = 11;
// order_by is given to specify the sort for a tag.
model.v1.QueryOrder order_by = 12;
+ // trace is used to enable trace for the query
+ bool trace = 13;
}
diff --git a/api/proto/banyandb/stream/v1/query.proto
b/api/proto/banyandb/stream/v1/query.proto
index 3d2f480e..250b332a 100644
--- a/api/proto/banyandb/stream/v1/query.proto
+++ b/api/proto/banyandb/stream/v1/query.proto
@@ -19,6 +19,7 @@ syntax = "proto3";
package banyandb.stream.v1;
+import "banyandb/common/v1/trace.proto";
import "banyandb/model/v1/query.proto";
import "google/protobuf/timestamp.proto";
import "validate/validate.proto";
@@ -49,6 +50,8 @@ message Element {
message QueryResponse {
// elements are the actual data returned
repeated Element elements = 1;
+ // trace contains the trace information of the query when trace is enabled
+ common.v1.Trace trace = 2;
}
// QueryRequest is the request contract f
(skywalking-java) branch main updated: Fix to Ensure not isInterface requirement applied to all conditions (#695)
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 313d7d5c8e Fix to Ensure not isInterface requirement applied to all
conditions (#695)
313d7d5c8e is described below
commit 313d7d5c8e171df0a24b273c4949738133586922
Author: 苏格苏格拉
AuthorDate: Mon Jun 3 11:22:17 2024 +0800
Fix to Ensure not isInterface requirement applied to all conditions (#695)
---
CHANGES.md | 1 +
.../java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 321c775094..0be603455f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Release Notes.
* Support for showing batch command details and ignoring PING commands in
Redisson plugin.
* Fix peer value of Master-Slave mode in Redisson plugin.
* Support for tracing the callbacks of asynchronous methods in
elasticsearch-6.x-plugin/elasticsearch-7.x-plugin.
+* Fixed the invalid issue in the isInterface method in PluginFinder.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/213?closed=1)
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java
index 4ef608dccc..5a7404e729 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java
@@ -95,13 +95,14 @@ public class PluginFinder {
return nameMatchDefine.containsKey(target.getActualName());
}
};
-judge = judge.and(not(isInterface()));
for (AbstractClassEnhancePluginDefine define : signatureMatchDefine) {
ClassMatch match = define.enhanceClass();
if (match instanceof IndirectMatch) {
judge = judge.or(((IndirectMatch) match).buildJunction());
}
}
+// Filter out all matchers returns to exclude pure interface types.
+judge = not(isInterface()).and(judge);
return new ProtectiveShieldMatcher(judge);
}
(skywalking-go) branch main updated: feat: enhance version info (#185)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-go.git
The following commit(s) were added to refs/heads/main by this push:
new 273ca89 feat: enhance version info (#185)
273ca89 is described below
commit 273ca894dd1a39c38d934cf05ada670799db1485
Author: Shyunn <1147212...@qq.com>
AuthorDate: Mon Jun 3 09:11:13 2024 +0800
feat: enhance version info (#185)
---
.gitignore | 1 +
Makefile | 25 -
tools/go-agent/Makefile| 12 +++-
tools/go-agent/cmd/helper.go | 34 --
tools/release/create_source_release.sh | 3 +++
5 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index fefcda4..e985f85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ coverage.txt
/test/plugins/dist/
*.pb.go
vendor/
+VERSION
diff --git a/Makefile b/Makefile
index 74c9150..eac70b3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,17 @@ GO_TEST_LDFLAGS =
REPODIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST/
LINT_FILE_PATH = $(REPODIR).golangci.yml
+VERSION_FILE=VERSION
+
SHELL = /bin/bash
HUB ?= docker.io/apache
PROJECT ?= skywalking-go
-VERSION ?= $(shell git rev-parse --short HEAD)
+
+GIT_VERSION := $(shell git rev-parse --short HEAD)
+ifeq ($(strip $(GIT_VERSION)),)
+GIT_VERSION = $(shell grep gitCommit $(VERSION_FILE) | awk -F ': ' '{print
$$2}')
+endif
LOG_TARGET = echo -e "\033[0;32m===> Running $@ ... \033[0m"
@@ -101,8 +107,17 @@ check: ## Run consistency checks
exit 1; \
fi
+.PHONY: version-check
+version-check: ## Version-Check Check skywalking-go VERSION files
+ @$(LOG_TARGET)
+ @if [ ! -f $(VERSION_FILE) ]; then \
+echo "$(VERSION_FILE) file does not exist and is currently being
generated"; \
+echo "version: $(VERSION)" > $(VERSION_FILE); \
+echo "gitCommit: $(GIT_VERSION)" >> $(VERSION_FILE); \
+fi
+
.PHONY: build
-build: ## Build skywalking-go agent binary
+build: version-check ## Build skywalking-go agent binary
@$(LOG_TARGET)
@make -C tools/go-agent build
@@ -133,16 +148,16 @@ docker.push.%: LOAD_OR_PUSH = --push
.PHONY: $(base.all)
$(base.all:%=docker.%): BASE_IMAGE=$($(base.each:docker.%=base.image.%))
-$(base.all:%=docker.%): FINAL_TAG=$(VERSION)-$(base.each:docker.%=%)
+$(base.all:%=docker.%): FINAL_TAG=$(GIT_VERSION)-$(base.each:docker.%=%)
$(base.all:%=docker.push.%):
BASE_IMAGE=$($(base.each:docker.push.%=base.image.%))
-$(base.all:%=docker.push.%): FINAL_TAG=$(VERSION)-$(base.each:docker.push.%=%)
+$(base.all:%=docker.push.%):
FINAL_TAG=$(GIT_VERSION)-$(base.each:docker.push.%=%)
$(base.all:%=docker.%) $(base.all:%=docker.push.%):
@$(LOG_TARGET)
docker buildx create --use --driver docker-container --name
skywalking_go > /dev/null 2>&1 || true
docker buildx build $(PLATFORMS) $(LOAD_OR_PUSH) \
--no-cache \
--build-arg "BASE_GO_IMAGE=$(BASE_IMAGE)" \
---build-arg "VERSION=$(VERSION)" \
+--build-arg "VERSION=$(GIT_VERSION)" \
. -t $(HUB)/$(PROJECT):$(FINAL_TAG)
docker buildx rm skywalking_go || true
diff --git a/tools/go-agent/Makefile b/tools/go-agent/Makefile
index ff7cdbf..a4fd918 100644
--- a/tools/go-agent/Makefile
+++ b/tools/go-agent/Makefile
@@ -18,17 +18,27 @@
REPODIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST/../../
OUT_DIR = $(REPODIR)/bin
+VERSION_PATH = $(REPODIR)/VERSION
BINARY = skywalking-go-agent
SH = sh
GO = go
GIT = git
+
+GIT_COMMIT := $(shell $(GIT) rev-parse --short HEAD)
+ifeq ($(strip $(GIT_COMMIT)),)
+GIT_COMMIT = $(shell grep gitCommit $(VERSION_PATH) | awk -F ': ' '{print
$$2}')
+endif
+VERSION := $(shell grep version $(VERSION_PATH) | awk -F ': ' '{print $$2}')
+
+GO_VERSION := $(shell $(GO) env GOVERSION)
+VERSION_PACKAGE := main
PROTOC = protoc
GO_PATH = $$($(GO) env GOPATH)
GO_BUILD = $(GO) build
GO_LINT = $(GO_PATH)/bin/golangci-lint
GO_BUILD_FLAGS = -v
-GO_BUILD_LDFLAGS = -X main.version=$(VERSION)
+GO_BUILD_LDFLAGS = -X $(VERSION_PACKAGE).version=$(VERSION) -X
$(VERSION_PACKAGE).goVersion=$(GO_VERSION) -X
$(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT)
GO_TEST_LDFLAGS =
GO_GET = $(GO) get
diff --git a/tools/go-agent/cmd/helper.go b/tools/go-agent/cmd/helper.go
index 3e99c02..e3afe37 100644
--- a/tools/go-agent/cmd/helper.go
+++ b/tools/go-agent/cmd/helper.go
@@ -23,7 +23,11 @@ import (
"text/template"
)
-var version string
+var (
+ version string
+ goVersion string
+ gitCommit string
+)
type EnhancementToolFlags
(skywalking) branch wu-sheng-patch-1 deleted (was cadd004cb1)
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 cadd004cb1 Update How-to-release.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Update How-to-release.md (#12287)
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 08cd921f4c Update How-to-release.md (#12287) 08cd921f4c is described below commit 08cd921f4ca65014eadbea3140a19e9f9ab3018f Author: 吴晟 Wu Sheng AuthorDate: Sun Jun 2 21:27:09 2024 +0800 Update How-to-release.md (#12287) --- docs/en/guides/How-to-release.md | 8 1 file changed, 8 insertions(+) diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index 4a7f713e2a..3197acbbed 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -251,3 +251,11 @@ make docker.push Once the latest release has been published, you should clean up the old releases from the mirror system. 1. Update the download links (source, dist, asc, and sha512) on the website to the archive repo (https://archive.apache.org/dist/skywalking). 2. Remove previous releases from https://dist.apache.org/repos/dist/release/skywalking/. + +## Update the Quick Start Versions + +We hosted the [SkyWalking Quick Start script](https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-docker/#start-the-storage-oap-and-booster-ui-with-docker-compose), +which is a shell script that helps users to download and start SkyWalking quickly. +The versions of OAP and BanyanDB are hard-coded in the script, so you need to update the versions in the script. + +Update the versions [here](https://github.com/apache/skywalking-website/blob/master/content/quickstart-docker.sh#L23-L24)
(skywalking) branch wu-sheng-patch-1 created (now cadd004cb1)
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 cadd004cb1 Update How-to-release.md This branch includes the following new commits: new cadd004cb1 Update How-to-release.md The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) 01/01: Update How-to-release.md
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit cadd004cb1adcb2713f560ec82a038cd8fdbbde1 Author: 吴晟 Wu Sheng AuthorDate: Sun Jun 2 21:17:12 2024 +0800 Update How-to-release.md --- docs/en/guides/How-to-release.md | 8 1 file changed, 8 insertions(+) diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index 4a7f713e2a..3197acbbed 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -251,3 +251,11 @@ make docker.push Once the latest release has been published, you should clean up the old releases from the mirror system. 1. Update the download links (source, dist, asc, and sha512) on the website to the archive repo (https://archive.apache.org/dist/skywalking). 2. Remove previous releases from https://dist.apache.org/repos/dist/release/skywalking/. + +## Update the Quick Start Versions + +We hosted the [SkyWalking Quick Start script](https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-docker/#start-the-storage-oap-and-booster-ui-with-docker-compose), +which is a shell script that helps users to download and start SkyWalking quickly. +The versions of OAP and BanyanDB are hard-coded in the script, so you need to update the versions in the script. + +Update the versions [here](https://github.com/apache/skywalking-website/blob/master/content/quickstart-docker.sh#L23-L24)
(skywalking-website) branch master updated: Update quickstart-docker.sh
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 226e55e1f47 Update quickstart-docker.sh
226e55e1f47 is described below
commit 226e55e1f47a5d9450fdcb06674cb7d7802cc14d
Author: 吴晟 Wu Sheng
AuthorDate: Sun Jun 2 21:13:20 2024 +0800
Update quickstart-docker.sh
---
content/quickstart-docker.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/content/quickstart-docker.sh b/content/quickstart-docker.sh
index 0cbc19f0d2d..a471d74d054 100644
--- a/content/quickstart-docker.sh
+++ b/content/quickstart-docker.sh
@@ -20,8 +20,8 @@ set -e
SW_STORAGE=
-SW_VERSION=${SW_VERSION:-9.7.0}
-SW_BANYANDB_VERSION=${SW_BANYANDB_VERSION:-0.5.0}
+SW_VERSION=${SW_VERSION:-10.0.1}
+SW_BANYANDB_VERSION=${SW_BANYANDB_VERSION:-0.6.1}
usage() {
echo "Usage: quickstart-docker.sh [-f]"
(skywalking-website) branch master updated: Fix the format.
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 356f3b831e6 Fix the format. 356f3b831e6 is described below commit 356f3b831e6f33cfb86647aa55f6719e1004ed4a Author: Wu Sheng AuthorDate: Fri May 31 21:54:34 2024 +0800 Fix the format. --- content/events/banyandb-on-demo-skywalking/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/events/banyandb-on-demo-skywalking/index.md b/content/events/banyandb-on-demo-skywalking/index.md index e7e8b245d44..e9095a119d8 100644 --- a/content/events/banyandb-on-demo-skywalking/index.md +++ b/content/events/banyandb-on-demo-skywalking/index.md @@ -10,7 +10,7 @@ Within 3 years (as of April 2021) of incubation, BanyanDB has progressed beyond Here is [the official statement](https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-storage/#banyandb---native-apm-database) from the Apache SkyWalking committee about this new option: -This is recommended for medium-scale deployments from version 0.6 to 1.0. BanyanDB is set to be our next-generation storage solution. It has demonstrated significant potential in performance improvement. As of version 0.6.1, it achieves 5x less memory usage, 1/5 disk IOPS, 1/4 disk throughput, and 30% less disk space, albeit with a slightly higher CPU trade-off. +**This is recommended for medium-scale deployments from version 0.6 to 1.0. BanyanDB is set to be our next-generation storage solution. It has demonstrated significant potential in performance improvement. As of version 0.6.1, it achieves 5x less memory usage, 1/5 disk IOPS, 1/4 disk throughput, and 30% less disk space, albeit with a slightly higher CPU trade-off.** Today, on May 31st, 2024, the [SkyWalking demo](https://skywalking.apache.org/#demo) hosted on our website has officially switched to BanyanDB. Both the native UI and Grafana UI of the site are now reading telemetry data from BanyanDB version 0.6.1.
(skywalking-website) branch master updated: 1. Add BanyanDB is up and running announcement 2. Remove demo.skywalking.apache.org as https forces on apache.org 3. Update docs of BanyanDB storage in OAP
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 bcf9495d16c 1. Add BanyanDB is up and running announcement 2. Remove demo.skywalking.apache.org as https forces on apache.org 3. Update docs of BanyanDB storage in OAP docs to follow the final perf testing result. bcf9495d16c is described below commit bcf9495d16c04802b2f0b168788274e64fe5f39a Author: Wu Sheng AuthorDate: Fri May 31 21:41:32 2024 +0800 1. Add BanyanDB is up and running announcement 2. Remove demo.skywalking.apache.org as https forces on apache.org 3. Update docs of BanyanDB storage in OAP docs to follow the final perf testing result. --- content/_index.html | 4 ++-- content/events/banyandb-on-demo-skywalking/index.md | 16 data/docs.yml | 6 +++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/content/_index.html b/content/_index.html index 8f33af75bb4..01f2a92d5c7 100644 --- a/content/_index.html +++ b/content/_index.html @@ -29,12 +29,12 @@ linkTitle = "Apache SkyWalking" Username: skywalking Password: skywalking - http://demo.skywalking.apache.org/"; target="_blank" rel="noopener"> + http://34.92.247.5/"; target="_blank" rel="noopener"> Go to native UI - http://demo.skywalking.apache.org:3000/"; target="_blank" rel="noopener"> + http://34.92.247.5:3000/"; target="_blank" rel="noopener"> Preview metrics on Grafana diff --git a/content/events/banyandb-on-demo-skywalking/index.md b/content/events/banyandb-on-demo-skywalking/index.md new file mode 100644 index 000..e7e8b245d44 --- /dev/null +++ b/content/events/banyandb-on-demo-skywalking/index.md @@ -0,0 +1,16 @@ +--- +title: BanyanDB is up and running on SkyWalking demo +date: 2024-05-31 +author: SkyWalking Team +description: "SkyWalking team announced, BanyanDB has replaced Elasticsearch and is up and running on SkyWalking official demo site." +endTime: 2024-06-30T00:00:00Z +--- + +Within 3 years (as of April 2021) of incubation, BanyanDB has progressed beyond the alpha stage and officially become the first-class database option for Apache SkyWalking. + +Here is [the official statement](https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-storage/#banyandb---native-apm-database) from the Apache SkyWalking committee about this new option: + +This is recommended for medium-scale deployments from version 0.6 to 1.0. BanyanDB is set to be our next-generation storage solution. It has demonstrated significant potential in performance improvement. As of version 0.6.1, it achieves 5x less memory usage, 1/5 disk IOPS, 1/4 disk throughput, and 30% less disk space, albeit with a slightly higher CPU trade-off. + +Today, on May 31st, 2024, the [SkyWalking demo](https://skywalking.apache.org/#demo) hosted on our website has officially switched to BanyanDB. Both the native UI and Grafana UI of the site are now reading telemetry data from BanyanDB version 0.6.1. + diff --git a/data/docs.yml b/data/docs.yml index 9e15af2830f..eccde3fa57c 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -39,13 +39,13 @@ link: /docs/main/next/readme/ - version: Latest link: /docs/main/latest/readme/ - commitId: 7a8bbacd20381bc780c48abf5706fd6e529c9872 + commitId: 5783812cb51561fd2788f35f6fa7fca152284a30 - version: v10.0.1 link: /docs/main/v10.0.1/readme/ - commitId: 7a8bbacd20381bc780c48abf5706fd6e529c9872 + commitId: 5783812cb51561fd2788f35f6fa7fca152284a30 - version: v10.0.0 link: /docs/main/v10.0.0/readme/ - commitId: 7a8bbacd20381bc780c48abf5706fd6e529c9872 + commitId: 5783812cb51561fd2788f35f6fa7fca152284a30 - version: v9.7.0 link: /docs/main/v9.7.0/readme/ commitId: 1ca62dcbaa60f6fc87cd2230abb438071dd5803f
(skywalking) branch wu-sheng-patch-1 deleted (was 0e08153c67)
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 0e08153c67 Update backend-storage.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Update backend-storage.md (#12285)
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 5783812cb5 Update backend-storage.md (#12285) 5783812cb5 is described below commit 5783812cb51561fd2788f35f6fa7fca152284a30 Author: 吴晟 Wu Sheng AuthorDate: Fri May 31 21:41:09 2024 +0800 Update backend-storage.md (#12285) --- docs/en/setup/backend/backend-storage.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/setup/backend/backend-storage.md b/docs/en/setup/backend/backend-storage.md index 7381639d7f..7f34121e4e 100644 --- a/docs/en/setup/backend/backend-storage.md +++ b/docs/en/setup/backend/backend-storage.md @@ -13,9 +13,9 @@ Natively supported storage: - [BanyanDB](storages/banyandb.md) This is recommended to use for medium scale deployments from 0.6 until 1.0. -BanyanDB is going to be our next generation storage solution. It has shown high potential performance -improvement. Less than 50% CPU usage and 50% memory usage with 40% disk volume compared to Elasticsearch in the same scale. -We are looking for early adoption. Please contact us through slack channels if you are interested in using BanyanDB. +It has demonstrated significant potential in performance improvement. As of version 0.6.1, it achieves 5x less memory usage, +1/5 disk IOPS, 1/4 disk throughput, and 30% less disk space, albeit with a slightly higher CPU trade-off, compared to Elasticsearch. +We are looking for early adoption. Please contact us through Slack channels if you are interested in using BanyanDB. ## SQL database - [H2](storages/h2.md)
(skywalking) 01/01: Update backend-storage.md
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 0e08153c677756f17d880bee35f655b3b09caee9 Author: 吴晟 Wu Sheng AuthorDate: Fri May 31 21:29:03 2024 +0800 Update backend-storage.md --- docs/en/setup/backend/backend-storage.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/setup/backend/backend-storage.md b/docs/en/setup/backend/backend-storage.md index 7381639d7f..7f34121e4e 100644 --- a/docs/en/setup/backend/backend-storage.md +++ b/docs/en/setup/backend/backend-storage.md @@ -13,9 +13,9 @@ Natively supported storage: - [BanyanDB](storages/banyandb.md) This is recommended to use for medium scale deployments from 0.6 until 1.0. -BanyanDB is going to be our next generation storage solution. It has shown high potential performance -improvement. Less than 50% CPU usage and 50% memory usage with 40% disk volume compared to Elasticsearch in the same scale. -We are looking for early adoption. Please contact us through slack channels if you are interested in using BanyanDB. +It has demonstrated significant potential in performance improvement. As of version 0.6.1, it achieves 5x less memory usage, +1/5 disk IOPS, 1/4 disk throughput, and 30% less disk space, albeit with a slightly higher CPU trade-off, compared to Elasticsearch. +We are looking for early adoption. Please contact us through Slack channels if you are interested in using BanyanDB. ## SQL database - [H2](storages/h2.md)
(skywalking) branch wu-sheng-patch-1 created (now 0e08153c67)
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 0e08153c67 Update backend-storage.md This branch includes the following new commits: new 0e08153c67 Update backend-storage.md The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-banyandb) branch main updated: Build Docker multi-arch without attestation manifest (#458)
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 18a138f9 Build Docker multi-arch without attestation manifest (#458) 18a138f9 is described below commit 18a138f959162282b8eb0c0f6635a6085f9207e2 Author: kezhenxu94 AuthorDate: Fri May 31 16:41:56 2024 +0800 Build Docker multi-arch without attestation manifest (#458) --- scripts/build/docker.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/docker.mk b/scripts/build/docker.mk index b575b47e..7c5d07e7 100644 --- a/scripts/build/docker.mk +++ b/scripts/build/docker.mk @@ -43,5 +43,5 @@ docker.push: DOCKER_TYPE = "Push" docker docker.push: @echo "$(DOCKER_TYPE) $(IMG)" - @time docker buildx build $(DOCKER_BUILD_ARGS) $(PLATFORMS) $(LOAD_OR_PUSH) -t $(IMG) -f Dockerfile .. + @time docker buildx build $(DOCKER_BUILD_ARGS) $(PLATFORMS) $(LOAD_OR_PUSH) -t $(IMG) -f Dockerfile --provenance=false ..
(skywalking-showcase) branch banyandb deleted (was a843464)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch banyandb in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git was a843464 Replace storage with BanyanDB Cluster The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: docs: optimized the README and the Standalone page. (#454)
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 85ffd417 docs: optimized the README and the Standalone page. (#454) 85ffd417 is described below commit 85ffd4171f028a8697911c6c3bbc0ec1a76e3141 Author: Chen Ziyan AuthorDate: Fri May 31 14:25:10 2024 +0800 docs: optimized the README and the Standalone page. (#454) --- CONTRIBUTING.md | 2 +- docs/README.md | 11 ++- docs/crud/index_rule_binding.md | 2 +- docs/installation/binaries.md | 32 +++- docs/installation/cluster.md| 2 +- docs/installation/standalone.md | 27 +-- docs/menu.yml | 2 +- 7 files changed, 66 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a5ecf29..d2a0c5df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ Users who want to build a binary from sources have to set up: * Go 1.22 * Node 20.12 * Git >= 2.30 -* Linux, macOS or Windows+WSL2 +* Linux, macOS or Windows + WSL2 * GNU make ### Windows diff --git a/docs/README.md b/docs/README.md index 8185677b..c1030c72 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,12 @@ ## Welcome to the BanyanDB -Here you can learn all you need to know about BanyanDB. +**BanyanDB**, as an observability database, aims to ingest, analyze and store Metrics, Tracing, and Logging data. It's +designed to handle observability data generated by **Apache SkyWalking**. Before BanyanDB emerges, the Databases that +SkyWalking adopted are not ideal for the APM data model, especially for saving tracing and logging data. Consequently, +There’s room to improve the performance and resource usage based on the nature of SkyWalking data patterns. + +Here you can learn all you need to know about BanyanDB. Let's get started with it. - **Installation**. Instruments about how to download and onboard BanyanDB server, Banyand. - **Clients**. Some native clients to access Banyand. @@ -10,6 +15,8 @@ Here you can learn all you need to know about BanyanDB. - **Concept**. Learn the concepts of Banyand. Includes the architecture, data model, and so on. - **CRUD Operations**. To create, read, update, and delete data points or entities on resources in the schema. +### Useful Links + You might also find these links interesting: - The latest and old releases are all available @@ -22,6 +29,8 @@ You might also find these links interesting: - You can find the conference schedules, video recordings, and articles about SkyWalking in the [community resource catalog](https://github.com/OpenSkywalking/Community). +### Contact Us + We're always looking for help to improve our documentation and codes, so please don’t hesitate to [file an issue](https://github.com/apache/skywalking/issues/new) if you see any problems. Or better yet, directly contribute by submitting a pull request to help us get better! diff --git a/docs/crud/index_rule_binding.md b/docs/crud/index_rule_binding.md index 078ad29f..0e8158d1 100644 --- a/docs/crud/index_rule_binding.md +++ b/docs/crud/index_rule_binding.md @@ -1,4 +1,4 @@ -# CRUD indexRuleBindings +# CRUD IndexRuleBindings CRUD operations create, read, update and delete index rule bindings. diff --git a/docs/installation/binaries.md b/docs/installation/binaries.md index 284316fc..c6659374 100644 --- a/docs/installation/binaries.md +++ b/docs/installation/binaries.md @@ -3,8 +3,38 @@ This page shows how to get binaries of Banyand. ## Prebuilt Released binaries + +Go to the [SkyWalking download page](https://skywalking.apache.org/downloads/#Database) . -Get binaries from the [download](https://skywalking.apache.org/downloads/). +Select and download the distribution from the suggested location for your platform, such as `skywalking-banyandb-x.x.x-bin.tgz`. + +> It is essential that you verify the integrity of the downloaded file using the PGP signature ( .asc file) or a hash ( .md5 or .sha* file). + +unpack and extract the package. + +```shell +$ tar -zxvf skywalking-banyandb-x.y.z-bin.tgz +``` + +The directory structure is as follows. + +```shell +├── CHANGES.md +├── LICENSE +├── LICENSE.tpl +├── NOTICE +├── README.md +├── bin +│ ├── banyand-server-static +│ ├── bydbctl-x.y.z-darwin-amd64 +│ ├── bydbctl-x.y.z-darwin-arm64 +│ ├── bydbctl-x.y.z-linux-386 +│ ├── bydbctl-x.y.z-linux-amd64 +│ ├── bydbctl-x.y.z-linux-arm64 +│ ├── bydbctl-x.y.z-windows-386 +│ └── bydbctl-x.y.z-windows-amd64 +└── licenses +``` ## Build From Source diff --git a/docs/installation/cluster.md b/docs/installation/cluster.md index 0db4d8b2..4fbb8055 100644 --- a/docs/installation/cluster.md +++ b/docs/installation/cl
(skywalking-showcase) branch main updated: Replace storage with BanyanDB Cluster (#171)
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 e708023 Replace storage with BanyanDB Cluster (#171)
e708023 is described below
commit e7080239837e1edc744f9c508d2be60f619d289b
Author: Gao Hongtao
AuthorDate: Fri May 31 09:44:26 2024 +0800
Replace storage with BanyanDB Cluster (#171)
---
Makefile.in| 5 +-
deploy/platform/docker/docker-compose.cluster.yaml | 14 ++---
.../docker/docker-compose.single-node.yaml | 27 -
deploy/platform/kubernetes/Chart.yaml | 10 ++--
deploy/platform/kubernetes/Makefile| 19 ++
deploy/platform/kubernetes/check.mak | 8 ++-
deploy/platform/kubernetes/values.yaml | 69 +-
7 files changed, 116 insertions(+), 36 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 17dd9ae..2cb9701 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,8 +25,9 @@ DOCKER_BUILDKIT ?= 1
HUB ?= ghcr.io/apache/skywalking-showcase
TAG ?= $(shell git rev-parse --short HEAD)
-ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss
-ES_IMAGE_TAG ?= 7.10.2
+BANYANDB_IMAGE ?= ghcr.io/apache/skywalking-banyandb
+BANYANDB_IMAGE_TAG ?= 7e65e59d1db9cbf2e464c5c62a4f87b195b23340
+STORAGE_CLASS ?= ""
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
SW_OAP_IMAGE_TAG ?= c25cedaaba031071ea1283af1c5a16f078b97d92
diff --git a/deploy/platform/docker/docker-compose.cluster.yaml
b/deploy/platform/docker/docker-compose.cluster.yaml
index 521e3ea..4791ae8 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -18,10 +18,10 @@
version: '2.1'
services:
- elasticsearch:
+ banyandb:
extends:
file: docker-compose.single-node.yaml
- service: elasticsearch
+ service: banyandb
zookeeper:
image: zookeeper:3.5
@@ -38,11 +38,11 @@ services:
image: ${SW_OAP_IMAGE}:${SW_OAP_IMAGE_TAG}
networks: [ sw ]
environment:
- SW_STORAGE: elasticsearch
- SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
+ SW_STORAGE: banyandb
+ SW_STORAGE_BANYANDB_TARGETS: banyandb:17912
JAVA_OPTS: "-Dmode=init" # @feature: cluster; set the init container to
"init" mode to initialize the storage templates and indices
depends_on:
- elasticsearch:
+ banyandb:
condition: service_healthy
oap1: &oap
@@ -54,8 +54,8 @@ services:
SW_HEALTH_CHECKER: default # @feature: health-check;
SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that
receives the VM metrics
SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES:
vm,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,rocketmq/*,pulsar/*,activemq/*
# @feature: vm; enable the OC rules that analyse the VM metrics
- SW_STORAGE: elasticsearch
- SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
+ SW_STORAGE: banyandb
+ SW_STORAGE_BANYANDB_TARGETS: banyandb:17912
SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self
o11y through prometheus
SW_PROMETHEUS_FETCHER: default # @feature: so11y; fetch the metrics of
self o11y through prometheus
JAVA_OPTS: "-Dmode=no-init -Xms2048m -Xmx2048m" # @feature: cluster;
start the cluster nodes in no-init mode
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml
b/deploy/platform/docker/docker-compose.single-node.yaml
index e6db0d0..7ab09a7 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -18,24 +18,17 @@
version: '2.1'
services:
- elasticsearch:
-image: ${ES_IMAGE}:${ES_IMAGE_TAG}
+ banyandb:
+image: ${BANYANDB_IMAGE}:${BANYANDB_IMAGE_TAG}
networks: [ sw ]
-ports:
- - "9200:9200"
+expose:
+ - 17912
+command: standalone
healthcheck:
- test: [ "CMD-SHELL", "curl --silent --fail
localhost:9200/_cluster/health" ]
+ test: ["CMD", "./bydbctl", "health", "--config=-",
"--addr=http://banyandb:17913";]
interval: 30s
timeout: 10s
retries: 3
-environment:
- - discovery.type=single-node
- - bootstrap.memory_lock=true
- - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-ulimits:
- memlock:
-soft: -1
-hard: -1
oap:
image: ${SW_OAP_IMAGE}:${SW_OAP_IMAGE_TAG}
@@ -44,19 +37,19 @@ services:
SW_HEALTH_CHECKER: default # @feature: health-check;
SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that
receives the VM metrics
SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES:
vm,my
(skywalking-website) branch master updated: Fix format.
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 56eda8c3065 Fix format. 56eda8c3065 is described below commit 56eda8c30651762787c9a8626d3f8cccd8b99e29 Author: 吴晟 Wu Sheng AuthorDate: Thu May 30 15:17:25 2024 +0800 Fix format. --- data/releases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/releases.yml b/data/releases.yml index 075ce9f08e2..f1b8ae262a0 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -5,7 +5,7 @@ icon: skywalking description: SkyWalking is an Observability Analysis Platform and Application Performance Management system. source: - - version: v10.0.1 +- version: v10.0.1 date: May 30th, 2024 downloadLink: - name: src
(skywalking) branch master updated: Fix MQE and Alarm doc nits (#12275)
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 7a8bbacd20 Fix MQE and Alarm doc nits (#12275)
7a8bbacd20 is described below
commit 7a8bbacd20381bc780c48abf5706fd6e529c9872
Author: Wan Kai
AuthorDate: Thu May 30 15:11:26 2024 +0800
Fix MQE and Alarm doc nits (#12275)
---
docs/en/api/metrics-query-expression.md | 2 +-
docs/en/setup/backend/backend-alarm.md | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/en/api/metrics-query-expression.md
b/docs/en/api/metrics-query-expression.md
index b43c615d0f..c7031ceff1 100644
--- a/docs/en/api/metrics-query-expression.md
+++ b/docs/en/api/metrics-query-expression.md
@@ -247,7 +247,7 @@ top_n(service_instance_cpm, 10, des)
According to the type of the metric, the `ExpressionResultType` of the
expression will be `SORTED_LIST` or `RECORD_LIST`.
## Relabel Operation
-Relabel Operation takes an expression and replaces the label values with new
label values on its results.
+Relabel Operation takes an expression and replaces the label with new label on
its results.
Since v10.0.0, SkyWalking supports relabel multiple labels.
Expression:
diff --git a/docs/en/setup/backend/backend-alarm.md
b/docs/en/setup/backend/backend-alarm.md
index a80aa697f8..256763be95 100644
--- a/docs/en/setup/backend/backend-alarm.md
+++ b/docs/en/setup/backend/backend-alarm.md
@@ -87,16 +87,15 @@ rules:
silence-period: 5
message: Percentile response time of service {name} alarm in 3 minutes of
last 10 minutes, due to more than one condition of p50 > 1000, p75 > 1000, p90
> 1000, p95 > 1000, p99 > 1000
meter_service_status_code_rule:
-expression: sum(aggregate_labels(meter_status_code{_='4xx,5xx'},sum) > 10)
> 3
+expression: sum(aggregate_labels(meter_status_code{status='4xx,5xx'},sum)
> 10) > 3
period: 10
-count: 3
silence-period: 5
message: The request number of entity {name} 4xx and 5xx status is more
than expected.
hooks:
- "slack.custom1"
- "pagerduty.custom1"
comp_rule:
-expression: (avg(service_sla / 100) > 80) *
(avg(service_percentile{_='0'}) > 1000) == 1
+expression: (avg(service_sla / 100) > 80) *
(avg(service_percentile{p='0'}) > 1000) == 1
period: 10
message: Service {name} avg successful rate is less than 80% and P50 of
avg response time is over 1000ms in last 10 minutes.
tags:
(skywalking-website) branch release-10.0.1 deleted (was c18c9341627)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch release-10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was c18c9341627 Release 10.0.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-website) branch master updated: Release 10.0.1 (#714)
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 18a160ef41c Release 10.0.1 (#714) 18a160ef41c is described below commit 18a160ef41ced43645159a25d3b46a72d9916f05 Author: 吴晟 Wu Sheng AuthorDate: Thu May 30 15:03:31 2024 +0800 Release 10.0.1 (#714) --- .../release-apache-skywalking-apm-10.0.1/index.md | 31 +++ data/docs.yml | 5 ++- data/releases.yml | 36 -- 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/content/events/release-apache-skywalking-apm-10.0.1/index.md b/content/events/release-apache-skywalking-apm-10.0.1/index.md new file mode 100644 index 000..9ec57ea1f20 --- /dev/null +++ b/content/events/release-apache-skywalking-apm-10.0.1/index.md @@ -0,0 +1,31 @@ +--- +title: Release Apache SkyWalking APM 10.0.1 +date: 2024-05-30 +author: SkyWalking Team +description: "Release Apache SkyWalking 10.0.1 - A patch release for BanyanDB 0.6.1" +endTime: 2024-05-30T00:00:00Z +--- + +SkyWalking 10.0.1 is released. Go to [downloads](/downloads) page to find release tars. +This release targets to collebarate with BanyanDB 0.6.1. + + + Project + +* Add SBOM (Software Bill of Materials) to the project. + + OAP Server + +* Fix LAL test query api. +* Add component libraries of `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc driver. +* Fix setting the wrong interval to day level measure schema in BanyanDB installation process. + + UI + +* Fix widget title and tips. +* Fix statistics span data. +* Fix browser log display. +* Fix the topology layout for there are multiple independent network relationships. + + +All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/218?closed=1) diff --git a/data/docs.yml b/data/docs.yml index ba02e5548cb..ab9e7511fc1 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -39,7 +39,10 @@ link: /docs/main/next/readme/ - version: Latest link: /docs/main/latest/readme/ - commitId: c92a6a3a4c1b1346596ce83e5a6bfc9374bcab92 + commitId: 6a9d727739feb79435f9d7c538267dffdb8ce8d7 +- version: v10.0.1 + link: /docs/main/v10.0.1/readme/ + commitId: 6a9d727739feb79435f9d7c538267dffdb8ce8d7 - version: v10.0.0 link: /docs/main/v10.0.0/readme/ commitId: c92a6a3a4c1b1346596ce83e5a6bfc9374bcab92 diff --git a/data/releases.yml b/data/releases.yml index d43a76d7f1d..075ce9f08e2 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -5,15 +5,24 @@ icon: skywalking description: SkyWalking is an Observability Analysis Platform and Application Performance Management system. source: + - version: v10.0.1 + date: May 30th, 2024 + downloadLink: +- name: src + link: https://www.apache.org/dyn/closer.cgi/skywalking/10.0.1/apache-skywalking-apm-10.0.1-src.tgz +- name: asc + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1-src.tgz.asc +- name: sha512 + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1-src.tgz.sha512 - version: v10.0.0 date: May 13th, 2024 downloadLink: - name: src - link: https://www.apache.org/dyn/closer.cgi/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz + link: https://archive.apache.org/dist/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz - name: asc - link: https://downloads.apache.org/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.asc + link: https://archive.apache.org/dist/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.asc - name: sha512 - link: https://downloads.apache.org/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.sha512 + link: https://archive.apache.org/dist/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.sha512 - version: v9.7.0 date: Nov. 28th, 2023 downloadLink: @@ -51,24 +60,33 @@ - name: sha512 link: https://archive.apache.org/dist/skywalking/9.4.0/apache-skywalking-apm-9.4.0-src.tgz.sha512 distribution: +- version: v10.0.1 + date: May 30th, 2024 + downloadLink: +- name: tar + link: https://www.apache.org/dyn/closer.cgi/skywalking/10.0.1/apache-skywalking-apm-10.0.1.tar.gz +- name: asc + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1.tar.gz.asc +- name: sha512 + li
(skywalking-website) branch release-10.0.1 created (now c18c9341627)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch release-10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at c18c9341627 Release 10.0.1 This branch includes the following new commits: new c18c9341627 Release 10.0.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-website) 01/01: Release 10.0.1
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch release-10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit c18c93416276fbbd517cb8589d6b38c745640096 Author: Wu Sheng AuthorDate: Thu May 30 15:02:35 2024 +0800 Release 10.0.1 --- .../release-apache-skywalking-apm-10.0.1/index.md | 31 +++ data/docs.yml | 5 ++- data/releases.yml | 36 -- 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/content/events/release-apache-skywalking-apm-10.0.1/index.md b/content/events/release-apache-skywalking-apm-10.0.1/index.md new file mode 100644 index 000..9ec57ea1f20 --- /dev/null +++ b/content/events/release-apache-skywalking-apm-10.0.1/index.md @@ -0,0 +1,31 @@ +--- +title: Release Apache SkyWalking APM 10.0.1 +date: 2024-05-30 +author: SkyWalking Team +description: "Release Apache SkyWalking 10.0.1 - A patch release for BanyanDB 0.6.1" +endTime: 2024-05-30T00:00:00Z +--- + +SkyWalking 10.0.1 is released. Go to [downloads](/downloads) page to find release tars. +This release targets to collebarate with BanyanDB 0.6.1. + + + Project + +* Add SBOM (Software Bill of Materials) to the project. + + OAP Server + +* Fix LAL test query api. +* Add component libraries of `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc driver. +* Fix setting the wrong interval to day level measure schema in BanyanDB installation process. + + UI + +* Fix widget title and tips. +* Fix statistics span data. +* Fix browser log display. +* Fix the topology layout for there are multiple independent network relationships. + + +All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/218?closed=1) diff --git a/data/docs.yml b/data/docs.yml index ba02e5548cb..ab9e7511fc1 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -39,7 +39,10 @@ link: /docs/main/next/readme/ - version: Latest link: /docs/main/latest/readme/ - commitId: c92a6a3a4c1b1346596ce83e5a6bfc9374bcab92 + commitId: 6a9d727739feb79435f9d7c538267dffdb8ce8d7 +- version: v10.0.1 + link: /docs/main/v10.0.1/readme/ + commitId: 6a9d727739feb79435f9d7c538267dffdb8ce8d7 - version: v10.0.0 link: /docs/main/v10.0.0/readme/ commitId: c92a6a3a4c1b1346596ce83e5a6bfc9374bcab92 diff --git a/data/releases.yml b/data/releases.yml index d43a76d7f1d..075ce9f08e2 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -5,15 +5,24 @@ icon: skywalking description: SkyWalking is an Observability Analysis Platform and Application Performance Management system. source: + - version: v10.0.1 + date: May 30th, 2024 + downloadLink: +- name: src + link: https://www.apache.org/dyn/closer.cgi/skywalking/10.0.1/apache-skywalking-apm-10.0.1-src.tgz +- name: asc + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1-src.tgz.asc +- name: sha512 + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1-src.tgz.sha512 - version: v10.0.0 date: May 13th, 2024 downloadLink: - name: src - link: https://www.apache.org/dyn/closer.cgi/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz + link: https://archive.apache.org/dist/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz - name: asc - link: https://downloads.apache.org/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.asc + link: https://archive.apache.org/dist/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.asc - name: sha512 - link: https://downloads.apache.org/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.sha512 + link: https://archive.apache.org/dist/skywalking/10.0.0/apache-skywalking-apm-10.0.0-src.tgz.sha512 - version: v9.7.0 date: Nov. 28th, 2023 downloadLink: @@ -51,24 +60,33 @@ - name: sha512 link: https://archive.apache.org/dist/skywalking/9.4.0/apache-skywalking-apm-9.4.0-src.tgz.sha512 distribution: +- version: v10.0.1 + date: May 30th, 2024 + downloadLink: +- name: tar + link: https://www.apache.org/dyn/closer.cgi/skywalking/10.0.1/apache-skywalking-apm-10.0.1.tar.gz +- name: asc + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1.tar.gz.asc +- name: sha512 + link: https://downloads.apache.org/skywalking/10.0.1/apache-skywalking-apm-10.0.1.tar.gz.sha512 - version: v10.0.0 date: May 13th, 2024 do
(skywalking) branch sync-protocol deleted (was 316d08bcec)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync-protocol in repository https://gitbox.apache.org/repos/asf/skywalking.git was 316d08bcec Sync query protocol submodule 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-query-protocol) tag v10.0.1 created (now e0be806)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git at e0be806 (commit) No new revisions were added by this update.
(skywalking) branch 10.0.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/10.0.x by this push: new 8a2e61600f [maven-release-plugin] prepare for next development iteration 8a2e61600f is described below commit 8a2e61600f8d0c5f6974a071b35dd00bc556e3f7 Author: Wu Sheng <“wu.sh...@foxmail.com”> AuthorDate: Thu May 30 02:25:06 2024 + [maven-release-plugin] prepare for next development iteration --- apm-dist/pom.xml| 2 +- apm-protocol/apm-network/pom.xml| 2 +- apm-protocol/pom.xml| 2 +- apm-webapp/pom.xml | 2 +- oap-server-bom/pom.xml | 2 +- oap-server/ai-pipeline/pom.xml | 2 +- oap-server/analyzer/agent-analyzer/pom.xml | 2 +- oap-server/analyzer/event-analyzer/pom.xml | 2 +- oap-server/analyzer/log-analyzer/pom.xml| 2 +- oap-server/analyzer/meter-analyzer/pom.xml | 2 +- oap-server/analyzer/pom.xml | 2 +- oap-server/exporter/pom.xml | 2 +- oap-server/mqe-grammar/pom.xml | 2 +- oap-server/mqe-rt/pom.xml | 2 +- oap-server/oal-grammar/pom.xml | 2 +- oap-server/oal-rt/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml| 2 +- oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml| 2 +- oap-server/server-configuration/configuration-api/pom.xml | 2 +- oap-server/server-configuration/configuration-apollo/pom.xml| 2 +- oap-server/server-configuration/configuration-consul/pom.xml| 2 +- oap-server/server-configuration/configuration-etcd/pom.xml | 2 +- oap-server/server-configuration/configuration-k8s-configmap/pom.xml | 2 +- oap-server/server-configuration/configuration-nacos/pom.xml | 2 +- oap-server/server-configuration/configuration-zookeeper/pom.xml | 2 +- oap-server/server-configuration/grpc-configuration-sync/pom.xml | 2 +- oap-server/server-configuration/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- oap-server/server-fetcher-plugin/kafka-fetcher-plugin/pom.xml | 2 +- oap-server/server-fetcher-plugin/pom.xml| 2 +- oap-server/server-health-checker/pom.xml| 2 +- oap-server/server-library/library-client/pom.xml| 2 +- oap-server/server-library/library-datacarrier-queue/pom.xml | 2 +- oap-server/server-library/library-elasticsearch-client/pom.xml | 2 +- oap-server/server-library/library-kubernetes-support/pom.xml| 2 +- oap-server/server-library/library-module/pom.xml| 2 +- oap-server/server-library/library-server/pom.xml| 2 +- oap-server/server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/debugging-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/logql-plugin/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/promql-plugin/pom.xml| 2 +- oap-server/server-query-plugin/query-graphql-plugin/pom.xml | 2 +- oap-server/server-query-plugin/zipkin-query-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/aws-firehose-receiver/pom.xml | 2 +- .../configuration-discovery-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml| 2 +- oap-server/server-receiver-plugin/otel-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/receiver-proto/pom.xml| 2 +- .../skywalking-b
(skywalking) annotated tag v10.0.1 updated (6a9d727739 -> 0c69480908)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to annotated tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking.git *** WARNING: tag v10.0.1 was modified! *** from 6a9d727739 (commit) to 0c69480908 (tag) tagging 6a9d727739feb79435f9d7c538267dffdb8ce8d7 (commit) by Wu Sheng on Thu May 30 02:25:03 2024 + - Log - [maven-release-plugin] copy for tag v10.0.1 --- No new revisions were added by this update. Summary of changes:
(skywalking) branch 10.0.x created (now 6a9d727739)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git at 6a9d727739 [maven-release-plugin] prepare release v10.0.1 No new revisions were added by this update.
(skywalking) branch master updated: Sync query protocol submodule (#12269)
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 46eaa67da1 Sync query protocol submodule (#12269) 46eaa67da1 is described below commit 46eaa67da12df66a1b231fd9751be885d02ae9e2 Author: 吴晟 Wu Sheng AuthorDate: Thu May 30 10:12:30 2024 +0800 Sync query protocol submodule (#12269) --- .../query-graphql-plugin/src/main/resources/query-protocol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol index f74557b29d..e0be806ea4 16 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol @@ -1 +1 @@ -Subproject commit f74557b29dc7bef2830786c4fe3e39e4a0919c98 +Subproject commit e0be806ea4f5e5e324e4ba57c2ca414931d9e512
(skywalking) 01/01: Sync query protocol submodule
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch sync-protocol in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 316d08bcecb6bb46f3042b4c5c767ef856d429cd Author: Wu Sheng AuthorDate: Thu May 30 10:10:09 2024 +0800 Sync query protocol submodule --- .../query-graphql-plugin/src/main/resources/query-protocol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol index f74557b29d..e0be806ea4 16 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol @@ -1 +1 @@ -Subproject commit f74557b29dc7bef2830786c4fe3e39e4a0919c98 +Subproject commit e0be806ea4f5e5e324e4ba57c2ca414931d9e512
(skywalking) branch sync-protocol created (now 316d08bcec)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync-protocol in repository https://gitbox.apache.org/repos/asf/skywalking.git at 316d08bcec Sync query protocol submodule This branch includes the following new commits: new 316d08bcec Sync query protocol submodule 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 10.0.x deleted (was 7300545616)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git was 7300545616 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 7300545616 [maven-release-plugin] prepare for next development iteration discard 5eef9bff54 [maven-release-plugin] prepare release v10.0.1
(skywalking) annotated tag v10.0.1 deleted (was ac14c69bdd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to annotated tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking.git *** WARNING: tag v10.0.1 was deleted! *** tag was ac14c69bdd The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-query-protocol) branch master updated: Update README.md
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-query-protocol.git The following commit(s) were added to refs/heads/master by this push: new e0be806 Update README.md e0be806 is described below commit e0be806ea4f5e5e324e4ba57c2ca414931d9e512 Author: 吴晟 Wu Sheng AuthorDate: Thu May 30 10:08:50 2024 +0800 Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4f63eb4..36ace7a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Apache SkyWalking Query Protocol -Query Protocol defines the communication protocol in query stage. +Query Protocol defines the communication protocol in the query stage. SkyWalking native UI and CLI use this protocol to fetch data from the backend consistently, don't need to worry about the backend update. -Read [Query Protocol DOC](https://github.com/apache/skywalking/blob/master/docs/en/protocols/query-protocol.md) for more details +Read [Query Protocol API docs](https://skywalking.apache.org/docs/main/latest/en/api/query-protocol/) for more details ## Release -This repo wouldn't release separately. All source codes have been included in the main repo release. The tags match the [main repo](https://github.com/apache/skywalking) tags. +This repo wouldn't be released separately. All source codes have been included in the main repo release. The tags match the [main repo](https://github.com/apache/skywalking) tags. # License Apache 2.0
(skywalking-data-collect-protocol) tag v10.0.1 created (now f2f3005)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking-data-collect-protocol.git at f2f3005 (commit) No new revisions were added by this update.
(skywalking-booster-ui) tag v10.0.1 created (now 065337c3)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git at 065337c3 (commit) No new revisions were added by this update.
(skywalking-banyandb) branch main updated: Fix test case (#457)
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 7e65e59d Fix test case (#457)
7e65e59d is described below
commit 7e65e59d1db9cbf2e464c5c62a4f87b195b23340
Author: Gao Hongtao
AuthorDate: Thu May 30 09:52:50 2024 +0800
Fix test case (#457)
---
bydbctl/internal/cmd/group_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bydbctl/internal/cmd/group_test.go
b/bydbctl/internal/cmd/group_test.go
index b70aa2ba..48c55b0c 100644
--- a/bydbctl/internal/cmd/group_test.go
+++ b/bydbctl/internal/cmd/group_test.go
@@ -132,7 +132,7 @@ resource_opts:
})
resp := new(databasev1.GroupRegistryServiceListResponse)
helpers.UnmarshalYAML([]byte(out), resp)
- Expect(resp.Group).To(HaveLen(3)) // group1, group2,
self-observability [internal group]
+ Expect(resp.Group).To(HaveLen(2)) // group1, group2 [internal
group]
})
AfterEach(func() {
(skywalking-banyandb) branch remove-ob deleted (was 7ba82837)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch remove-ob in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was 7ba82837 Fix test case 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 10.0.x created (now 5eef9bff54)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git at 5eef9bff54 [maven-release-plugin] prepare release v10.0.1 No new revisions were added by this update.
(skywalking) branch 10.0.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/10.0.x by this push: new 7300545616 [maven-release-plugin] prepare for next development iteration 7300545616 is described below commit 730054561688236367fbe7bac276b4a8ea869632 Author: Wu Sheng <“wu.sh...@foxmail.com”> AuthorDate: Thu May 30 01:28:07 2024 + [maven-release-plugin] prepare for next development iteration --- apm-dist/pom.xml| 2 +- apm-protocol/apm-network/pom.xml| 2 +- apm-protocol/pom.xml| 2 +- apm-webapp/pom.xml | 2 +- oap-server-bom/pom.xml | 2 +- oap-server/ai-pipeline/pom.xml | 2 +- oap-server/analyzer/agent-analyzer/pom.xml | 2 +- oap-server/analyzer/event-analyzer/pom.xml | 2 +- oap-server/analyzer/log-analyzer/pom.xml| 2 +- oap-server/analyzer/meter-analyzer/pom.xml | 2 +- oap-server/analyzer/pom.xml | 2 +- oap-server/exporter/pom.xml | 2 +- oap-server/mqe-grammar/pom.xml | 2 +- oap-server/mqe-rt/pom.xml | 2 +- oap-server/oal-grammar/pom.xml | 2 +- oap-server/oal-rt/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml| 2 +- oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml| 2 +- oap-server/server-configuration/configuration-api/pom.xml | 2 +- oap-server/server-configuration/configuration-apollo/pom.xml| 2 +- oap-server/server-configuration/configuration-consul/pom.xml| 2 +- oap-server/server-configuration/configuration-etcd/pom.xml | 2 +- oap-server/server-configuration/configuration-k8s-configmap/pom.xml | 2 +- oap-server/server-configuration/configuration-nacos/pom.xml | 2 +- oap-server/server-configuration/configuration-zookeeper/pom.xml | 2 +- oap-server/server-configuration/grpc-configuration-sync/pom.xml | 2 +- oap-server/server-configuration/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- oap-server/server-fetcher-plugin/kafka-fetcher-plugin/pom.xml | 2 +- oap-server/server-fetcher-plugin/pom.xml| 2 +- oap-server/server-health-checker/pom.xml| 2 +- oap-server/server-library/library-client/pom.xml| 2 +- oap-server/server-library/library-datacarrier-queue/pom.xml | 2 +- oap-server/server-library/library-elasticsearch-client/pom.xml | 2 +- oap-server/server-library/library-kubernetes-support/pom.xml| 2 +- oap-server/server-library/library-module/pom.xml| 2 +- oap-server/server-library/library-server/pom.xml| 2 +- oap-server/server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/debugging-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/logql-plugin/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/promql-plugin/pom.xml| 2 +- oap-server/server-query-plugin/query-graphql-plugin/pom.xml | 2 +- oap-server/server-query-plugin/zipkin-query-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/aws-firehose-receiver/pom.xml | 2 +- .../configuration-discovery-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml| 2 +- oap-server/server-receiver-plugin/otel-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/receiver-proto/pom.xml| 2 +- .../skywalking-b
(skywalking) annotated tag v10.0.1 updated (5eef9bff54 -> ac14c69bdd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to annotated tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking.git *** WARNING: tag v10.0.1 was modified! *** from 5eef9bff54 (commit) to ac14c69bdd (tag) tagging 5eef9bff54ce2f0167c9d35dcedd5401e4b44d12 (commit) by Wu Sheng on Thu May 30 01:28:05 2024 + - Log - [maven-release-plugin] copy for tag v10.0.1 --- No new revisions were added by this update. Summary of changes:
(skywalking) branch sync-ui deleted (was 93793e5c07)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync-ui in repository https://gitbox.apache.org/repos/asf/skywalking.git was 93793e5c07 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. (#12267)
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 e3a6c55f8a Sync UI. (#12267) e3a6c55f8a is described below commit e3a6c55f8ab72fcb80dc7b69688488ce601973ef Author: 吴晟 Wu Sheng AuthorDate: Thu May 30 09:01:49 2024 +0800 Sync UI. (#12267) --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 88dbee311c..065337c344 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 88dbee311c961831b74ed5ca4c5604479e33c4e1 +Subproject commit 065337c3446c4cccf9515da468feede939afd460
(skywalking) 01/01: Sync UI.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch sync-ui in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 93793e5c077232f3466d70c7acdf5266cc13d553 Author: Wu Sheng AuthorDate: Thu May 30 08:58:32 2024 +0800 Sync UI. --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 88dbee311c..065337c344 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 88dbee311c961831b74ed5ca4c5604479e33c4e1 +Subproject commit 065337c3446c4cccf9515da468feede939afd460
(skywalking) branch sync-ui created (now 93793e5c07)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync-ui in repository https://gitbox.apache.org/repos/asf/skywalking.git at 93793e5c07 Sync UI. This branch includes the following new commits: new 93793e5c07 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) annotated tag v10.0.1 deleted (was 25158af9e8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to annotated tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking.git *** WARNING: tag v10.0.1 was deleted! *** tag was 25158af9e8 This change permanently discards the following revisions: discard da856a72ba [maven-release-plugin] prepare release v10.0.1
(skywalking) branch 10.0.x deleted (was 75b7ca7b81)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git was 75b7ca7b81 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 75b7ca7b81 [maven-release-plugin] prepare for next development iteration
(skywalking) branch 10.0.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/10.0.x by this push: new 75b7ca7b81 [maven-release-plugin] prepare for next development iteration 75b7ca7b81 is described below commit 75b7ca7b8101d3e9a01f91d82b1765b86b79885c Author: Wu Sheng <“wu.sh...@foxmail.com”> AuthorDate: Thu May 30 00:50:37 2024 + [maven-release-plugin] prepare for next development iteration --- apm-dist/pom.xml| 2 +- apm-protocol/apm-network/pom.xml| 2 +- apm-protocol/pom.xml| 2 +- apm-webapp/pom.xml | 2 +- oap-server-bom/pom.xml | 2 +- oap-server/ai-pipeline/pom.xml | 2 +- oap-server/analyzer/agent-analyzer/pom.xml | 2 +- oap-server/analyzer/event-analyzer/pom.xml | 2 +- oap-server/analyzer/log-analyzer/pom.xml| 2 +- oap-server/analyzer/meter-analyzer/pom.xml | 2 +- oap-server/analyzer/pom.xml | 2 +- oap-server/exporter/pom.xml | 2 +- oap-server/mqe-grammar/pom.xml | 2 +- oap-server/mqe-rt/pom.xml | 2 +- oap-server/oal-grammar/pom.xml | 2 +- oap-server/oal-rt/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml| 2 +- oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml| 2 +- oap-server/server-configuration/configuration-api/pom.xml | 2 +- oap-server/server-configuration/configuration-apollo/pom.xml| 2 +- oap-server/server-configuration/configuration-consul/pom.xml| 2 +- oap-server/server-configuration/configuration-etcd/pom.xml | 2 +- oap-server/server-configuration/configuration-k8s-configmap/pom.xml | 2 +- oap-server/server-configuration/configuration-nacos/pom.xml | 2 +- oap-server/server-configuration/configuration-zookeeper/pom.xml | 2 +- oap-server/server-configuration/grpc-configuration-sync/pom.xml | 2 +- oap-server/server-configuration/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- oap-server/server-fetcher-plugin/kafka-fetcher-plugin/pom.xml | 2 +- oap-server/server-fetcher-plugin/pom.xml| 2 +- oap-server/server-health-checker/pom.xml| 2 +- oap-server/server-library/library-client/pom.xml| 2 +- oap-server/server-library/library-datacarrier-queue/pom.xml | 2 +- oap-server/server-library/library-elasticsearch-client/pom.xml | 2 +- oap-server/server-library/library-kubernetes-support/pom.xml| 2 +- oap-server/server-library/library-module/pom.xml| 2 +- oap-server/server-library/library-server/pom.xml| 2 +- oap-server/server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/debugging-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/logql-plugin/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- oap-server/server-query-plugin/promql-plugin/pom.xml| 2 +- oap-server/server-query-plugin/query-graphql-plugin/pom.xml | 2 +- oap-server/server-query-plugin/zipkin-query-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/aws-firehose-receiver/pom.xml | 2 +- .../configuration-discovery-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml| 2 +- oap-server/server-receiver-plugin/otel-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- oap-server/server-receiver-plugin/receiver-proto/pom.xml| 2 +- .../skywalking-b
(skywalking) annotated tag v10.0.1 updated (da856a72ba -> 25158af9e8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to annotated tag v10.0.1 in repository https://gitbox.apache.org/repos/asf/skywalking.git *** WARNING: tag v10.0.1 was modified! *** from da856a72ba (commit) to 25158af9e8 (tag) tagging da856a72ba75c92c04069295e23301ae0fea239e (commit) by Wu Sheng on Thu May 30 00:50:35 2024 + - Log - [maven-release-plugin] copy for tag v10.0.1 --- No new revisions were added by this update. Summary of changes:
(skywalking) branch 10.0.x created (now da856a72ba)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/skywalking.git at da856a72ba [maven-release-plugin] prepare release v10.0.1 No new revisions were added by this update.
(skywalking) 01/01: Prepare for 10.0.1 release.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch release-10-patch
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ac56bf96dca73e9ddcc385c6bedb834443377756
Author: Wu Sheng
AuthorDate: Wed May 29 23:58:45 2024 +0800
Prepare for 10.0.1 release.
---
docs/en/changes/{changes.md => changes-10.0.1.md} | 13 ++---
docs/en/changes/changes.md| 6 --
docs/menu.yml | 2 ++
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes-10.0.1.md
similarity index 63%
copy from docs/en/changes/changes.md
copy to docs/en/changes/changes-10.0.1.md
index 598983cee9..5e44dbff4c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes-10.0.1.md
@@ -1,4 +1,4 @@
-## 10.1.0
+## 10.0.1
Project
@@ -12,11 +12,10 @@
UI
-* Fix widget title and tips
-* Fix statistics span data
+* Fix widget title and tips.
+* Fix statistics span data.
+* Fix browser log display.
+* Fix the topology layout for there are multiple independent network
relationships.
- Documentation
-
-
-All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/205?closed=1)
+All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/218?closed=1)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 598983cee9..eaf520c883 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -2,18 +2,12 @@
Project
-* Add SBOM (Software Bill of Materials) to the project.
OAP Server
-* Fix LAL test query api.
-* Add component libraries of `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc
driver.
-* Fix setting the wrong interval to day level measure schema in BanyanDB
installation process.
UI
-* Fix widget title and tips
-* Fix statistics span data
Documentation
diff --git a/docs/menu.yml b/docs/menu.yml
index 266165f597..8c750719f5 100644
--- a/docs/menu.yml
+++ b/docs/menu.yml
@@ -392,6 +392,8 @@ catalog:
path: "/en/changes/changes"
- name: "10.x Releases"
catalog:
+- name: "10.0.1"
+ path: "/en/changes/changes-10.0.1"
- name: "10.0.0"
path: "/en/changes/changes-10.0.0"
- name: "9.x Releases"
(skywalking) branch release-10-patch created (now ac56bf96dc)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch release-10-patch in repository https://gitbox.apache.org/repos/asf/skywalking.git at ac56bf96dc Prepare for 10.0.1 release. This branch includes the following new commits: new ac56bf96dc Prepare for 10.0.1 release. 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 banyandb-debug deleted (was ccbcee9666)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch banyandb-debug in repository https://gitbox.apache.org/repos/asf/skywalking.git was ccbcee9666 Fix code style 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 Wrong Interval in BanyanDB Installation Process (#12264)
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 b21e576a30 Fix Wrong Interval in BanyanDB Installation Process (#12264)
b21e576a30 is described below
commit b21e576a301df9d6967279c9f307b60aa47f73d4
Author: Gao Hongtao
AuthorDate: Wed May 29 23:52:13 2024 +0800
Fix Wrong Interval in BanyanDB Installation Process (#12264)
---
docs/en/changes/changes.md | 1 +
.../oap/server/storage/plugin/banyandb/MetadataRegistry.java | 2 +-
.../storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java | 5 +++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 8a5b3e1366..598983cee9 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -8,6 +8,7 @@
* Fix LAL test query api.
* Add component libraries of `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc
driver.
+* Fix setting the wrong interval to day level measure schema in BanyanDB
installation process.
UI
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
index 2525fc6c3c..bc3dc3de83 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
@@ -278,7 +278,7 @@ public enum MetadataRegistry {
case Minute:
return Duration.ofMinutes(1);
case Day:
-return Duration.ofDays(1);
+return Duration.ofHours(24);
default:
throw new UnsupportedOperationException("unsupported
downSampling interval");
}
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
index 5d98f933f1..d64f674038 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
@@ -227,8 +227,9 @@ public class BanyanDBMetricsQueryDAO extends
AbstractBanyanDBDAO implements IMet
});
for (final DataPoint dp : resp.getDataPoints()) {
long timeBucket = TimeBucket.getTimeBucket(dp.getTimestamp(),
schema.getMetadata().getDownSampling());
-if (map.putIfAbsent(timeBucket, dp) != null) {
-log.warn("duplicated data point at " + timeBucket);
+DataPoint preDp = map.putIfAbsent(timeBucket, dp);
+if (preDp != null) {
+log.warn("{}:{} returns duplicated data point at {}, pre:{},
current:{}", entityID, schema.getMetadata(), timeBucket, preDp.getFields(),
dp.getFields());
}
}
(skywalking-banyandb-java-client) branch duration deleted (was 22a46c2)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch duration in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-java-client.git was 22a46c2 Fix wrong result of the Duration.ofDay 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-java-client) branch main updated: Fix wrong result of the Duration.ofDay (#58)
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-java-client.git
The following commit(s) were added to refs/heads/main by this push:
new 595b4a8 Fix wrong result of the Duration.ofDay (#58)
595b4a8 is described below
commit 595b4a84d80beec8f525930b441b112c39fbcfd7
Author: Gao Hongtao
AuthorDate: Wed May 29 23:34:03 2024 +0800
Fix wrong result of the Duration.ofDay (#58)
---
CHANGES.md | 1 +
.../org/apache/skywalking/banyandb/v1/client/metadata/Duration.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b6deafb..cb63790 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
* Fix MeasureQuery.SumBy to use SUM instead of COUNT
* Add missing FloatFieldValue type in the Measure write operation
+* Fix wrong result of the Duration.ofDay
0.6.0
--
diff --git
a/src/main/java/org/apache/skywalking/banyandb/v1/client/metadata/Duration.java
b/src/main/java/org/apache/skywalking/banyandb/v1/client/metadata/Duration.java
index ad5530e..6f91742 100644
---
a/src/main/java/org/apache/skywalking/banyandb/v1/client/metadata/Duration.java
+++
b/src/main/java/org/apache/skywalking/banyandb/v1/client/metadata/Duration.java
@@ -29,7 +29,8 @@ public class Duration {
private static final Pattern DURATION_PATTERN =
Pattern.compile("(((?\\d+)d)?((?\\d+)h)?((?\\d+)m)?|0)");
private static final long MINUTES_PER_HOUR = 60;
-private static final long MINUTES_PER_DAY = MINUTES_PER_HOUR * 24;
+private static final long HOURS_PER_DAY = 24;
+private static final long MINUTES_PER_DAY = MINUTES_PER_HOUR *
HOURS_PER_DAY;
@EqualsAndHashCode.Exclude
private volatile String text;
@@ -100,6 +101,6 @@ public class Duration {
}
public static Duration ofDays(long days) {
-return ofHours(days * MINUTES_PER_DAY);
+return ofHours(days * HOURS_PER_DAY);
}
}
(skywalking-banyandb) branch topn-val deleted (was b978ab82)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch topn-val in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was b978ab82 Update CHANGES.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: Fix several issues of topN pre-calculation (#455)
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 8906b3ca Fix several issues of topN pre-calculation (#455)
8906b3ca is described below
commit 8906b3caf276aed936854688434407415da3f6cc
Author: Gao Hongtao
AuthorDate: Wed May 29 22:41:30 2024 +0800
Fix several issues of topN pre-calculation (#455)
---
CHANGES.md | 7 ++-
banyand/internal/storage/index.go | 6 +-
banyand/measure/block_metadata_test.go | 14 ++---
banyand/measure/block_writer.go| 24
banyand/measure/column.go | 16 +++---
banyand/measure/topn.go| 62 +
banyand/query/processor_topn.go| 3 +-
banyand/queue/sub/sub.go | 14 -
banyand/stream/block_metadata.go | 64 +++---
banyand/stream/block_metadata_test.go | 14 ++---
banyand/stream/block_writer.go | 24
banyand/stream/tag.go | 16 +++---
pkg/flow/streaming/sliding_window.go | 57 +++
pkg/flow/streaming/sliding_window_test.go | 4 +-
pkg/flow/streaming/streaming.go| 8 ++-
pkg/flow/streaming/streaming_test.go | 12 ++--
pkg/flow/streaming/topn.go | 24
pkg/flow/streaming/topn_test.go| 2 +
pkg/flow/types.go | 7 +++
pkg/pb/v1/series.go| 15 -
pkg/pb/v1/series_test.go | 8 +++
pkg/pb/v1/value.go | 18 +++---
pkg/query/logical/measure/topn_analyzer.go | 15 +++--
pkg/schema/init.go | 18 ++
...nstance_endpoint_cpm_minute_top_bottom_100.json | 2 +-
pkg/test/setup/setup.go| 2 +-
.../service_instance_endpoint_cpm_minute_data.json | 8 +--
...service_instance_endpoint_cpm_minute_data1.json | 10 ++--
...service_instance_endpoint_cpm_minute_data2.json | 4 +-
test/cases/topn/data/want/null_group.yaml | 16 +++---
30 files changed, 297 insertions(+), 197 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 29496416..420b4f8a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,18 +2,23 @@
Release Notes.
-## 0.7.0
+## 0.6.1
- Add benchmarks for stream filtering and sorting.
### Features
+- Limit the max pre-calculation result flush interval to 1 minute.
+- Use both datapoint timestamp and server time to trigger the flush of topN
pre-calculation result.
+
### Bugs
- Fix the bug that topN query doesn't return when an error occurs.
- Data race in the hot series index selection.
- Remove SetSchema from measure cache which could change the schema in the
cache.
- Fix duplicated items in the query aggregation top-n list.
+- Fix non-"value" field in topN pre-calculation result measure is lack of data.
+- Encode escaped characters to int64 bytes to fix the malformed data.
## 0.6.0
diff --git a/banyand/internal/storage/index.go
b/banyand/internal/storage/index.go
index 1ac969f4..6980369d 100644
--- a/banyand/internal/storage/index.go
+++ b/banyand/internal/storage/index.go
@@ -103,7 +103,7 @@ func (s *seriesIndex) searchPrimary(ctx context.Context,
series []*pbv1.Series)
}
result, err := convertIndexSeriesToSeriesList(ss)
if err != nil {
- return nil, errors.WithMessagef(err, "failed to convert index
series to series list, matchers: %v, result:%v", seriesMatchers, ss)
+ return nil, errors.WithMessagef(err, "failed to convert index
series to series list, matchers: %v, matched: %d", seriesMatchers, len(ss))
}
return result, nil
}
@@ -135,7 +135,7 @@ func convertEntityValuesToSeriesMatcher(series
*pbv1.Series) (index.SeriesMatche
if hasAny {
if hasWildcard {
- if err = series.Marshal(); err != nil {
+ if err = series.MarshalWithWildcard(); err != nil {
return emptySeriesMatcher, err
}
return index.SeriesMatcher{
@@ -167,7 +167,7 @@ func convertIndexSeriesToSeriesList(indexSeries
[]index.Series) (pbv1.SeriesList
var series pbv1.Series
series.ID = s.ID
if err := series.Unmarshal(s.EntityValues); err != nil {
- return nil, err
+ return nil, errors.WithMessagef(err, "failed to
unmarshal series: %s", s.EntityValues)
}
seriesList
(skywalking-java) branch main updated: Support for tracing the callbacks of async methods in elastiicsearch-6.x/7.x-plugin (#694)
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 f736b371d3 Support for tracing the callbacks of async methods in
elastiicsearch-6.x/7.x-plugin (#694)
f736b371d3 is described below
commit f736b371d3c92793a25ffa15f6c719c5fe624b82
Author: Chen Ziyan
AuthorDate: Tue May 28 00:18:56 2024 +0800
Support for tracing the callbacks of async methods in
elastiicsearch-6.x/7.x-plugin (#694)
---
CHANGES.md | 1 +
.../v6/define/IndicesClientInstrumentation.java| 8 +-
.../define/RestHighLevelClientInstrumentation.java | 16 +-
.../elasticsearch/v6/interceptor/Constants.java| 3 +
.../IndicesClientAnalyzeMethodsInterceptor.java| 6 +
.../IndicesClientCreateMethodsInterceptor.java | 6 +
.../IndicesClientDeleteMethodsInterceptor.java | 6 +
.../IndicesClientRefreshMethodsInterceptor.java| 6 +
...ghLevelClientClearScrollMethodsInterceptor.java | 6 +
...LevelClientDeleteByQueryMethodsInterceptor.java | 6 +
.../RestHighLevelClientGetMethodsInterceptor.java | 6 +
...RestHighLevelClientIndexMethodsInterceptor.java | 6 +
...estHighLevelClientSearchMethodsInterceptor.java | 6 +
...hLevelClientSearchScrollMethodsInterceptor.java | 6 +
...evelClientSearchTemplateMethodsInterceptor.java | 6 +
...estHighLevelClientUpdateMethodsInterceptor.java | 6 +
.../v6/support/ActionListenerAdapter.java | 92 +++
.../elasticsearch/v6/support/AdapterUtil.java | 40 ++
.../elasticsearch/v6/support/RestClientCache.java | 62 ++
.../apm/plugin/elasticsearch/v7/Constants.java | 4 +
.../v7/define/IndicesClientInstrumentation.java| 8 +-
.../IndicesClientAnalyzeMethodsInterceptor.java| 6 +
.../IndicesClientCreateMethodsInterceptor.java | 7 +
.../IndicesClientDeleteMethodsInterceptor.java | 7 +
.../IndicesClientRefreshMethodsInterceptor.java| 7 +
.../v7/support/ActionListenerAdapter.java | 92 +++
.../elasticsearch/v7/support/AdapterUtil.java | 40 ++
.../elasticsearch/v7/support/RestClientCache.java | 62 ++
.../service-agent/java-agent/Supported-list.md | 2 +-
.../config/expectedData.yaml | 631 -
.../elasticsearch/RestHighLevelClientCase.java | 220 +++
.../support-version.list | 3 +-
32 files changed, 1223 insertions(+), 160 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b6b6724e40..321c775094 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Release Notes.
* Fix NPE in Redisson plugin since Redisson 3.20.0.
* Support for showing batch command details and ignoring PING commands in
Redisson plugin.
* Fix peer value of Master-Slave mode in Redisson plugin.
+* Support for tracing the callbacks of asynchronous methods in
elasticsearch-6.x-plugin/elasticsearch-7.x-plugin.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/213?closed=1)
diff --git
a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java
index 0031efb96a..75b494b249 100644
---
a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java
@@ -68,7 +68,7 @@ public class IndicesClientInstrumentation extends
ClassEnhancePluginDefine {
@Override
public boolean isOverrideArgs() {
-return false;
+return true;
}
},
new InstanceMethodsInterceptPoint() {
@@ -85,7 +85,7 @@ public class IndicesClientInstrumentation extends
ClassEnhancePluginDefine {
@Override
public boolean isOverrideArgs() {
-return false;
+return true;
}
},
new InstanceMethodsInterceptPoint() {
@@ -102,7 +102,7 @@ public class IndicesClientInstrumentation extends
ClassEnhancePluginDefine {
@Override
public boolean isOverrideArgs() {
-return false;
+return true;
}
},
new InstanceMethodsInterceptPoint() {
@@ -119,7 +119,7 @@ public class IndicesClientInstrumentation extends
ClassEnhancePluginDefine
(skywalking-website) branch new-comitter deleted (was e89e82c9c91)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-comitter in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was e89e82c9c91 Update _index.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-website) branch new-comitter updated (af194c49076 -> c30ff386b29)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-comitter in repository https://gitbox.apache.org/repos/asf/skywalking-website.git from af194c49076 Polish add c30ff386b29 Fix No new revisions were added by this update. Summary of changes: content/events/welcome-claire-chen-new-committer/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(skywalking-website) branch new-comitter updated: Polish
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch new-comitter in repository https://gitbox.apache.org/repos/asf/skywalking-website.git The following commit(s) were added to refs/heads/new-comitter by this push: new af194c49076 Polish af194c49076 is described below commit af194c49076a4fd6c9062c087791e0dd3fa8e64a Author: Wu Sheng AuthorDate: Sun May 26 21:32:37 2024 +0800 Polish --- content/team/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/team/_index.md b/content/team/_index.md index 06548fa61f5..2a5972459a2 100644 --- a/content/team/_index.md +++ b/content/team/_index.md @@ -81,7 +81,7 @@ The SkyWalking team is comprised of Members and Contributors, and the growth has | Name | Apache ID | | | - | --- | | | Brandon Fergerson | bfergerson | | -|Ziyan Chen |clairechen | | +|Ziyan Chen | clairechen | | | Gong Dewei| kylixs | | | Gui Cao | zifeihan| [zifeihan007](https://twitter.com/zifeihan007) | | Hailin Wang | wanghailin | |
(skywalking-website) 01/01: Welcome Claire Chen as new committer
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch new-comitter in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 49ca62fe9574e89abf6d9207d22151ddd72da500 Author: Wu Sheng AuthorDate: Sun May 26 21:30:34 2024 +0800 Welcome Claire Chen as new committer --- .../welcome-claire-chen-new-committer/index.md | 80 ++ content/team/_index.md | 3 +- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/content/events/welcome-claire-chen-new-committer/index.md b/content/events/welcome-claire-chen-new-committer/index.md new file mode 100644 index 000..d28553453ec --- /dev/null +++ b/content/events/welcome-claire-chen-new-committer/index.md @@ -0,0 +1,80 @@ +--- +title: Welcome Claire Chen as new committer +date: 2024-05-26 +author: SkyWalking Team +--- + +Chen Ziyan(GitHub ID, CzyerChen) did a lot of contributions since the end of 2023, and continued in 2024. +Mainly focus on OAP monitoring, Java agent plugin development, UI bug fixing, blog +writing, and showcase updates. + +She is a designer and developer of data management platforms and operation management platforms as her daily work, +and have chance to use a variety of open source big data analysis, operation and maintenance and monitoring components in projects, including SkyWalking. + +Here are her contribution list. + +## skywalking +- Add component libraries of Derby/Sybase/SQLite/DB2/OceanBase jdbc +driver.(https://github.com/apache/skywalking/pull/12208) +- Add C3P0 component libraries.(https://github.com/apache/skywalking/pull/12162) +- Add ActiveMQ classic +monitoring.(https://github.com/apache/skywalking/pull/12109) +- Fix typos of the example in +metrics-query-expression.md#AggregateLabels +Operation.(https://github.com/apache/skywalking/pull/11997) +- Update opentelemetry-receiver.md for +ClickHouse.(https://github.com/apache/skywalking/pull/11995) +- Support ClickHouse server monitoring and service +hierarchy.(https://github.com/apache/skywalking/pull/11966) +- Fix day-based table rolling time range strategy in JDBC +storage.(https://github.com/apache/skywalking/pull/11915) +- Fix table exists check in the JDBC Storage +Plugin.(https://github.com/apache/skywalking/pull/11897) +- Fix log query by traceId in +JDBCLogQueryDAO.(https://github.com/apache/skywalking/pull/11764) +- Fix typos in dynamic-config-configmap.md +doc.(https://github.com/apache/skywalking/pull/11212) + +## skywalking-java +- Fix typos in URLParser.(https://github.com/apache/skywalking-java/pull/686) +- Add support for C3P0 connection pool +tracing.(https://github.com/apache/skywalking-java/pull/683) +- Add support for ActiveMQ-Artemis messaging +tracing.(https://github.com/apache/skywalking-java/pull/670) +- Add support tracing for async producing, batch sync consuming, and +batch async consuming in rocketMQ-client-java-5.x-plugin.(https://- +github.com/apache/skywalking-java/pull/665) +- Add support for HttpExchange tracing along with +webflux-webclient-6.x.(https://github.com/apache/skywalking-java/pull/664) +- Add support for webflux-6.x and gateway-4.x +tracing.(https://github.com/apache/skywalking-java/pull/661) +- Fix method incompatible in +mvc-annotation-commons.(https://github.com/apache/skywalking-java/pull/658) +- Fix PostgreSQL Jdbc URL parsing +exception.(https://github.com/apache/skywalking-java/pull/649) +- Fix Impala Jdbc URL (including schema without properties) parsing +exception.(https://github.com/apache/skywalking-java/pull/644) + +## skywalking-booster-ui +- Optimize search reset and format in +marketplace.(https://github.com/apache/skywalking-booster-ui/pull/392) +- Upgrade img of +ActiveMQ.(https://github.com/apache/skywalking-booster-ui/pull/388) +- Fix the dev local +port.(https://github.com/apache/skywalking-booster-ui/pull/375) + +## skywalking-website +-ActiveMQ monitoring bilingual +blog.(https://github.com/apache/skywalking-website/pull/700) +-ClickHouse monitoring bilingual +blog.(https://github.com/apache/skywalking-website/pull/685) + +## skywalking-showcase +- ActiveMQ monitor +showcase.(https://github.com/apache/skywalking-showcase/pull/170) + + +At May. 15th, 2020, the project management committee(PMC) passed the proposal of promoting her as a new committer. +She has accepted the invitation at the same day. + +SkyWalking team is honored to have her in the committer team. Welcome! \ No newline at end of file diff --git a/content/team/_index.md b/content/team/_index.md index 9bcb10b35d5..06548fa61f5 100644 --- a/content/team/_index.md +++ b/content/team/_index.md @@ -81,6 +81,7 @@ The SkyWalking team is comprised of Members and Contributors, and the growth has | Name | Apache ID | | | - | --- | | | Brandon Fergerson | bfergerson
(skywalking-website) branch new-comitter created (now 49ca62fe957)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-comitter in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at 49ca62fe957 Welcome Claire Chen as new committer This branch includes the following new commits: new 49ca62fe957 Welcome Claire Chen as new committer 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-go) branch main updated: feature: support higher versions of grpc-go (#183)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-go.git
The following commit(s) were added to refs/heads/main by this push:
new 8c78e5a feature: support higher versions of grpc-go (#183)
8c78e5a is described below
commit 8c78e5a397ad7500c77803beb3736f8d567d3737
Author: Alipebt <1160756...@qq.com>
AuthorDate: Sun May 26 17:09:53 2024 +0800
feature: support higher versions of grpc-go (#183)
---
CHANGES.md | 1 +
plugins/grpc/instrument.go | 13 +
plugins/grpc/server_sendresponse_interceptor.go | 10 +-
test/plugins/scenarios/grpc/plugin.yml | 7 +++
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0e664f1..012339f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
* Support [Pulsar](https://github.com/apache/pulsar-client-go) MQ.
* Support [Segmentio-Kafka](https://github.com/segmentio/kafka-go) MQ.
* Support http headers collection for Gin
+* Support higher versions of grpc.
Chore
* Enhance the observability of makefile execution
diff --git a/plugins/grpc/instrument.go b/plugins/grpc/instrument.go
index 958fcf9..b6dc327 100644
--- a/plugins/grpc/instrument.go
+++ b/plugins/grpc/instrument.go
@@ -70,39 +70,31 @@ func (i *Instrument) Points() []*instrument.Point {
{
PackagePath: "",
At: instrument.NewMethodEnhance("*Server",
"handleStream",
- instrument.WithArgsCount(3),
instrument.WithArgType(0,
"transport.ServerTransport")),
Interceptor: "ServerHandleStreamInterceptor ",
},
{
PackagePath: "",
At: instrument.NewMethodEnhance("*Server",
"sendResponse",
- instrument.WithArgsCount(6),
- instrument.WithArgType(0,
"transport.ServerTransport"),
instrument.WithResultType(0, "error")),
Interceptor: "ServerSendResponseInterceptor",
},
{
PackagePath: "",
At: instrument.NewMethodEnhance("*Server",
"processUnaryRPC",
- instrument.WithArgsCount(5),
- instrument.WithArgType(0,
"transport.ServerTransport"),
instrument.WithResultType(0, "error")),
Interceptor: "ServerUnaryInterceptor",
},
{
PackagePath: "",
At: instrument.NewMethodEnhance("*Server",
"processStreamingRPC",
- instrument.WithArgsCount(3),
- instrument.WithArgType(0,
"transport.ServerTransport"),
- instrument.WithArgType(1, "*transport.Stream")),
+ instrument.WithResultType(0, "error")),
Interceptor: "ServerStreamingInterceptor",
},
{
PackagePath: "",
At: instrument.NewMethodEnhance("*clientStream",
"SendMsg",
instrument.WithArgsCount(1),
- instrument.WithArgType(0, "interface{}"),
instrument.WithResultType(0, "error")),
Interceptor: "ClientSendMsgInterceptor",
},
@@ -110,7 +102,6 @@ func (i *Instrument) Points() []*instrument.Point {
PackagePath: "",
At: instrument.NewMethodEnhance("*clientStream",
"RecvMsg",
instrument.WithArgsCount(1),
- instrument.WithArgType(0, "interface{}"),
instrument.WithResultType(0, "error")),
Interceptor: "ClientRecvMsgInterceptor",
},
@@ -118,7 +109,6 @@ func (i *Instrument) Points() []*instrument.Point {
PackagePath: "",
At: instrument.NewMethodEnhance("*serverStream",
"SendMsg",
instrument.WithArgsCount(1),
- instrument.WithArgType(0, "interface{}"),
(skywalking-go) branch main updated: fix: Enhance usage template (#182)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-go.git
The following commit(s) were added to refs/heads/main by this push:
new 9549d21 fix: Enhance usage template (#182)
9549d21 is described below
commit 9549d2190a1718d0fffea7e62041c1dc2e998e76
Author: Shyunn
AuthorDate: Sun May 26 13:22:00 2024 +0800
fix: Enhance usage template (#182)
---
tools/go-agent/cmd/helper.go | 41 -
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/tools/go-agent/cmd/helper.go b/tools/go-agent/cmd/helper.go
index 8f2e962..3e99c02 100644
--- a/tools/go-agent/cmd/helper.go
+++ b/tools/go-agent/cmd/helper.go
@@ -20,6 +20,7 @@ package main
import (
"fmt"
"os"
+ "text/template"
)
var version string
@@ -34,24 +35,12 @@ type EnhancementToolFlags struct {
}
func PrintUsageWithExit() {
- fmt.Printf(`Usage: go {build,install} -a [-work] -toolexec "%s"
PACKAGE...
+ usageTmpl := template.New("UsageTmpl")
+ template.Must(usageTmpl.Parse(usage))
-The Go-agent-enhance tool is designed for automatic enhancement of Golang
programs, or inject the agent code into the project.
-
-Options:
- -h
- Print the usage message.
- -inject
- Inject the agent code into the project, the
value is the path of the project or single file.
- -all
- Inject the agent code into all the project in
the current directory.
- -debug
- Helping to debug the enhance process, the value
is the path of the debug file.
- -config
- The file path of the agent config file.
- -version
- Print current agent version.
-`, os.Args[0])
+ if err := usageTmpl.Execute(os.Stdout, os.Args[0]); err != nil {
+ fmt.Fprintln(os.Stdout, err)
+ }
os.Exit(1)
}
@@ -64,3 +53,21 @@ func PrintVersion() {
}
fmt.Printf("skywalking-go agent version: %s\n", res)
}
+
+var usage = `
+A command line utility for operating skywalking go-agent
+
+Describe:
+ The Go-agent-enhance tool is designed for automatic enhancement of Golang
programs, or inject the agent code into the project.
+
+Usage:
+ go {build,install} -a [-work] -toolexec "{{ . }} [flags]" PACKAGE...
+
+Available Flags:
+ -h Print the usage message.
+ -inject Inject the agent code into the project, the value is the path
of the project or single file.
+ -all Inject the agent code into all the project in the current
directory.
+ -debug Helping to debug the enhance process, the value is the path of
the debug file.
+ -config The file path of the agent config file.
+ -version Print current agent version.
+`
(skywalking-banyandb) branch duplicated-topn deleted (was 1f3db9b3)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch duplicated-topn in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was 1f3db9b3 Fix distributed group by error The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: Fix duplicated items in the query aggregation top-n list (#452)
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 6b796959 Fix duplicated items in the query aggregation top-n list
(#452)
6b796959 is described below
commit 6b79695976e8a7531c70f785a100193b6863495d
Author: Gao Hongtao
AuthorDate: Sun May 26 07:56:40 2024 +0800
Fix duplicated items in the query aggregation top-n list (#452)
---
CHANGES.md | 1 +
banyand/measure/query.go | 16 +--
pkg/pb/v1/metadata.go | 19 ++-
pkg/query/logical/measure/measure_analyzer.go | 8 +-
.../logical/measure/measure_plan_distributed.go| 20 ++-
.../measure/measure_plan_indexscan_local.go| 8 ++
pkg/schema/cache.go| 32 ++---
.../service_instance_latency_minute.json | 16 +++
.../measures/service_instance_latency_minute.json | 36 +
test/cases/init.go | 2 +
test/cases/measure/data/input/bottom_entity.yaml | 38 ++
.../measure/data/input/bottom_entity_svc.yaml | 45 ++
test/cases/measure/data/input/top_entity.yaml | 38 ++
test/cases/measure/data/input/top_entity_svc.yaml | 45 ++
.../service_instance_latency_minute_data.json | 152 +
.../service_instance_latency_minute_data1.json | 152 +
test/cases/measure/data/want/bottom_entity.yaml| 78 +++
.../cases/measure/data/want/bottom_entity_svc.yaml | 51 +++
test/cases/measure/data/want/top_entity.yaml | 78 +++
test/cases/measure/data/want/top_entity_svc.yaml | 50 +++
test/cases/measure/measure.go | 8 +-
test/stress/classic/docker-compose.yaml| 2 +-
22 files changed, 857 insertions(+), 38 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 8d029b2d..29496416 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Release Notes.
- Fix the bug that topN query doesn't return when an error occurs.
- Data race in the hot series index selection.
- Remove SetSchema from measure cache which could change the schema in the
cache.
+- Fix duplicated items in the query aggregation top-n list.
## 0.6.0
diff --git a/banyand/measure/query.go b/banyand/measure/query.go
index 876bcb5a..6c9ae474 100644
--- a/banyand/measure/query.go
+++ b/banyand/measure/query.go
@@ -163,18 +163,18 @@ func (s *measure) Query(ctx context.Context, mqo
pbv1.MeasureQueryOptions) (pbv1
result.sidToIndex[si] = i
}
if mqo.Order == nil {
- result.orderByTS = true
result.ascTS = true
- return &result, nil
+ } else if mqo.Order.Sort == modelv1.Sort_SORT_ASC || mqo.Order.Sort ==
modelv1.Sort_SORT_UNSPECIFIED {
+ result.ascTS = true
}
- if mqo.Order.Index == nil {
+ switch mqo.OrderByType {
+ case pbv1.OrderByTypeTime:
result.orderByTS = true
- if mqo.Order.Sort == modelv1.Sort_SORT_ASC || mqo.Order.Sort ==
modelv1.Sort_SORT_UNSPECIFIED {
- result.ascTS = true
- }
- return &result, nil
+ case pbv1.OrderByTypeIndex:
+ result.orderByTS = false
+ case pbv1.OrderByTypeSeries:
+ result.orderByTS = false
}
-
return &result, nil
}
diff --git a/pkg/pb/v1/metadata.go b/pkg/pb/v1/metadata.go
index 140a0c32..4ff5e411 100644
--- a/pkg/pb/v1/metadata.go
+++ b/pkg/pb/v1/metadata.go
@@ -152,15 +152,28 @@ type StreamSortResult interface {
Pull() *StreamColumnResult
}
+// OrderByType is the type of order by.
+type OrderByType int
+
+const (
+ // OrderByTypeTime is the order by time.
+ OrderByTypeTime OrderByType = iota
+ // OrderByTypeIndex is the order by index.
+ OrderByTypeIndex
+ // OrderByTypeSeries is the order by series.
+ OrderByTypeSeries
+)
+
// MeasureQueryOptions is the options of a measure query.
type MeasureQueryOptions struct {
- Namestring
- TimeRange *timestamp.TimeRange
- Entities[][]*modelv1.TagValue
Filter index.Filter
+ TimeRange *timestamp.TimeRange
Order *OrderBy
+ Namestring
+ Entities[][]*modelv1.TagValue
TagProjection []TagProjection
FieldProjection []string
+ OrderByType OrderByType
}
// MeasureQueryResult is the result of a measure query.
diff --git a/pkg/query/logical/measure/measure_analyzer.go
b/pkg/query/logical/measure/measure_analyzer.go
index 0e7f0fff..453db063 100644
--- a/pkg/query/logical/measure/measure_analyzer.go
+++ b/pkg/quer
(skywalking-banyandb) branch patch-metadata deleted (was 58af55d8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch patch-metadata in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was 58af55d8 Move sending retry event to a separate goroutine The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: Remove SetSchema from measure cache (#451)
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 37293640 Remove SetSchema from measure cache (#451)
37293640 is described below
commit 37293640aac3a3bd0ec11a53de39ee00c3f263cd
Author: Gao Hongtao
AuthorDate: Fri May 24 08:20:43 2024 +0800
Remove SetSchema from measure cache (#451)
---
CHANGES.md | 1 +
banyand/measure/query.go | 5 -
banyand/measure/write.go | 4 ++--
banyand/metadata/schema/watcher.go | 8
banyand/query/processor_topn.go| 13 +
pkg/schema/cache.go| 38 +++---
pkg/schema/init.go | 10 +-
7 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index d4a81f21..8d029b2d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
- Fix the bug that topN query doesn't return when an error occurs.
- Data race in the hot series index selection.
+- Remove SetSchema from measure cache which could change the schema in the
cache.
## 0.6.0
diff --git a/banyand/measure/query.go b/banyand/measure/query.go
index 88a91880..57bd381d 100644
--- a/banyand/measure/query.go
+++ b/banyand/measure/query.go
@@ -53,15 +53,10 @@ type Measure interface {
Query(ctx context.Context, opts pbv1.MeasureQueryOptions)
(pbv1.MeasureQueryResult, error)
GetSchema() *databasev1.Measure
GetIndexRules() []*databasev1.IndexRule
- SetSchema(schema *databasev1.Measure)
}
var _ Measure = (*measure)(nil)
-func (s *measure) SetSchema(schema *databasev1.Measure) {
- s.schema = schema
-}
-
type queryOptions struct {
pbv1.MeasureQueryOptions
minTimestamp int64
diff --git a/banyand/measure/write.go b/banyand/measure/write.go
index 62642f68..32dd4a71 100644
--- a/banyand/measure/write.go
+++ b/banyand/measure/write.go
@@ -93,9 +93,9 @@ func (w *writeCallback) handle(dst
map[string]*dataPointsInGroup, writeEvent *me
dpg.tables = append(dpg.tables, dpt)
}
dpt.dataPoints.timestamps = append(dpt.dataPoints.timestamps, ts)
- stm, ok :=
w.schemaRepo.loadMeasure(writeEvent.GetRequest().GetMetadata())
+ stm, ok := w.schemaRepo.loadMeasure(req.GetMetadata())
if !ok {
- return nil, fmt.Errorf("cannot find measure definition: %s",
writeEvent.GetRequest().GetMetadata())
+ return nil, fmt.Errorf("cannot find measure definition: %s",
req.GetMetadata())
}
fLen := len(req.DataPoint.GetTagFamilies())
if fLen < 1 {
diff --git a/banyand/metadata/schema/watcher.go
b/banyand/metadata/schema/watcher.go
index b95000d2..e4945866 100644
--- a/banyand/metadata/schema/watcher.go
+++ b/banyand/metadata/schema/watcher.go
@@ -155,7 +155,7 @@ OUTER:
case <-w.closer.CloseNotify():
return
default:
- w.handle(event)
+ w.handle(event, &watchResp)
}
}
}
@@ -163,19 +163,19 @@ OUTER:
}
}
-func (w *watcher) handle(watchEvent *clientv3.Event) {
+func (w *watcher) handle(watchEvent *clientv3.Event, watchResp
*clientv3.WatchResponse) {
switch watchEvent.Type {
case mvccpb.PUT:
md, err := w.kind.Unmarshal(watchEvent.Kv)
if err != nil {
- w.l.Error().AnErr("err", err).Msg("failed to unmarshal
message")
+ w.l.Error().Stringer("event_header",
&watchResp.Header).AnErr("err", err).Msg("failed to unmarshal message")
return
}
w.handler.OnAddOrUpdate(md)
case mvccpb.DELETE:
md, err := w.kind.Unmarshal(watchEvent.PrevKv)
if err != nil {
- w.l.Error().AnErr("err", err).Msg("failed to unmarshal
message")
+ w.l.Error().Stringer("event_header",
&watchResp.Header).AnErr("err", err).Msg("failed to unmarshal message")
return
}
w.handler.OnDelete(md)
diff --git a/banyand/query/processor_topn.go b/banyand/query/processor_topn.go
index 99dc8b42..de54a1da 100644
--- a/banyand/query/processor_topn.go
+++ b/banyand/query/processor_topn.go
@@ -91,23 +91,21 @@ func (t *topNQueryProcessor) Rev(message bus.Message) (resp
bus.Message) {
ret
(skywalking-php) branch master updated: Defined instance_name (#111)
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 dc1efbd Defined instance_name (#111) dc1efbd is described below commit dc1efbd9d83066b3fca8fb16c6a6650fe3450452 Author: Alex Abaev <88525998+almo...@users.noreply.github.com> AuthorDate: Thu May 23 11:30:03 2024 +0300 Defined instance_name (#111) --- docs/en/configuration/ini-settings.md | 46 ++- src/lib.rs| 8 ++ src/module.rs | 16 ++-- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/docs/en/configuration/ini-settings.md b/docs/en/configuration/ini-settings.md index f437b6e..dd883ba 100644 --- a/docs/en/configuration/ini-settings.md +++ b/docs/en/configuration/ini-settings.md @@ -2,25 +2,27 @@ This is the configuration list supported in `php.ini`. -| Configuration Item | Description | Default Value | -| | - | - | -| skywalking_agent.enable | Enable skywalking_agent extension or not. | Off | -| skywalking_agent.log_file| Log file path. | /tmp/skywalking-agent.log | -| skywalking_agent.log_level | Log level: one of `OFF`, `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`. | INFO | -| skywalking_agent.runtime_dir | Skywalking agent runtime directory. | /tmp/skywalking-agent | -| skywalking_agent.server_addr | Address of skywalking oap server. Only available when `reporter_type` is `grpc`. | 127.0.0.1:11800 | -| skywalking_agent.service_name| Application service name. | hello-skywalking | -| skywalking_agent.skywalking_version | Skywalking version, 8 or 9. | 8 | -| skywalking_agent.authentication | Skywalking authentication token, let it empty if the backend isn't enabled. Only available when `reporter_type` is `grpc`.| | -| skywalking_agent.worker_threads | Skywalking worker threads, 0 will auto set as the cpu core size. | 0 | -| skywalking_agent.enable_tls | Wether to enable tls for gPRC, default is false. Only available when `reporter_type` is `grpc`. | Off | -| skywalking_agent.ssl_trusted_ca_path | The gRPC SSL trusted ca file. Only available when `reporter_type` is `grpc`. | | -| skywalking_agent.ssl_key_path| The private key file. Enable mTLS when `ssl_key_path` and `ssl_cert_chain_path` exist. Only available when `reporter_type` is `grpc`. | | -| skywalking_agent.ssl_cert_chain_path | The certificate file. Enable mTLS when `ssl_key_path` and `ssl_cert_chain_path` exist. Only available when `reporter_type` is `grpc`. | | -| skywalking_agent.heartbeat_period| Agent heartbeat report period. Unit, second. | 30| -| skywalking_agent.properties_report_period_factor | The agent sends the instance properties to the backend every heartbeat_period * properties_report_period_factor seconds. | 10 | -| skywalking_agent.enable_zend_observer| Whether to use `zend observer` instead of `zend_execute_ex` to hook the functions, this feature is only available for PHP8+.
(skywalking-java) branch main updated: Fix bugs in Redisson plugin (#693)
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 ffbd90c3d3 Fix bugs in Redisson plugin (#693)
ffbd90c3d3 is described below
commit ffbd90c3d371259d44cca038f3810a99c9de7594
Author: Chen Ziyan
AuthorDate: Wed May 22 14:28:58 2024 +0800
Fix bugs in Redisson plugin (#693)
---
CHANGES.md | 3 ++
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +-
.../redisson/v3/ConnectionManagerInterceptor.java | 43 +-
.../v3/RedisConnectionMethodInterceptor.java | 19 +-
.../plugin/redisson/v3/RedissonPluginConfig.java | 8
.../service-agent/java-agent/Supported-list.md | 2 +-
.../redisson-scenario/support-version.list | 7
7 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 66f717e538..b6b6724e40 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,9 @@ Release Notes.
* Add support for `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc url format
in `URLParser`.
* Optimize spring-plugins:scheduled-annotation-plugin compatibility about
Spring 6.1.x support.
* Add a forceIgnoring mechanism in a CROSS_THREAD scenario.
+* Fix NPE in Redisson plugin since Redisson 3.20.0.
+* Support for showing batch command details and ignoring PING commands in
Redisson plugin.
+* Fix peer value of Master-Slave mode in Redisson plugin.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/213?closed=1)
diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
index 2e0d14219d..19f79cbc3e 100644
--- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
@@ -31,7 +31,7 @@
redisson-3.x-plugin
http://maven.apache.org
-3.6.0
+3.20.0
diff --git
a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
index d4b352deea..8cdb79b9ff 100644
---
a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.apm.plugin.redisson.v3;
+import java.util.Objects;
import org.apache.skywalking.apm.agent.core.context.util.PeerFormat;
import org.apache.skywalking.apm.agent.core.logging.api.ILog;
import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
@@ -26,11 +27,12 @@ import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceM
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
import org.apache.skywalking.apm.plugin.redisson.v3.util.ClassUtil;
import org.redisson.config.Config;
-import org.redisson.connection.ConnectionManager;
import java.lang.reflect.Method;
import java.net.URI;
import java.util.Collection;
+import org.redisson.connection.MasterSlaveConnectionManager;
+import org.redisson.connection.ServiceManager;
public class ConnectionManagerInterceptor implements
InstanceMethodsAroundInterceptor {
@@ -45,14 +47,19 @@ public class ConnectionManagerInterceptor implements
InstanceMethodsAroundInterc
public Object afterMethod(EnhancedInstance objInst, Method method,
Object[] allArguments, Class[] argumentsTypes,
Object ret) throws Throwable {
try {
-ConnectionManager connectionManager = (ConnectionManager) objInst;
-Config config = connectionManager.getCfg();
-
-Object singleServerConfig = ClassUtil.getObjectField(config,
"singleServerConfig");
-Object sentinelServersConfig = ClassUtil.getObjectField(config,
"sentinelServersConfig");
-Object masterSlaveServersConfig = ClassUtil.getObjectField(config,
"masterSlaveServersConfig");
-Object clusterServersConfig = ClassUtil.getObjectField(config,
"clusterServersConfig");
-Object replicatedServersConfig = ClassUtil.getObjectField(config,
"replicatedServersConfig");
+Config config = getConfig(objInst);
+Object singleServerConfig = null;
+Object sentinelServersConfig = null;
+Object masterSlaveServersConfig = null;
+Object clusterServersConfig = null;
+Object replicatedServersConf
(skywalking) branch master updated: Fix typo in docs (#12244)
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 19a2395a9e Fix typo in docs (#12244) 19a2395a9e is described below commit 19a2395a9ebbf7dca1bcf7aefba0c1819aad7214 Author: liuzc9 <90489940+liu...@users.noreply.github.com> AuthorDate: Tue May 21 17:34:00 2024 +0800 Fix typo in docs (#12244) --- docs/en/setup/backend/backend-clickhouse-monitoring.md | 2 +- docs/en/swip/SWIP-5.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/setup/backend/backend-clickhouse-monitoring.md b/docs/en/setup/backend/backend-clickhouse-monitoring.md index e3412dc984..9e8d010840 100644 --- a/docs/en/setup/backend/backend-clickhouse-monitoring.md +++ b/docs/en/setup/backend/backend-clickhouse-monitoring.md @@ -112,7 +112,7 @@ Kafka lets you: | KafkaMessagesRead | count | meter_clickhouse_instance_kafka_messages_readmeter_clickhouse_kafka_messages_read | Number of Kafka messages already processed by ClickHouse. | ClickHouse | | KafkaWrites | count | meter_clickhouse_instance_kafka_writesmeter_clickhouse_kafka_writes | Number of writes (inserts) to Kafka tables. | ClickHouse | | KafkaConsumers| count | meter_clickhouse_instance_kafka_consumersmeter_clickhouse_kafka_consumers | Number of active Kafka consumers. | ClickHouse | -| KafkProducers | count | meter_clickhouse_instance_kafka_producersmeter_clickhouse_kafka_producers | Number of active Kafka producer created. | ClickHouse | +| KafkaProducers | count | meter_clickhouse_instance_kafka_producersmeter_clickhouse_kafka_producers | Number of active Kafka producer created. | ClickHouse | ClickHouse ZooKeeper Supported Metrics diff --git a/docs/en/swip/SWIP-5.md b/docs/en/swip/SWIP-5.md index 7e3bf604d6..8943908e82 100644 --- a/docs/en/swip/SWIP-5.md +++ b/docs/en/swip/SWIP-5.md @@ -98,7 +98,7 @@ Kafka lets you: | KafkaMessagesRead | count | meter_clickhouse_instance_kafka_messages_readmeter_clickhouse_kafka_messages_read | Number of Kafka messages already processed by ClickHouse. | ClickHouse | | KafkaWrites | count | meter_clickhouse_instance_kafka_writesmeter_clickhouse_kafka_writes | Number of writes (inserts) to Kafka tables. | ClickHouse | | KafkaConsumers| count | meter_clickhouse_instance_kafka_consumersmeter_clickhouse_kafka_consumers | Number of active Kafka consumers. | ClickHouse | -| KafkProducers | count | meter_clickhouse_instance_kafka_producersmeter_clickhouse_kafka_producers | Number of active Kafka producer created. | ClickHouse | +| KafkaProducers | count | meter_clickhouse_instance_kafka_producersmeter_clickhouse_kafka_producers | Number of active Kafka producer created. | ClickHouse | ### ClickHouse ZooKeeper Supported Metrics
(skywalking-banyandb) branch data-race deleted (was a4514615)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch data-race in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was a4514615 Data race in the hot series index selection. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-banyandb) branch main updated: Data race in the hot series index selection. (#448)
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 dd064001 Data race in the hot series index selection. (#448)
dd064001 is described below
commit dd064001ae9151dbbff9207df00d85fda00092c3
Author: Gao Hongtao
AuthorDate: Tue May 21 08:13:50 2024 +0800
Data race in the hot series index selection. (#448)
---
CHANGES.md| 1 +
banyand/internal/storage/index.go | 8 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index ebd0fce5..2c3ae774 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Release Notes.
### Bugs
- Fix the bug that topN query doesn't return when an error occurs.
+- Data race in the hot series index selection.
## 0.6.0
diff --git a/banyand/internal/storage/index.go
b/banyand/internal/storage/index.go
index 950d1640..1ac969f4 100644
--- a/banyand/internal/storage/index.go
+++ b/banyand/internal/storage/index.go
@@ -42,7 +42,7 @@ import (
)
func (d *database[T, O]) IndexDB() IndexDB {
- return d.indexController.hot
+ return d.indexController.getHot()
}
func (d *database[T, O]) Lookup(ctx context.Context, series []*pbv1.Series)
(pbv1.SeriesList, error) {
@@ -310,6 +310,12 @@ func newSeriesIndexController[T TSTable, O any](
return sic, nil
}
+func (sic *seriesIndexController[T, O]) getHot() *seriesIndex {
+ sic.RLock()
+ defer sic.RUnlock()
+ return sic.hot
+}
+
func (sic *seriesIndexController[T, O]) loadIdx() ([]string, error) {
idxName := make([]string, 0)
if err := walkDir(
(skywalking) branch master updated: Sync UI (#12238)
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 59824e2cca Sync UI (#12238) 59824e2cca is described below commit 59824e2ccaa41ed747224d22ba80afef56e17e47 Author: Starry AuthorDate: Mon May 20 08:53:28 2024 +0800 Sync UI (#12238) --- 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 fc5ae99af6..8a5b3e1366 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -11,6 +11,8 @@ UI +* Fix widget title and tips +* Fix statistics span data Documentation diff --git a/skywalking-ui b/skywalking-ui index e4b2203cf6..88dbee311c 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit e4b2203cf6f33b1fd84b79ced30ee7c50e15e6d8 +Subproject commit 88dbee311c961831b74ed5ca4c5604479e33c4e1
(skywalking-website) branch master updated: Update showcase version
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 8bb48024f9a Update showcase version 8bb48024f9a is described below commit 8bb48024f9a31a6b477bfcff5e8ca4ec656d8a87 Author: Wu Sheng AuthorDate: Mon May 20 08:26:07 2024 +0800 Update showcase version --- data/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/docs.yml b/data/docs.yml index e3ba7564e1a..68999e38f53 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -9,7 +9,7 @@ repoUrl: https://github.com/apache/skywalking-showcase.git docs: - version: Next - versionName: showcase for v9 + versionName: showcase for v10 link: /docs/skywalking-showcase/next/readme/ - name: SkyWalking Website
(skywalking-showcase) branch main updated: Bump up OAP/UI
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 78953ca Bump up OAP/UI 78953ca is described below commit 78953caad8dcf783fb5a970495a2be206e1abd78 Author: 吴晟 Wu Sheng AuthorDate: Mon May 20 08:25:33 2024 +0800 Bump up OAP/UI --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 623e613..17dd9ae 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 ?= b3044ee71464c117ffcbf80a5b669da0ad64c260 +SW_OAP_IMAGE_TAG ?= c25cedaaba031071ea1283af1c5a16f078b97d92 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= b3044ee71464c117ffcbf80a5b669da0ad64c260 +SW_UI_IMAGE_TAG ?= c25cedaaba031071ea1283af1c5a16f078b97d92 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-showcase) branch main updated: Update readme.md
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 cec45a8 Update readme.md cec45a8 is described below commit cec45a88dbe5e11e76b5abde42ef18c267cb7eab Author: 吴晟 Wu Sheng AuthorDate: Mon May 20 08:23:54 2024 +0800 Update readme.md --- docs/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/readme.md b/docs/readme.md index 14b3c95..d82dbc6 100644 --- a/docs/readme.md +++ b/docs/readme.md @@ -1,6 +1,6 @@ -# SkyWalking 9.x showcase +# SkyWalking 10.x showcase -**This showcase would follow the latest changes of SkyWalking 9.x, even before the official release.** +**This showcase would follow the latest changes of SkyWalking 10.x, even before the official release.** This showcase repository includes an example music application and other manifests to demonstrate the main features of SkyWalking. The music application is composed of several microservices that are written in different programming
(skywalking-java) branch main updated: Add a forceIgnoring mechanism to the agent kernel (#689)
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 b608d74c15 Add a forceIgnoring mechanism to the agent kernel (#689)
b608d74c15 is described below
commit b608d74c158f01defb963c7d127f33b0cf509e4c
Author: gzlicanyi
AuthorDate: Fri May 17 13:43:51 2024 +0800
Add a forceIgnoring mechanism to the agent kernel (#689)
IgnoredTracerContext can propagate the unsampled flag into the following
tracing context through the invalid snapshot.
---
CHANGES.md | 1 +
.../agent/core/context/AbstractTracerContext.java | 6 ++
.../apm/agent/core/context/ContextManager.java | 9 +-
.../agent/core/context/IgnoredTracerContext.java | 12 +++
.../apm/agent/core/context/TracingContext.java | 8 ++
.../apm/agent/core/context/trace/AbstractSpan.java | 5 ++
.../core/context/trace/AbstractTracingSpan.java| 24 +-
.../apm/agent/core/context/trace/ExitSpan.java | 4 +-
.../apm/agent/core/context/trace/NoopSpan.java | 4 +
.../agent/core/context/ContinuedContextTest.java | 98 ++
.../rocketMQ/v3/OnExceptionInterceptorTest.java| 3 +-
.../rocketMQ/v3/OnSuccessInterceptorTest.java | 3 +-
.../rocketMQ/v4/OnExceptionInterceptorTest.java| 3 +-
.../rocketMQ/v4/OnSuccessInterceptorTest.java | 3 +-
.../agent/core/context/MockContextSnapshot.java| 14
.../trace/CallableOrRunnableInterceptorTest.java | 20 +++--
16 files changed, 202 insertions(+), 15 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0340de503d..66f717e538 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
* Fix typos in `URLParser`.
* Add support for `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc url format
in `URLParser`.
* Optimize spring-plugins:scheduled-annotation-plugin compatibility about
Spring 6.1.x support.
+* Add a forceIgnoring mechanism in a CROSS_THREAD scenario.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/213?closed=1)
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
index a212e126e9..01d8ba99d2 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
@@ -138,4 +138,10 @@ public interface AbstractTracerContext {
* Get current primary endpoint name
*/
String getPrimaryEndpointName();
+
+/**
+ * Change the current context to be in ignoring status.
+ */
+AbstractTracerContext forceIgnoring();
+
}
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
index c1ed28fd9d..fe90d979cf 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
@@ -163,7 +163,14 @@ public class ContextManager implements BootService {
throw new IllegalArgumentException("ContextSnapshot can't be
null.");
}
if (!snapshot.isFromCurrent()) {
-get().continued(snapshot);
+// Invalid snapshot is only created by {@link
IgnoredTracerContext#capture()}.
+// When the snapshot is not valid, need to force ignoring the
current tracing context.
+if (snapshot.isValid()) {
+get().continued(snapshot);
+} else {
+AbstractTracerContext context = get().forceIgnoring();
+CONTEXT.set(context);
+}
}
}
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
index 67fabd3e0a..b91258ea6a 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
@@ -47,6 +47,13 @@ public class IgnoredTracerContext implements
AbstractTracerContext {
this.profileStatusContext = ProfileStatusContext.createWithNone();
}
+public IgnoredTracerContext(int stackDepth) {
+
