Re: [PR] Fix stack overflow as endless logs triggered [skywalking-go]
wu-sheng merged PR #164: URL: https://github.com/apache/skywalking-go/pull/164 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-go) branch main updated: Fix stack overflow as endless logs triggered (#164)
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 07da881 Fix stack overflow as endless logs triggered (#164)
07da881 is described below
commit 07da881b95fc5da40c25a049628ad0ff9f6cf56d
Author: vearne
AuthorDate: Thu Jan 25 15:44:34 2024 +0800
Fix stack overflow as endless logs triggered (#164)
Fix https://github.com/apache/skywalking/issues/11832
---
plugins/core/reporter/grpc/grpc.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/plugins/core/reporter/grpc/grpc.go
b/plugins/core/reporter/grpc/grpc.go
index a4177f4..adbf0a4 100644
--- a/plugins/core/reporter/grpc/grpc.go
+++ b/plugins/core/reporter/grpc/grpc.go
@@ -259,7 +259,6 @@ func (r *gRPCReporter) SendLog(log *logv3.LogData) {
select {
case r.logSendCh <- log:
default:
- r.logger.Errorf("reach max logger send buffer")
}
}
@@ -298,7 +297,7 @@ func (r *gRPCReporter) closeGRPCConn() {
}
}
-//nolint
+// nolint
func (r *gRPCReporter) initSendPipeline() {
if r.traceClient == nil {
return
Re: [I] [Bug] stack overflow [skywalking]
wu-sheng closed issue #11832: [Bug] stack overflow URL: https://github.com/apache/skywalking/issues/11832 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-banyandb) branch main updated: Polish indexScan plan for stream (#382)
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 e9d57afb Polish indexScan plan for stream (#382)
e9d57afb is described below
commit e9d57afbef9fc01c162ad25f666efd43cd59085d
Author: Huang Youliang <52878305+butterbri...@users.noreply.github.com>
AuthorDate: Thu Jan 25 14:37:15 2024 +0800
Polish indexScan plan for stream (#382)
---
.../logical/stream/stream_plan_indexscan_local.go | 109 +
1 file changed, 48 insertions(+), 61 deletions(-)
diff --git a/pkg/query/logical/stream/stream_plan_indexscan_local.go
b/pkg/query/logical/stream/stream_plan_indexscan_local.go
index cf553a55..ad62fad0 100644
--- a/pkg/query/logical/stream/stream_plan_indexscan_local.go
+++ b/pkg/query/logical/stream/stream_plan_indexscan_local.go
@@ -71,6 +71,7 @@ func (i *localIndexScan) Execute(ctx context.Context)
(elements []*streamv1.Elem
}
}
ec := executor.FromStreamExecutionContext(ctx)
+
if i.order != nil && i.order.Index != nil {
ssr, err := ec.Sort(ctx, pbv1.StreamSortOptions{
Name: i.metadata.GetName(),
@@ -88,27 +89,7 @@ func (i *localIndexScan) Execute(ctx context.Context)
(elements []*streamv1.Elem
return elements, nil
}
r := ssr.Pull()
- for i := range r.Timestamps {
- e := {
- Timestamp: timestamppb.New(time.Unix(0,
r.Timestamps[i])),
- ElementId: r.ElementIDs[i],
- }
-
- for _, tf := range r.TagFamilies[i] {
- tagFamily := {
- Name: tf.Name,
- }
- e.TagFamilies = append(e.TagFamilies, tagFamily)
- for _, t := range tf.Tags {
- tagFamily.Tags = append(tagFamily.Tags,
{
- Key: t.Name,
- Value: t.Values[0],
- })
- }
- }
- elements = append(elements, e)
- }
- return elements, nil
+ return buildElementsFromColumnResult(r), nil
}
if i.filter != nil && i.filter != logical.Enode {
@@ -128,27 +109,7 @@ func (i *localIndexScan) Execute(ctx context.Context)
(elements []*streamv1.Elem
return elements, nil
}
r := sfr.Pull()
- for i := range r.Timestamps {
- e := {
- Timestamp: timestamppb.New(time.Unix(0,
r.Timestamps[i])),
- ElementId: r.ElementIDs[i],
- }
-
- for _, tf := range r.TagFamilies[i] {
- tagFamily := {
- Name: tf.Name,
- }
- e.TagFamilies = append(e.TagFamilies, tagFamily)
- for _, t := range tf.Tags {
- tagFamily.Tags = append(tagFamily.Tags,
{
- Key: t.Name,
- Value: t.Values[0],
- })
- }
- }
- elements = append(elements, e)
- }
- return elements, nil
+ return buildElementsFromColumnResult(r), nil
}
var results []pbv1.StreamQueryResult
@@ -164,10 +125,53 @@ func (i *localIndexScan) Execute(ctx context.Context)
(elements []*streamv1.Elem
if err != nil {
return nil, fmt.Errorf("failed to query stream: %w",
err)
}
-
results = append(results, result)
}
+ return buildElementsFromQueryResults(results), nil
+}
+func (i *localIndexScan) String() string {
+ return fmt.Sprintf("IndexScan:
startTime=%d,endTime=%d,Metadata{group=%s,name=%s},conditions=%s;
projection=%s; orderBy=%s; limit=%d",
+ i.timeRange.Start.Unix(), i.timeRange.End.Unix(),
i.metadata.GetGroup(), i.metadata.GetName(),
+ i.filter, logical.FormatTagRefs(", ", i.projectionTagRefs...),
i.order, i.maxElementSize)
+}
+
+func (i *localIndexScan) Children() []logical.Plan {
+ return []logical.Plan{}
+}
+
+func (i *localIndexScan) Schema() logical.Schema {
+ if i.projectionTagRefs == nil ||
Re: [PR] Polish indexScan plan for stream [skywalking-banyandb]
wu-sheng merged PR #382: URL: https://github.com/apache/skywalking-banyandb/pull/382 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-banyandb) branch main updated: Remove maxBlockLength in stream (#381)
This is an automated email from the ASF dual-hosted git repository.
hanahmily 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 132b935b Remove maxBlockLength in stream (#381)
132b935b is described below
commit 132b935bb85b1070ecec8c38c0992071cc7a7e56
Author: Huang Youliang <52878305+butterbri...@users.noreply.github.com>
AuthorDate: Thu Jan 25 14:28:00 2024 +0800
Remove maxBlockLength in stream (#381)
* Remove maxBlockLength in the stream
* Add unit test for merge
* Remove unnecessary fields in the unit test
-
Co-authored-by: 吴晟 Wu Sheng
Co-authored-by: Gao Hongtao
---
banyand/measure/merger_test.go | 16
banyand/measure/tstable_test.go | 56 +
banyand/stream/block.go | 2 +-
banyand/stream/merger.go| 25 +-
banyand/stream/merger_test.go | 39 ++--
banyand/stream/part.go | 3 +--
banyand/stream/part_metadata.go | 3 +--
banyand/stream/stream.go| 1 -
banyand/stream/tstable_test.go | 46 +
9 files changed, 153 insertions(+), 38 deletions(-)
diff --git a/banyand/measure/merger_test.go b/banyand/measure/merger_test.go
index 1e55df34..0ad12e27 100644
--- a/banyand/measure/merger_test.go
+++ b/banyand/measure/merger_test.go
@@ -278,6 +278,22 @@ func Test_mergeParts(t *testing.T) {
{seriesID: 3, count: 1, uncompressedSizeBytes:
24},
},
},
+ {
+ name:"Test with multiple parts with a large
quantity of different ts",
+ dpsList: []*dataPoints{generateHugeDps(1, 5000, 1),
generateHugeDps(5001, 1, 2)},
+ want: []blockMetadata{
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 2500,
uncompressedSizeBytes: 419},
+ {seriesID: 1, count: 1250,
uncompressedSizeBytes: 2095000},
+ {seriesID: 2, count: 2, uncompressedSizeBytes:
110},
+ {seriesID: 3, count: 2, uncompressedSizeBytes:
48},
+ },
+ },
}
for _, tt := range tests {
diff --git a/banyand/measure/tstable_test.go b/banyand/measure/tstable_test.go
index 6c4b7c6d..8e955c4d 100644
--- a/banyand/measure/tstable_test.go
+++ b/banyand/measure/tstable_test.go
@@ -500,3 +500,59 @@ var dpsTS2 = {
},
},
}
+
+func generateHugeDps(startTimestamp, endTimestamp, timestamp int64)
*dataPoints {
+ hugeDps := {
+ seriesIDs: []common.SeriesID{},
+ timestamps: []int64{},
+ tagFamilies: [][]nameValues{},
+ fields: []nameValues{},
+ }
+ for i := startTimestamp; i <= endTimestamp; i++ {
+ hugeDps.seriesIDs = append(hugeDps.seriesIDs, 1)
+ hugeDps.timestamps = append(hugeDps.timestamps, i)
+ hugeDps.tagFamilies = append(hugeDps.tagFamilies, []nameValues{
+ {
+ name: "arrTag", values: []*nameValue{
+ {name: "strArrTag", valueType:
pbv1.ValueTypeStrArr, value: nil, valueArr: [][]byte{[]byte("value5"),
[]byte("value6")}},
+ {name: "intArrTag", valueType:
pbv1.ValueTypeInt64Arr, value: nil, valueArr:
[][]byte{convert.Int64ToBytes(35), convert.Int64ToBytes(40)}},
+ },
+ },
+ {
+ name: "binaryTag", values: []*nameValue{
+ {name: "binaryTag", valueType:
pbv1.ValueTypeBinaryData, value: longText, valueArr: nil},
+ },
+ },
+ {
+ name: "singleTag", values: []*nameValue{
+ {name: "strTag", valueType:
pbv1.ValueTypeStr, value: []byte("value3"), valueArr: nil},
+ {name: "intTag", valueType:
pbv1.ValueTypeInt64, value: convert.Int64ToBytes(30), valueArr: nil},
+
Re: [PR] Remove maxBlockLength in stream [skywalking-banyandb]
hanahmily merged PR #381: URL: https://github.com/apache/skywalking-banyandb/pull/381 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove maxBlockLength in stream [skywalking-banyandb]
hanahmily commented on code in PR #381:
URL:
https://github.com/apache/skywalking-banyandb/pull/381#discussion_r1465897270
##
banyand/stream/part_metadata.go:
##
@@ -32,8 +32,7 @@ type partMetadata struct {
BlocksCount uint64 `json:"blocksCount"`
MinTimestamp int64 `json:"minTimestamp"`
MaxTimestamp int64 `json:"maxTimestamp"`
- // TODO: remove this?
- ID uint64 `json:"-"`
+ IDuint64 `json:"-"`
Review Comment:
You should raise another PR to remove it and the relevant "partID" field
since the stream doesn't have to duplicate data.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[PR] fix stack overflow #11832 [skywalking-go]
vearne opened a new pull request, #164: URL: https://github.com/apache/skywalking-go/pull/164 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Bug] stack overflow [skywalking]
vearne opened a new issue, #11832:
URL: https://github.com/apache/skywalking/issues/11832
### Search before asking
- [X] I had searched in the
[issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no
similar issues.
### Apache SkyWalking Component
OAP server (apache/skywalking)
### What happened
The bug is in skywalking-go.
```
runtime: goroutine stack exceeds 10-byte limit
runtime: sp=0x140df6e03a0 stack=[0x140df6e, 0x140ff6e]
fatal error: stack overflow
runtime stack:
runtime.throw({0x102bb6e0b?, 0x1023180b0?})
/usr/local/go/src/runtime/panic.go:1077 +0x40 fp=0x17234ed50
sp=0x17234ed20 pc=0x1023428f0
runtime.newstack()
/usr/local/go/src/runtime/stack.go:1107 +0x458 fp=0x17234ef00
sp=0x17234ed50 pc=0x10235d9f8
runtime.morestack()
```
When the oap-server is unreachable, the program crashes after a while.
### What you expected to happen
Program runs normally
### How to reproduce
Modify SW_AGENT_REPORTER_GRPC_BACKEND_SERVICE, change the address of the
oap-server to an unreachable address, and then perform a stress test for a
period of time until the local log buffer queue logSendCh is full, and the
program will crash. In fact, at this time, the program will fall into an
infinite loop.
### Anything else
_No response_
### Are you willing to submit a pull request to fix on your own?
- [X] Yes I am willing to submit a pull request on my own!
### Code of Conduct
- [X] I agree to follow this project's [Code of
Conduct](https://www.apache.org/foundation/policies/conduct)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail:
notifications-unsubscr...@skywalking.apache.org.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
CzyerChen commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1909354970 > The thing I want to highlight is, tracing is agent thing, server side monitoring is more around OpenTelemetry(or something) integration at the server side. Yes, I understand. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Polish indexScan plan for stream [skywalking-banyandb]
codecov-commenter commented on PR #382: URL: https://github.com/apache/skywalking-banyandb/pull/382#issuecomment-1909321127 ## [Codecov](https://app.codecov.io/gh/apache/skywalking-banyandb/pull/382?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache) Report All modified and coverable lines are covered by tests :white_check_mark: > Comparison is base [(`89a424b`)](https://app.codecov.io/gh/apache/skywalking-banyandb/commit/89a424b2f9e20e4f04ed9dc7cb48d0e6316825cb?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache) 47.23% compared to head [(`4adaa68`)](https://app.codecov.io/gh/apache/skywalking-banyandb/pull/382?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache) 47.25%. Additional details and impacted files ```diff @@Coverage Diff @@ ## main #382 +/- ## == + Coverage 47.23% 47.25% +0.01% == Files 172 172 Lines 2126421264 == + Hits1004510048 +3 + Misses 1037810376 -2 + Partials 841 840 -1 ``` [:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/skywalking-banyandb/pull/382?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache). :loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=apache). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
wu-sheng commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1909311718 The thing I want to highlight is, tracing is agent thing, server side monitoring is more around OpenTelemetry(or something) integration at the server side. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Polish indexScan plan for stream [skywalking-banyandb]
ButterBright opened a new pull request, #382: URL: https://github.com/apache/skywalking-banyandb/pull/382 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
CzyerChen commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1909287588 > What do you mean `from two different clients`? My asking is like this https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-rabbitmq-monitoring/. But ActiveMQ classic and Artemis are not supported yet. I plan to support tracing for Artemis firstly, and then plan to support ActiveMQ-classic monitoring feature. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-showcase) branch hierarchy-db deleted (was d46ba50)
This is an automated email from the ASF dual-hosted git repository. wankai pushed a change to branch hierarchy-db in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git was d46ba50 ns The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-showcase) branch main updated: Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE (#159)
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 22491ac Add hierarchy relations auto-matching for
MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE (#159)
22491ac is described below
commit 22491acef5d80f2bae56590a7947bbe6ab1739f2
Author: Wan Kai
AuthorDate: Thu Jan 25 09:06:12 2024 +0800
Add hierarchy relations auto-matching for
MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE (#159)
---
Makefile.in | 4 ++--
.../kubernetes/templates/feature-agent/resources.yaml | 11 +--
.../templates/feature-mysql-monitor/opentelemetry-config.yaml | 5 -
.../feature-postgresql-monitor/opentelemetry-config.yaml | 5 -
.../templates/feature-so11y/opentelemetry-config.yaml | 2 +-
services/songs-service/build.gradle | 1 +
services/songs-service/src/main/resources/application.yaml| 11 +++
7 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index d01c419..983ed3b 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 ?= cc79bf688cd6e3faf091be9103f8254fbec0befe
+SW_OAP_IMAGE_TAG ?= df3b0960914ae2cad43f96b110833032d0ff7109
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= cc79bf688cd6e3faf091be9103f8254fbec0befe
+SW_UI_IMAGE_TAG ?= df3b0960914ae2cad43f96b110833032d0ff7109
SW_CLI_IMAGE ?=
ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
SW_EVENT_EXPORTER_IMAGE ?=
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
b/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
index b6963c8..f3b6811 100644
--- a/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
+++ b/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
@@ -153,7 +153,14 @@ spec:
value: tcp://activemq:61616
- name: ACTIVE_MQ_QUEUE
value: queue-songs-ping
-
+{{- if .Values.features.postgresqlMonitor.enabled }}
+- name: DATA_SOURCE_URL
+ value: jdbc:postgresql://psql.{{ .Release.Namespace
}}.svc.cluster.local:5432/postgres
+- name: DATA_SOURCE_USER
+ value: postgres
+- name: DATA_SOURCE_PASSWORD
+ value: password
+{{- end }}
---
apiVersion: v1
kind: Service
@@ -510,4 +517,4 @@ spec:
ports:
- protocol: TCP
port: 80
- targetPort: 80
\ No newline at end of file
+ targetPort: 80
diff --git
a/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
b/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
index c79697c..cad4d2d 100644
---
a/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
+++
b/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
@@ -28,8 +28,11 @@
- source_labels: [ __meta_kubernetes_pod_container_name,
__meta_kubernetes_pod_container_port_name ]
action: keep
regex: mysqld-exporter;metrics # @feature: mysql; reference the name of
the metrics port
-- source_labels: [ __meta_kubernetes_pod_name ]
+- source_labels: [ ]
target_label: host_name
+ replacement: mysql.{{ .Release.Namespace }}
+- source_labels: [ __meta_kubernetes_pod_name ]
+ target_label: service_instance_id
regex: (.+)
replacement: $$1
diff --git
a/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
b/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
index 46b2a76..9cb0f63 100644
---
a/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
+++
b/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
@@ -28,8 +28,11 @@
- source_labels: [ __meta_kubernetes_pod_container_name,
__meta_kubernetes_pod_container_port_name ]
action: keep
regex: psql-exporter;metrics # @feature: postgresql; reference the name
of the metrics port
-- source_labels: [ __meta_kubernetes_pod_name ]
+- source_labels: [ ]
target_label: host_name
+ replacement: psql.{{ .Release.Namespace }}
+- source_labels: [ __meta_kubernetes_pod_name ]
+ target_label: service_instance_id
regex: (.+)
replacement: $$1
diff --git
Re: [PR] Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE [skywalking-showcase]
wankai123 merged PR #159: URL: https://github.com/apache/skywalking-showcase/pull/159 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-showcase) branch hierarchy-db updated (1bc0635 -> d46ba50)
This is an automated email from the ASF dual-hosted git repository. wankai pushed a change to branch hierarchy-db in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git from 1bc0635 Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE add d46ba50 ns No new revisions were added by this update. Summary of changes: deploy/platform/kubernetes/templates/feature-agent/resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[PR] Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE [skywalking-showcase]
wankai123 opened a new pull request, #159: URL: https://github.com/apache/skywalking-showcase/pull/159 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-showcase) branch hierarchy-db created (now 1bc0635)
This is an automated email from the ASF dual-hosted git repository. wankai pushed a change to branch hierarchy-db in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git at 1bc0635 Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE This branch includes the following new commits: new 1bc0635 Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-showcase) 01/01: Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch hierarchy-db
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 1bc0635a0f568220bbb8bd0a2a2dbfd50e3ca791
Author: wankai123
AuthorDate: Thu Jan 25 08:58:32 2024 +0800
Add hierarchy relations auto-matching for
MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE
---
Makefile.in | 4 ++--
.../kubernetes/templates/feature-agent/resources.yaml | 11 +--
.../templates/feature-mysql-monitor/opentelemetry-config.yaml | 5 -
.../feature-postgresql-monitor/opentelemetry-config.yaml | 5 -
.../templates/feature-so11y/opentelemetry-config.yaml | 2 +-
services/songs-service/build.gradle | 1 +
services/songs-service/src/main/resources/application.yaml| 11 +++
7 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index d01c419..983ed3b 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 ?= cc79bf688cd6e3faf091be9103f8254fbec0befe
+SW_OAP_IMAGE_TAG ?= df3b0960914ae2cad43f96b110833032d0ff7109
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= cc79bf688cd6e3faf091be9103f8254fbec0befe
+SW_UI_IMAGE_TAG ?= df3b0960914ae2cad43f96b110833032d0ff7109
SW_CLI_IMAGE ?=
ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
SW_EVENT_EXPORTER_IMAGE ?=
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
b/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
index b6963c8..7adec28 100644
--- a/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
+++ b/deploy/platform/kubernetes/templates/feature-agent/resources.yaml
@@ -153,7 +153,14 @@ spec:
value: tcp://activemq:61616
- name: ACTIVE_MQ_QUEUE
value: queue-songs-ping
-
+{{- if .Values.features.postgresqlMonitor.enabled }}
+- name: DATA_SOURCE_URL
+ value:
jdbc:postgresql://psql.skywalking-showcase.svc.cluster.local:5432/postgres
+- name: DATA_SOURCE_USER
+ value: postgres
+- name: DATA_SOURCE_PASSWORD
+ value: password
+{{- end }}
---
apiVersion: v1
kind: Service
@@ -510,4 +517,4 @@ spec:
ports:
- protocol: TCP
port: 80
- targetPort: 80
\ No newline at end of file
+ targetPort: 80
diff --git
a/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
b/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
index c79697c..cad4d2d 100644
---
a/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
+++
b/deploy/platform/kubernetes/templates/feature-mysql-monitor/opentelemetry-config.yaml
@@ -28,8 +28,11 @@
- source_labels: [ __meta_kubernetes_pod_container_name,
__meta_kubernetes_pod_container_port_name ]
action: keep
regex: mysqld-exporter;metrics # @feature: mysql; reference the name of
the metrics port
-- source_labels: [ __meta_kubernetes_pod_name ]
+- source_labels: [ ]
target_label: host_name
+ replacement: mysql.{{ .Release.Namespace }}
+- source_labels: [ __meta_kubernetes_pod_name ]
+ target_label: service_instance_id
regex: (.+)
replacement: $$1
diff --git
a/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
b/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
index 46b2a76..9cb0f63 100644
---
a/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
+++
b/deploy/platform/kubernetes/templates/feature-postgresql-monitor/opentelemetry-config.yaml
@@ -28,8 +28,11 @@
- source_labels: [ __meta_kubernetes_pod_container_name,
__meta_kubernetes_pod_container_port_name ]
action: keep
regex: psql-exporter;metrics # @feature: postgresql; reference the name
of the metrics port
-- source_labels: [ __meta_kubernetes_pod_name ]
+- source_labels: [ ]
target_label: host_name
+ replacement: psql.{{ .Release.Namespace }}
+- source_labels: [ __meta_kubernetes_pod_name ]
+ target_label: service_instance_id
regex: (.+)
replacement: $$1
diff --git
a/deploy/platform/kubernetes/templates/feature-so11y/opentelemetry-config.yaml
b/deploy/platform/kubernetes/templates/feature-so11y/opentelemetry-config.yaml
index 50c31da..f208708 100644
---
Re: [PR] Upgrade otel collector version [skywalking]
peachisai commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1908430169 > > > @peachisai Are you in the SkyWalking slack? Could you ping me there? > > > > > > Just now ,I send the request to ask join the slack > > If that qq mail is you, it doesn't work. Please follow the reply. I just register a gmail and send subscribe email ,but no reply ,It is my question? ```wfioew...@gmail.com``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade otel collector version [skywalking]
wu-sheng commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1908388221 > > @peachisai Are you in the SkyWalking slack? Could you ping me there? > > Just now ,I send the request to ask join the slack If that qq mail is you, it doesn't work. Please follow the reply. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade otel collector version [skywalking]
peachisai commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1908380761 > @peachisai Are you in the SkyWalking slack? Could you ping me there? Just now ,I send the request to ask join the slack -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
wu-sheng commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1908370915 What do you mean `from two different clients`? My asking is like this https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-rabbitmq-monitoring/. But ActiveMQ classic and Artemis are not supported yet. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
CzyerChen commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1908342659 > Apart from tracing, are you going to add server monitoring for this one? I am not sure how much different it would be, compared with ActiveMQ Classic. Yes, I also want to do the ActiveMQ monitoring. from two different clients |item|ActiveMQ-Classic|ActiveMQ-Artemis| |--|--|--| |client|org.apache.activemq.activemq-client|org.apache.activemq.artemis-jakarta-client| |producer|org.apache.activemq.ActiveMQMessageProducer.send|org.apache.activemq.artemis.jms.client.ActiveMQMessageProducer.doSendx| |consumer|org.apache.activemq.ActiveMQMessageConsumer.dequeue|org.apache.activemq.artemis.jms.client.ActiveMQMessageConsumer.getMessage| -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
CzyerChen commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1908323030 > You have been involved in the agent tracing deeply, are you interested in expanding your tech field in this open-source community? Yes, recently the last plugin in this part, then will try monitoring. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade otel collector version [skywalking]
wu-sheng commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1908315497 @peachisai Are you in the SkyWalking slack? Could you ping me there? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
wu-sheng commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1908312573 You have been involved in the agent tracing deeply, are you interested in expanding your tech field in this open-source community? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support tracing Artemis the next generation of ActiveMQ [skywalking]
wu-sheng commented on issue #11830: URL: https://github.com/apache/skywalking/issues/11830#issuecomment-1908311123 Apart from tracing, are you going to add server monitoring for this one? I am not sure how much different it would be, compared with ActiveMQ Classic. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Feature] Support Artemis the next generation of ActiveMQ [skywalking]
CzyerChen opened a new issue, #11830: URL: https://github.com/apache/skywalking/issues/11830 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Since 2023, more and more people tried to use Artemis instead of ActiveMQ, and also two "flavors" of ActiveMQ available officially- the well-known "classic" broker and the "next generation" broker code-named Artemis. It inherits the core of ActiveMQ 5 but has been refactored and improved to make it more performant, scalable, and cloud-native. [Apache ActiveMQ Artemis](https://activemq.apache.org/) ### Use case If I work with Artemis, the producer and consumer can be traced. ### Related issues _No response_ ### Are you willing to submit a pull request to implement this on your own? - [X] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade otel collector version [skywalking]
peachisai commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1908273786 > Please go ahead. Yes, I'm trying to test the remaining issues locally -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade otel collector version [skywalking]
wu-sheng commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1908260223 @peachisai We should have fixed other issues. Please go ahead. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove maxBlockLength in stream [skywalking-banyandb]
hanahmily commented on code in PR #381:
URL:
https://github.com/apache/skywalking-banyandb/pull/381#discussion_r1464949063
##
banyand/stream/merger.go:
##
@@ -300,31 +300,15 @@ func mergeBlocks(closeCh <-chan struct{}, bw
*blockWriter, br *blockReader) (*pa
tmpBlock.bm.seriesID = b.bm.seriesID
br.loadBlockData(getDecoder())
mergeTwoBlocks(tmpBlock, pendingBlock, b)
- if len(tmpBlock.timestamps) <= maxBlockLength &&
tmpBlock.uncompressedSizeBytes() <= maxUncompressedBlockSize {
+ if tmpBlock.uncompressedSizeBytes() <= maxUncompressedBlockSize
{
if len(tmpBlock.timestamps) == 0 {
pendingBlockIsEmpty = true
}
pendingBlock, tmpBlock = tmpBlock, pendingBlock
- continue
- }
-
- if len(tmpBlock.timestamps) <= maxBlockLength {
+ } else {
bw.mustWriteBlock(tmpBlock.bm.seriesID, )
Review Comment:
The "pendingBlock" and "tmpBlock" should be reset after writing.
"pendingBlockIsEmpty" should be set to "true"
##
banyand/stream/merger.go:
##
@@ -300,31 +300,15 @@ func mergeBlocks(closeCh <-chan struct{}, bw
*blockWriter, br *blockReader) (*pa
tmpBlock.bm.seriesID = b.bm.seriesID
br.loadBlockData(getDecoder())
mergeTwoBlocks(tmpBlock, pendingBlock, b)
- if len(tmpBlock.timestamps) <= maxBlockLength &&
tmpBlock.uncompressedSizeBytes() <= maxUncompressedBlockSize {
+ if tmpBlock.uncompressedSizeBytes() <= maxUncompressedBlockSize
{
if len(tmpBlock.timestamps) == 0 {
pendingBlockIsEmpty = true
}
pendingBlock, tmpBlock = tmpBlock, pendingBlock
- continue
- }
-
- if len(tmpBlock.timestamps) <= maxBlockLength {
+ } else {
Review Comment:
remove "else", add "continue" at the end of "if"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(skywalking-banyandb) branch main updated: Fix stream startup warning (#378)
This is an automated email from the ASF dual-hosted git repository.
hanahmily 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 89a424b2 Fix stream startup warning (#378)
89a424b2 is described below
commit 89a424b2f9e20e4f04ed9dc7cb48d0e6316825cb
Author: Huang Youliang <52878305+butterbri...@users.noreply.github.com>
AuthorDate: Wed Jan 24 21:42:32 2024 +0800
Fix stream startup warning (#378)
* Fix stream startup warning
-
Co-authored-by: 吴晟 Wu Sheng
---
banyand/stream/index.go | 2 +-
banyand/stream/part.go| 2 +-
banyand/stream/tstable.go | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/banyand/stream/index.go b/banyand/stream/index.go
index f6ebcf51..60f246f8 100644
--- a/banyand/stream/index.go
+++ b/banyand/stream/index.go
@@ -43,7 +43,7 @@ func newElementIndex(ctx context.Context, root string,
flushTimeoutSeconds int64
}
var err error
if ei.store, err = inverted.NewStore(inverted.StoreOpts{
- Path: path.Join(root, "element_idx"),
+ Path: path.Join(root, elementIndexFilename),
Logger: ei.l,
BatchWaitSec: flushTimeoutSeconds,
}); err != nil {
diff --git a/banyand/stream/part.go b/banyand/stream/part.go
index ec1396e5..8f1c4c55 100644
--- a/banyand/stream/part.go
+++ b/banyand/stream/part.go
@@ -42,7 +42,7 @@ const (
metaFilename = "meta.bin"
timestampsFilename = "timestamps.bin"
elementIDsFilename = "elementIDs.bin"
- fieldValuesFilename= "fields.bin"
+ elementIndexFilename = "idx"
tagFamiliesMetadataFilenameExt = ".tfm"
tagFamiliesFilenameExt = ".tf"
)
diff --git a/banyand/stream/tstable.go b/banyand/stream/tstable.go
index c4e606bc..aefd3076 100644
--- a/banyand/stream/tstable.go
+++ b/banyand/stream/tstable.go
@@ -180,6 +180,9 @@ func newTSTable(fileSystem fs.FileSystem, rootPath string,
p common.Position,
var needToDelete []string
for i := range ee {
if ee[i].IsDir() {
+ if ee[i].Name() == elementIndexFilename {
+ continue
+ }
p, err := parseEpoch(ee[i].Name())
if err != nil {
l.Info().Err(err).Msg("cannot parse part file
name. skip and delete it")
Re: [PR] Fix stream startup warning [skywalking-banyandb]
hanahmily merged PR #378: URL: https://github.com/apache/skywalking-banyandb/pull/378 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch jdk21-runtime deleted (was 27bf5b58fd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21-runtime in repository https://gitbox.apache.org/repos/asf/skywalking.git was 27bf5b58fd Merge branch 'master' into jdk21-runtime The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Support Java 21 as runtime and ship jre-21 image. (#11828)
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 df3b096091 Support Java 21 as runtime and ship jre-21 image. (#11828)
df3b096091 is described below
commit df3b0960914ae2cad43f96b110833032d0ff7109
Author: 吴晟 Wu Sheng
AuthorDate: Wed Jan 24 20:48:39 2024 +0800
Support Java 21 as runtime and ship jre-21 image. (#11828)
---
.github/workflows/publish-docker.yaml | 5 +
.github/workflows/skywalking.yaml | 3 ++-
docs/en/changes/changes.md | 2 ++
docs/en/guides/How-to-build.md | 2 +-
docs/en/setup/backend/backend-setup.md | 2 +-
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 78f6cceefd..1410f39555 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,5 +79,10 @@ jobs:
SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
TAG: ${{ env.TAG }}-java17
run: make build.all docker.push
+ - name: Build and push docker images based on Java 21
+env:
+ SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
+ TAG: ${{ env.TAG }}-java21
+run: make build.all docker.push
- name: Build and push docker images
run: make build.all docker.push
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 7913d3ef8f..c59e93939d 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -269,7 +269,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
-java-version: [11, 17]
+java-version: [11, 17, 21]
steps:
- uses: actions/checkout@v3
with:
@@ -866,3 +866,4 @@ jobs:
[[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} !=
'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;
exit 0;
+
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b1eed59df4..0d7f14ceea 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -1,6 +1,8 @@
## 10.0.0
Project
+* Support Java 21 runtime.
+* Support oap-java21 image for Java 21 runtime.
OAP Server
diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md
index a76deaf0ce..bb3862f907 100644
--- a/docs/en/guides/How-to-build.md
+++ b/docs/en/guides/How-to-build.md
@@ -16,7 +16,7 @@ If you need to execute build behind the proxy, edit the
*.mvn/jvm.config* and se
```
### Building from GitHub
-1. Prepare git, JDK 11 or 17 (LTS versions), and Maven 3.6+.
+1. Prepare git, JDK 11, 17, 21 (LTS versions), and Maven 3.6+.
1. Clone the project.
If you want to build a release from source codes, set a `tag name` by
using `git clone -b [tag_name] ...` while cloning.
diff --git a/docs/en/setup/backend/backend-setup.md
b/docs/en/setup/backend/backend-setup.md
index 56916c0f65..38bd94ee23 100755
--- a/docs/en/setup/backend/backend-setup.md
+++ b/docs/en/setup/backend/backend-setup.md
@@ -14,7 +14,7 @@ SkyWalking's backend distribution package consists of the
following parts:
## Requirements and default settings
-Requirement: **JDK11 or JDK17**.
+Requirement: **Java 11/17/21**.
Before you begin, you should understand that the main purpose of the following
quickstart is to help you obtain a basic configuration for previews/demos.
Performance and long-term running are **NOT** among the purposes of the
quickstart.
Re: [PR] Support Java 21 as runtime and ship jre-21 image. [skywalking]
wu-sheng merged PR #11828: URL: https://github.com/apache/skywalking/pull/11828 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch jdk21-runtime updated (d6e9997068 -> 27bf5b58fd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21-runtime in repository https://gitbox.apache.org/repos/asf/skywalking.git from d6e9997068 Revert e2e tests running on JDK11(by default compiling) add 2f4f4a1275 Add hierarchy relations auto-matching for MYSQL/POSTGRESQL/SO11Y_OAP/VIRTUAL_DATABASE. Fix MQE in dashboards when using `Card widget`. (#11818) add 78434e8b8d Fetch submodules when checking changed file (#11772) add a5fb2a5786 fix kafka-monitoring e2e (#11829) add 27bf5b58fd Merge branch 'master' into jdk21-runtime No new revisions were added by this update. Summary of changes: .github/workflows/skywalking.yaml | 1 + docs/en/changes/changes.md | 13 ++- .../service-hierarchy-configuration.md | 22 - docs/en/concepts-and-designs/service-hierarchy.md | 97 -- .../server/core/hierarchy/HierarchyService.java| 57 + .../src/main/resources/hierarchy-definition.yml| 20 - .../apisix/apisix-instance.json| 4 +- .../aws_s3/aws_s3-service.json | 8 +- .../elasticsearch/elasticsearch-cluster.json | 50 ++- .../elasticsearch/elasticsearch-index.json | 50 +++ .../elasticsearch/elasticsearch-node.json | 51 +--- .../ui-initialized-templates/k8s/k8s-cluster.json | 32 +++ .../mongodb/mongodb-cluster.json | 10 +-- .../mongodb/mongodb-node.json | 10 +-- .../mysql/mysql-instance.json | 65 +++ .../mysql/mysql-service.json | 32 ++- .../os_linux/linux-service.json| 10 +-- .../os_windows/windows-service.json| 6 +- .../postgresql/postgresql-instance.json| 96 - .../postgresql/postgresql-root.json| 5 +- .../postgresql/postgresql-service.json | 30 ++- .../rabbitmq/rabbitmq-node.json| 60 ++--- .../redis/redis-instance.json | 18 ++-- .../redis/redis-service.json | 8 +- .../so11y_oap/so11y-instance.json | 17 +++- .../so11y_oap/so11y-service.json | 3 +- .../virtual_database/virtual-database-service.json | 23 - .../e2e-v2/cases/kafka/kafka-monitoring/Dockerfile | 2 +- .../kafka/kafka-monitoring/docker-compose.yml | 20 + 29 files changed, 587 insertions(+), 233 deletions(-)
(skywalking) branch jdk21-runtime updated (587eb06424 -> d6e9997068)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21-runtime in repository https://gitbox.apache.org/repos/asf/skywalking.git from 587eb06424 Apply all cases running in JDK21 add d6e9997068 Revert e2e tests running on JDK11(by default compiling) No new revisions were added by this update. Summary of changes: .github/workflows/skywalking.yaml | 12 ++-- docs/en/changes/changes.md| 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-)
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
kezhenxu94 commented on PR #11828: URL: https://github.com/apache/skywalking/pull/11828#issuecomment-1907919422 > @kezhenxu94 Could you verify the changes I made? The changes looks good to me and the cases seem to pass for Java 21. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
wu-sheng commented on PR #11828: URL: https://github.com/apache/skywalking/pull/11828#issuecomment-1907907135 @kezhenxu94 Could you verify the changes I made? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade otel collector version [skywalking]
wankai123 commented on PR #11819: URL: https://github.com/apache/skywalking/pull/11819#issuecomment-1907895353 > > `So11y` seems have an error verify result with the latest `OTEL collector` version, I am tring to fix it > > here change `logLevel` to: `loglevel` > > https://github.com/apache/skywalking/blob/a9128e0cefbcba08c085b70ed8795d7fb416459c/test/e2e-v2/cases/so11y/otel-collector-config.yaml#L36 Kafka-monitoring's OTEL config needs change to `loglevel` as well. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch jdk21-runtime updated (4a0ac81428 -> 587eb06424)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21-runtime in repository https://gitbox.apache.org/repos/asf/skywalking.git from 4a0ac81428 Add more tests for 21 add 587eb06424 Apply all cases running in JDK21 No new revisions were added by this update. Summary of changes: .github/workflows/skywalking.yaml | 100 +++--- 1 file changed, 7 insertions(+), 93 deletions(-)
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
kezhenxu94 commented on PR #11828: URL: https://github.com/apache/skywalking/pull/11828#issuecomment-1907723084 > Make sense. Let's say I am going to change current JDK11 to JDK21, after tests passed, I revert all of them back? Sounds good -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch master updated: fix kafka-monitoring e2e (#11829)
This is an automated email from the ASF dual-hosted git repository. wankai 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 a5fb2a5786 fix kafka-monitoring e2e (#11829) a5fb2a5786 is described below commit a5fb2a5786678a21be404426635466dde3c3eeed Author: Wan Kai AuthorDate: Wed Jan 24 17:23:45 2024 +0800 fix kafka-monitoring e2e (#11829) --- .../e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml index 0655db4b90..f035d37125 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml @@ -45,16 +45,10 @@ services: expose: - 9092 - 7071 -ports: - - '9092:9092' - - '7071:7071' networks: - e2e environment: - - KAFKA_ENABLE_KRAFT=no - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181 - - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092 - - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://broker1:9092 - ALLOW_PLAINTEXT_LISTENER=yes - KAFKA_OPTS=-javaagent:/etc/jmx_prometheus_javaagent-0.18.0.jar=7071:/etc/kafka-2_0_0.yml depends_on: @@ -72,16 +66,10 @@ services: expose: - 9093 - 7072 -ports: - - '9093:9093' - - '7072:7072' networks: - e2e environment: - - KAFKA_ENABLE_KRAFT=no - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181 - - KAFKA_CFG_LISTENERS=PLAINTEXT://:9093 - - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://broker2:9093 - ALLOW_PLAINTEXT_LISTENER=yes - KAFKA_OPTS=-javaagent:/etc/jmx_prometheus_javaagent-0.18.0.jar=7072:/etc/kafka-2_0_0.yml depends_on: @@ -116,7 +104,7 @@ services: - bash - -c - > -kafka-consumer-perf-test.sh --bootstrap-server broker1:9092,broker2:9093 --topic perftest --messages 10 +kafka-consumer-perf-test.sh --broker-list broker1:9092,broker2:9093 --topic perftest --messages 10 otel-collector: image: otel/opentelemetry-collector:0.50.0
Re: [PR] fix kafka-monitoring e2e [skywalking]
wankai123 merged PR #11829: URL: https://github.com/apache/skywalking/pull/11829 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
wu-sheng commented on PR #11828: URL: https://github.com/apache/skywalking/pull/11828#issuecomment-1907716233 Make sense. Let's say I am going to change current JDK11 to JDK21, after tests passed, I revert all of them back? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
kezhenxu94 commented on PR #11828: URL: https://github.com/apache/skywalking/pull/11828#issuecomment-1907712024 > @kezhenxu94 Please take a look whether the JDK21 runtime is applied correctly on e2e. > > If so, what do you suggest for these JDK21 cases? It passed, which proved OAP is good to run on JDK21. It seems we are good for JDK 11/17/21, and it should not be necessary to test every time. The new cases added in this PR are part of the whole cases we did for Java 11, to be 100% sure that Java 21 works, we should run the whole cases at least 1 time -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
wu-sheng commented on code in PR #11828: URL: https://github.com/apache/skywalking/pull/11828#discussion_r1464575721 ## .github/workflows/skywalking.yaml: ## @@ -878,7 +878,7 @@ jobs: strategy: fail-fast: false matrix: -java-version: [11, 17] +java-version: [11, 17, 21] Review Comment: This will fail. Because the maven for test service is not suitable for Java 21. :) I tested, but didn't take a closer look. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch jdk21-runtime updated (72e78e0e5c -> 4a0ac81428)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch jdk21-runtime in repository https://gitbox.apache.org/repos/asf/skywalking.git from 72e78e0e5c Add e2e-test-java21 add 4a0ac81428 Add more tests for 21 No new revisions were added by this update. Summary of changes: .github/workflows/skywalking.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Re: [PR] Test JDK-21 as OAP runtime. [skywalking]
wu-sheng commented on PR #11828: URL: https://github.com/apache/skywalking/pull/11828#issuecomment-1907686791 @kezhenxu94 Please take a look whether the JDK21 runtime is applied correctly on e2e. If so, what do you suggest for these JDK21 cases? It passed, which proved OAP is good to run on JDK21. It seems we are good for JDK 11/17/21, and it should not be necessary to test every time. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch master updated: Fetch submodules when checking changed file (#11772)
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 78434e8b8d Fetch submodules when checking changed file (#11772) 78434e8b8d is described below commit 78434e8b8d769c405ffb96dbcf0b3b22259172f3 Author: kezhenxu94 AuthorDate: Wed Jan 24 16:53:59 2024 +0800 Fetch submodules when checking changed file (#11772) --- .github/workflows/skywalking.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 488588ac14..7913d3ef8f 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -114,6 +114,7 @@ jobs: - uses: actions/checkout@v3 # required for push event with: fetch-depth: 0 + submodules: true - name: Filter OAP id: filter-oap # The GHA version is pinned by infra
Re: [PR] Fetch submodules when checking changed file [skywalking]
wu-sheng merged PR #11772: URL: https://github.com/apache/skywalking/pull/11772 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix kafka-monitoring e2e [skywalking]
wankai123 opened a new pull request, #11829: URL: https://github.com/apache/skywalking/pull/11829 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch jdk21-runtime updated (f482f163ed -> 72e78e0e5c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch jdk21-runtime in repository https://gitbox.apache.org/repos/asf/skywalking.git from f482f163ed Test JDK-21 as OAP runtime. add 72e78e0e5c Add e2e-test-java21 No new revisions were added by this update. Summary of changes: .github/workflows/publish-docker.yaml | 5 ++ .github/workflows/skywalking.yaml | 91 +- docs/en/guides/How-to-build.md | 2 +- docs/en/setup/backend/backend-setup.md | 2 +- 4 files changed, 96 insertions(+), 4 deletions(-)
(skywalking-booster-ui) branch main updated: feat: add the not found page (#368)
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 7d24e065 feat: add the not found page (#368)
7d24e065 is described below
commit 7d24e065e962659cab4e30858628414dbd734785
Author: Fine0830
AuthorDate: Wed Jan 24 16:09:15 2024 +0800
feat: add the not found page (#368)
---
src/assets/icons/logo-light.svg | 138
src/router/index.ts | 2 +
src/router/notFound.ts | 26
src/views/NotFound.vue | 33 ++
4 files changed, 199 insertions(+)
diff --git a/src/assets/icons/logo-light.svg b/src/assets/icons/logo-light.svg
new file mode 100644
index ..b2a04196
--- /dev/null
+++ b/src/assets/icons/logo-light.svg
@@ -0,0 +1,138 @@
+
+http://www.w3.org/2000/svg; viewBox="0 0 400.00
400.00"
+ preserveAspectRatio="xMidYMid meet">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.ts b/src/router/index.ts
index 2cfd6c9d..819539e7 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -21,6 +21,7 @@ import { routesMarketplace } from "./marketplace";
import { routesAlarm } from "./alarm";
import routesLayers from "./layer";
import { routesSettings } from "./settings";
+import { routesNotFound } from "./notFound";
const routes: RouteRecordRaw[] = [
...routesMarketplace,
@@ -28,6 +29,7 @@ const routes: RouteRecordRaw[] = [
...routesAlarm,
...routesDashboard,
...routesSettings,
+ ...routesNotFound,
];
const router = createRouter({
diff --git a/src/router/notFound.ts b/src/router/notFound.ts
new file mode 100644
index ..8efe0da0
--- /dev/null
+++ b/src/router/notFound.ts
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { RouteRecordRaw } from "vue-router";
+import NotFound from "@/views/NotFound.vue";
+
+export const routesNotFound: Array = [
+ {
+path: "/:pathMatch(.*)*",
+name: "NotFound",
+component: NotFound,
+ },
+];
diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
new file mode 100644
index ..fe7bcee9
--- /dev/null
+++ b/src/views/NotFound.vue
@@ -0,0 +1,33 @@
+
+
+
+
+404 Page Not Found
+
+
+
+ .not-found {
+height: 100%;
+width: 100%;
+align-items: center;
+justify-content: center;
+ }
+
+ .icon {
+width: 160px;
+height: 160px;
+ }
+
Re: [PR] feat: add the not found page [skywalking-booster-ui]
wu-sheng merged PR #368: URL: https://github.com/apache/skywalking-booster-ui/pull/368 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
