(skywalking) branch doc created (now 94b5f55987)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch doc in repository https://gitbox.apache.org/repos/asf/skywalking.git at 94b5f55987 Add doc to start next iteration No new revisions were added by this update.
(skywalking-banyandb-helm) 01/01: Fix wrong value references in probes
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch probe
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git
commit 8ab9af1877e715da681be0606258bfa102a6060b
Author: kezhenxu94
AuthorDate: Thu Sep 19 11:06:47 2024 +0800
Fix wrong value references in probes
---
chart/templates/liaison_deployment.yaml | 10 +-
chart/templates/ui_deployment.yaml | 10 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/chart/templates/liaison_deployment.yaml
b/chart/templates/liaison_deployment.yaml
index 73f41b1..cd9bc8b 100644
--- a/chart/templates/liaison_deployment.yaml
+++ b/chart/templates/liaison_deployment.yaml
@@ -132,11 +132,11 @@ spec:
{{- else }}
scheme: HTTP
{{- end }}
-initialDelaySeconds: {{
.Values.cluster.liaison.readinessProbe.initialDelaySeconds }}
-periodSeconds: {{
.Values.cluster.liaison.readinessProbe.periodSeconds }}
-timeoutSeconds: {{
.Values.cluster.liaison.readinessProbe.timeoutSeconds }}
-successThreshold: {{
.Values.cluster.liaison.readinessProbe.successThreshold }}
-failureThreshold: {{
.Values.cluster.liaison.readinessProbe.failureThreshold }}
+initialDelaySeconds: {{
.Values.cluster.liaison.livenessProbe.initialDelaySeconds }}
+periodSeconds: {{
.Values.cluster.liaison.livenessProbe.periodSeconds }}
+timeoutSeconds: {{
.Values.cluster.liaison.livenessProbe.timeoutSeconds }}
+successThreshold: {{
.Values.cluster.liaison.livenessProbe.successThreshold }}
+failureThreshold: {{
.Values.cluster.liaison.livenessProbe.failureThreshold }}
{{- if.Values.cluster.liaison.resources }}
resources:
diff --git a/chart/templates/ui_deployment.yaml
b/chart/templates/ui_deployment.yaml
index 1e6f77d..298fb7c 100644
--- a/chart/templates/ui_deployment.yaml
+++ b/chart/templates/ui_deployment.yaml
@@ -116,11 +116,11 @@ spec:
{{- else }}
scheme: HTTP
{{- end }}
-initialDelaySeconds: {{
.Values.cluster.ui.standalone.readinessProbe.initialDelaySeconds }}
-periodSeconds: {{
.Values.cluster.ui.standalone.readinessProbe.periodSeconds }}
-timeoutSeconds: {{
.Values.cluster.ui.standalone.readinessProbe.timeoutSeconds }}
-successThreshold: {{
.Values.cluster.ui.standalone.readinessProbe.successThreshold }}
-failureThreshold: {{
.Values.cluster.ui.standalone.readinessProbe.failureThreshold }}
+initialDelaySeconds: {{
.Values.cluster.ui.standalone.livenessProbe.initialDelaySeconds }}
+periodSeconds: {{
.Values.cluster.ui.standalone.livenessProbe.periodSeconds }}
+timeoutSeconds: {{
.Values.cluster.ui.standalone.livenessProbe.timeoutSeconds }}
+successThreshold: {{
.Values.cluster.ui.standalone.livenessProbe.successThreshold }}
+failureThreshold: {{
.Values.cluster.ui.standalone.livenessProbe.failureThreshold }}
{{- if.Values.cluster.ui.standalone.resources }}
resources:
(skywalking-banyandb-helm) branch probe created (now 8ab9af1)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch probe in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git at 8ab9af1 Fix wrong value references in probes This branch includes the following new commits: new 8ab9af1 Fix wrong value references in probes 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: Add logs
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 149da1bc6a9970a4b20bca9b0609e6ca349da552
Author: kezhenxu94
AuthorDate: Mon Sep 9 11:08:52 2024 +0800
Add logs
---
.../java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
index e91a98f2ac..6efe77fa52 100644
---
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
+++
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
@@ -83,6 +83,7 @@ public class SampleFamily {
static SampleFamily build(RunningContext ctx, Sample... samples) {
Preconditions.checkNotNull(samples);
Preconditions.checkArgument(samples.length > 0);
+log.info("Samples size: {}", samples.length);
samples = Arrays.stream(samples).filter(sample ->
!Double.isNaN(sample.getValue())).toArray(Sample[]::new);
if (samples.length == 0) {
return EMPTY;
(skywalking) branch test updated (50a8b17a3b -> 149da1bc6a)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 50a8b17a3b Add logs new 149da1bc6a Add logs This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (50a8b17a3b) \ N -- N -- N refs/heads/test (149da1bc6a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking) 01/02: Add large latency buckets for otlp latency
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 4c8390af70ddde10e6a33190b06433b1f2ce0368
Author: kezhenxu94
AuthorDate: Sun Sep 8 11:33:18 2024 +0800
Add large latency buckets for otlp latency
---
.github/workflows/publish-docker.yaml | 1 +
.../server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 01c7e0b20d..80626bf839 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - test
release:
types:
- released
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
index 7ef39c0a8f..4684b5b38d 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
@@ -86,7 +86,8 @@ public class OpenTelemetryMetricRequestProcessor implements
Service {
"otel_metrics_latency",
"The latency to process the metrics request",
MetricsTag.EMPTY_KEY,
-MetricsTag.EMPTY_VALUE
+MetricsTag.EMPTY_VALUE,
+.005, .01, .025, .05, .075, .1, .25, .5, .75, 1, 2.5, 5, 7.5, 10, 30,
60, 120, 180, 300, 600
);
public void processMetricsRequest(final ExportMetricsServiceRequest
requests) {
(skywalking) branch test updated (44ec93d863 -> 1d7fe919e1)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 44ec93d863 Add large latency buckets for otlp latency new 1d7fe919e1 Add large latency buckets for otlp latency This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (44ec93d863) \ N -- N -- N refs/heads/test (1d7fe919e1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/publish-docker.yaml | 1 - 1 file changed, 1 deletion(-)
(skywalking) 01/01: Add large latency buckets for otlp latency
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 1d7fe919e13d41c061b7f9e8a326fa4b2cb0e1f4
Author: kezhenxu94
AuthorDate: Sun Sep 8 11:33:18 2024 +0800
Add large latency buckets for otlp latency
---
.../server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
index 7ef39c0a8f..57eeaf0d86 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
@@ -86,7 +86,8 @@ public class OpenTelemetryMetricRequestProcessor implements
Service {
"otel_metrics_latency",
"The latency to process the metrics request",
MetricsTag.EMPTY_KEY,
-MetricsTag.EMPTY_VALUE
+MetricsTag.EMPTY_VALUE,
+.005, .01, .025, .05, .075, .1, .25, .5, .75, 1, 2.5, 5, 7.5, 10, 15,
30, 60, 120
);
public void processMetricsRequest(final ExportMetricsServiceRequest
requests) {
(skywalking) 01/01: Add large latency buckets for otlp latency
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 44ec93d8633b5b247d6fb429649696d36c6cc9e3
Author: kezhenxu94
AuthorDate: Sun Sep 8 11:33:18 2024 +0800
Add large latency buckets for otlp latency
---
.github/workflows/publish-docker.yaml | 1 +
.../server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 01c7e0b20d..80626bf839 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - test
release:
types:
- released
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
index 7ef39c0a8f..57eeaf0d86 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
@@ -86,7 +86,8 @@ public class OpenTelemetryMetricRequestProcessor implements
Service {
"otel_metrics_latency",
"The latency to process the metrics request",
MetricsTag.EMPTY_KEY,
-MetricsTag.EMPTY_VALUE
+MetricsTag.EMPTY_VALUE,
+.005, .01, .025, .05, .075, .1, .25, .5, .75, 1, 2.5, 5, 7.5, 10, 15,
30, 60, 120
);
public void processMetricsRequest(final ExportMetricsServiceRequest
requests) {
(skywalking) branch test updated (4c8390af70 -> 44ec93d863)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 4c8390af70 Add large latency buckets for otlp latency new 44ec93d863 Add large latency buckets for otlp latency This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4c8390af70) \ N -- N -- N refs/heads/test (44ec93d863) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking) branch test created (now 4c8390af70)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git at 4c8390af70 Add large latency buckets for otlp latency This branch includes the following new commits: new 4c8390af70 Add large latency buckets for otlp latency 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 test deleted (was 00cb343955)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git was 00cb343955 Build image for test This change permanently discards the following revisions: discard 00cb343955 Build image for test discard d118f1cf6b Add self observability metrics for otel handler
(skywalking-showcase) branch main updated: Update OAP/UI to add self observability for otel receiver
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 c3ce2dd Update OAP/UI to add self observability for otel receiver c3ce2dd is described below commit c3ce2dd6b95daec2877fff497d3525c9e3935728 Author: kezhenxu94 AuthorDate: Sat Sep 7 16:28:47 2024 +0800 Update OAP/UI to add self observability for otel receiver --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index c1d4724..01d50cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,10 +33,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 ?= a81437f9a6f3fc6efa11501ba61c1f245e062983 +SW_OAP_IMAGE_TAG ?= 78483991b780152a00f7f4032e0012638a1aba93 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= a81437f9a6f3fc6efa11501ba61c1f245e062983 +SW_UI_IMAGE_TAG ?= 78483991b780152a00f7f4032e0012638a1aba93 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 (a121e46 -> 8bb8386)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git discard a121e46 Explicitly set OAP resources limits (#187) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/main (8bb8386) \ O -- O -- O (a121e46) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: deploy/platform/kubernetes/values.yaml | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-)
(skywalking) branch otelso117 updated (d118f1cf6b -> 59d5e207c9)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git omit d118f1cf6b Add self observability metrics for otel handler add 59d5e207c9 Add self observability metrics for otel handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d118f1cf6b) \ N -- N -- N refs/heads/otelso117 (59d5e207c9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../ui-initialized-templates/so11y_oap/so11y-instance.json | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
(skywalking-showcase) branch oapresource deleted (was 9962ef7)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch oapresource in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git was 9962ef7 Explicitly set OAP resources limits 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) 01/01: Explicitly set OAP resources limits
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch oapresource in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git commit 9962ef74e7ed8a377a85a454922b6bf99e09c920 Author: kezhenxu94 AuthorDate: Fri Sep 6 21:10:18 2024 +0800 Explicitly set OAP resources limits --- deploy/platform/kubernetes/values.yaml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deploy/platform/kubernetes/values.yaml b/deploy/platform/kubernetes/values.yaml index c8a8aba..6a9accb 100644 --- a/deploy/platform/kubernetes/values.yaml +++ b/deploy/platform/kubernetes/values.yaml @@ -22,6 +22,11 @@ skywalking: tag: ~ pullPolicy: IfNotPresent replicas: 1 +javaOpts: -Xmx8g -Xms2g +resources: + limits: +cpu: 4 +memory: 8Gi storageType: ~ ports: grpc: 11800 @@ -319,7 +324,6 @@ prometheus-elasticsearch-exporter: es: uri: "http://elasticsearch-master:9200"; - opentelemetry: enabled: false
(skywalking) 01/01: Build image for test
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 00cb343955582a1a6a38e89d2e6a06dd253d1d31 Author: kezhenxu94 AuthorDate: Fri Sep 6 20:40:34 2024 +0800 Build image for test --- .github/workflows/publish-docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 01c7e0b20d..80626bf839 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -20,6 +20,7 @@ on: push: branches: - master + - test release: types: - released
(skywalking) branch test created (now 00cb343955)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/skywalking.git at 00cb343955 Build image for test This branch includes the following new commits: new 00cb343955 Build image for test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) branch otelso117 updated (1beb7cea23 -> d118f1cf6b)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git omit 1beb7cea23 Add self observability metrics for otel handler add d118f1cf6b Add self observability metrics for otel handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1beb7cea23) \ N -- N -- N refs/heads/otelso117 (d118f1cf6b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../otel/otlp/OpenTelemetryLogHandler.java | 60 ++ .../otlp/OpenTelemetryMetricRequestProcessor.java | 10 .../otel/otlp/OpenTelemetryTraceHandler.java | 12 + .../src/main/resources/otel-rules/oap.yaml | 6 +-- 4 files changed, 30 insertions(+), 58 deletions(-)
(skywalking-showcase) branch main updated: Exporter per pipeline (#186)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 8bb8386 Exporter per pipeline (#186)
8bb8386 is described below
commit 8bb8386a2759a540b8eafd301845081b40501f2d
Author: kezhenxu94
AuthorDate: Fri Sep 6 16:43:46 2024 +0800
Exporter per pipeline (#186)
---
.../kubernetes/templates/otel-collector-config.yaml | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/deploy/platform/kubernetes/templates/otel-collector-config.yaml
b/deploy/platform/kubernetes/templates/otel-collector-config.yaml
index 33a9f37..e733fa9 100644
--- a/deploy/platform/kubernetes/templates/otel-collector-config.yaml
+++ b/deploy/platform/kubernetes/templates/otel-collector-config.yaml
@@ -51,10 +51,15 @@ data:
{{- end }}
exporters:
- otlp:
-endpoint: "{{ include "skywalking.oap.address.grpc" . }}"
+ {{- $root := . }}
+ {{- range $idx, $config := $configs }}
+ {{- if not (include $config $root | trim | empty) }}
+ otlp/{{ $idx }}:
+endpoint: "{{ include "skywalking.oap.address.grpc" $root }}"
tls:
insecure: true
+ {{- end }}
+ {{- end }}
logging:
verbosity: detailed
@@ -66,15 +71,15 @@ data:
service:
pipelines:
-metrics:
- receivers:
{{- $root := . }}
{{- range $idx, $config := $configs }}
{{- if not (include $config $root | trim | empty) }}
+metrics/{{ $idx }}:
+ receivers:
- prometheus/{{ $idx }}
+ exporters: [ otlp/{{ $idx }},logging ]
{{- end }}
{{- end }}
- exporters: [ otlp,logging ]
extensions:
- health_check
(skywalking-showcase) branch exporter-per-pp created (now 84ab726)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch exporter-per-pp in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git at 84ab726 Exporter per pipeline This branch includes the following new commits: new 84ab726 Exporter per pipeline 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-satellite) 01/01: Update kind.yaml
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git commit deb8cf582cc193a4de10d8714a0772bf8bbe220c Author: kezhenxu94 AuthorDate: Fri Sep 6 16:08:12 2024 +0800 Update kind.yaml --- test/e2e/case/istio/kind.yaml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/case/istio/kind.yaml b/test/e2e/case/istio/kind.yaml index 2f9384f..d787998 100644 --- a/test/e2e/case/istio/kind.yaml +++ b/test/e2e/case/istio/kind.yaml @@ -18,9 +18,11 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - # the control plane node config - role: control-plane - # the three workers +image: kindest/node:v1.21.14 - role: worker +image: kindest/node:v1.21.14 - role: worker +image: kindest/node:v1.21.14 - role: worker +image: kindest/node:v1.21.14
(skywalking-satellite) branch kezhenxu94-patch-1 created (now deb8cf5)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git at deb8cf5 Update kind.yaml This branch includes the following new commits: new deb8cf5 Update kind.yaml 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 otelso117 updated (248f4abb40 -> 59b9b4c3d7)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 248f4abb40 Add self observability metrics for otel handler new 59b9b4c3d7 Add self observability metrics for otel handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (248f4abb40) \ N -- N -- N refs/heads/otelso117 (59b9b4c3d7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../otel/otlp/OpenTelemetryLogHandler.java | 8 +- .../otlp/OpenTelemetryMetricRequestProcessor.java | 8 +- .../otel/otlp/OpenTelemetryTraceHandler.java | 8 +- .../so11y_oap/so11y-instance.json | 142 + 4 files changed, 154 insertions(+), 12 deletions(-)
(skywalking-satellite) branch publish updated (7bf7ea7 -> 072e3cc)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch publish in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git from 7bf7ea7 Update e2e-istio.yaml add 072e3cc Update e2e-native.yaml No new revisions were added by this update. Summary of changes: .github/workflows/e2e-native.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-satellite) 01/01: Allow manually rebuild docker images
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch publish in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git commit 812dadd8709e45c8f08330234e30b647bfdb3b3d Author: kezhenxu94 AuthorDate: Fri Sep 6 14:26:26 2024 +0800 Allow manually rebuild docker images --- .github/workflows/publish-docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 63fcf74..f32e331 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -20,6 +20,7 @@ on: push: branches: - main + workflow_dispatch: env: HUB: ghcr.io/apache/skywalking-satellite
(skywalking) 01/01: Add self observability metrics for otel handler
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch otelso117
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 174167bd35b2fb62bdb091cd3eee4bdc5d18731b
Author: kezhenxu94
AuthorDate: Thu Sep 5 15:56:00 2024 +0800
Add self observability metrics for otel handler
---
.github/workflows/publish-docker.yaml | 1 +
.../otel/otlp/OpenTelemetryLogHandler.java | 74 +---
.../otlp/OpenTelemetryMetricRequestProcessor.java | 81 ++
.../otel/otlp/OpenTelemetryTraceHandler.java | 72 +--
.../src/main/resources/otel-rules/oap.yaml | 27 +---
5 files changed, 172 insertions(+), 83 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 01c7e0b20d..ca6278dc33 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - otelso117
release:
types:
- released
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
index 3d6c6bc9db..fd7f12f117 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
@@ -27,6 +27,7 @@ import io.opentelemetry.proto.common.v1.KeyValue;
import io.opentelemetry.proto.logs.v1.LogRecord;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import lombok.Getter;
import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogDataBody;
@@ -39,6 +40,11 @@ import
org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import org.apache.skywalking.oap.server.receiver.otel.Handler;
import
org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule;
+import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
+import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics;
+import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics;
+import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator;
+import org.apache.skywalking.oap.server.telemetry.api.MetricsTag;
import java.util.Map;
import java.util.stream.Collectors;
@@ -54,6 +60,24 @@ public class OpenTelemetryLogHandler
private ILogAnalyzerService logAnalyzerService;
+@Getter(lazy = true)
+private final MetricsCreator metricsCreator =
manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
+
+@Getter(lazy = true)
+private final CounterMetrics receivedCounter =
getMetricsCreator().createCounter(
+"otel_logs_received",
+"The number of log request received by the OTLP receiver",
+new MetricsTag.Keys("protocol"),
+new MetricsTag.Values("otlp")
+);
+@Getter(lazy = true)
+private final HistogramMetrics processHistogram =
getMetricsCreator().createHistogramMetric(
+"otel_logs_latency",
+"The latency to process the logs request",
+new MetricsTag.Keys("protocol"),
+new MetricsTag.Values("otlp")
+);
+
@Override
public String type() {
return "otlp-logs";
@@ -69,30 +93,32 @@ public class OpenTelemetryLogHandler
@Override
public void export(ExportLogsServiceRequest request,
StreamObserver responseObserver) {
-request.getResourceLogsList().forEach(resourceLogs -> {
-final var resource = resourceLogs.getResource();
-final var attributes = resource
-.getAttributesList().stream()
-.map(it -> Map.entry(it.getKey(), buildTagValue(it)))
-.collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
-final var service = attributes.get("service.name");
-if (Strings.isNullOrEmpty(service)) {
-log.warn("No service name found in resource attributes,
discarding the log");
-return;
-}
-final var layer = attributes.getOrDefault("service.layer", "");
-final var serviceInstance =
attributes.getOrDefault("service.instance", "");
-
-resourceLog
(skywalking) 01/01: Add self observability metrics for otel handler
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch otelso117
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 10529b39ce062cf751f079d35bff5a1f898eff9a
Author: kezhenxu94
AuthorDate: Thu Sep 5 15:56:00 2024 +0800
Add self observability metrics for otel handler
---
.github/workflows/publish-docker.yaml | 1 +
.../otel/otlp/OpenTelemetryLogHandler.java | 68 +---
.../otlp/OpenTelemetryMetricRequestProcessor.java | 67 ++--
.../otel/otlp/OpenTelemetryTraceHandler.java | 72 +++---
.../src/main/resources/otel-rules/oap.yaml | 27 +---
5 files changed, 162 insertions(+), 73 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 01c7e0b20d..ca6278dc33 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - otelso117
release:
types:
- released
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
index 3d6c6bc9db..448ee77acc 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
@@ -27,6 +27,7 @@ import io.opentelemetry.proto.common.v1.KeyValue;
import io.opentelemetry.proto.logs.v1.LogRecord;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import lombok.Getter;
import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogDataBody;
@@ -39,6 +40,11 @@ import
org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import org.apache.skywalking.oap.server.receiver.otel.Handler;
import
org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule;
+import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
+import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics;
+import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics;
+import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator;
+import org.apache.skywalking.oap.server.telemetry.api.MetricsTag;
import java.util.Map;
import java.util.stream.Collectors;
@@ -54,6 +60,24 @@ public class OpenTelemetryLogHandler
private ILogAnalyzerService logAnalyzerService;
+@Getter(lazy = true)
+private final MetricsCreator metricsCreator =
manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
+
+@Getter(lazy = true)
+private final CounterMetrics receivedCounter =
getMetricsCreator().createCounter(
+"otel_logs_received",
+"The number of log request received by the OTLP receiver",
+new MetricsTag.Keys("protocol"),
+new MetricsTag.Values("otlp")
+);
+@Getter(lazy = true)
+private final HistogramMetrics processHistogram =
getMetricsCreator().createHistogramMetric(
+"otel_logs_latency",
+"The latency to process the logs request",
+new MetricsTag.Keys("protocol"),
+new MetricsTag.Values("otlp")
+);
+
@Override
public String type() {
return "otlp-logs";
@@ -69,30 +93,32 @@ public class OpenTelemetryLogHandler
@Override
public void export(ExportLogsServiceRequest request,
StreamObserver responseObserver) {
-request.getResourceLogsList().forEach(resourceLogs -> {
-final var resource = resourceLogs.getResource();
-final var attributes = resource
+getReceivedCounter().inc();
+
+try (final var timer = getProcessHistogram().createTimer()) {
+request.getResourceLogsList().forEach(resourceLogs -> {
+final var resource = resourceLogs.getResource();
+final var attributes = resource
.getAttributesList().stream()
.map(it -> Map.entry(it.getKey(), buildTagValue(it)))
.collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
-final var service = attributes.get("service.name");
-if (Strings.isNullOrEmpty(service)) {
-log.warn("No service name found in resource attributes,
di
(skywalking) branch otelso117 updated (be5d891c55 -> 10529b39ce)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git discard be5d891c55 Add self observability metrics for otel handler new 10529b39ce Add self observability metrics for otel handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (be5d891c55) \ N -- N -- N refs/heads/otelso117 (10529b39ce) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../otel/otlp/OpenTelemetryLogHandler.java | 68 +--- .../otlp/OpenTelemetryMetricRequestProcessor.java | 54 .../otel/otlp/OpenTelemetryTraceHandler.java | 72 +++--- 3 files changed, 124 insertions(+), 70 deletions(-)
(skywalking) branch otelso117 updated (e81546b7c9 -> be5d891c55)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git discard e81546b7c9 Add self observability metrics for otel handler add 9d0cb9e28e Fix wrong health check endpoint to OAP backend (#12597) new be5d891c55 Add self observability metrics for otel handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e81546b7c9) \ N -- N -- N refs/heads/otelso117 (be5d891c55) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/skywalking/oap/server/webapp/OapProxyService.java | 2 +- docs/en/changes/changes.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
(skywalking) branch master updated: Fix wrong health check endpoint to OAP backend (#12597)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 9d0cb9e28e Fix wrong health check endpoint to OAP backend (#12597)
9d0cb9e28e is described below
commit 9d0cb9e28eeebff4617a5708be87b7c45916c8cf
Author: kezhenxu94
AuthorDate: Thu Sep 5 20:12:15 2024 +0800
Fix wrong health check endpoint to OAP backend (#12597)
---
.../java/org/apache/skywalking/oap/server/webapp/OapProxyService.java | 2 +-
docs/en/changes/changes.md | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
b/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
index bffd1a53ec..2e996af455 100644
---
a/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
+++
b/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
@@ -58,7 +58,7 @@ public final class OapProxyService extends
AbstractHttpService {
private static WebClient newLoadBalancingClient(EndpointGroup oapGroup) {
final HealthCheckedEndpointGroup healthCheckedGroup =
HealthCheckedEndpointGroup
-.builder(oapGroup, "/internal/l7check")
+.builder(oapGroup, "/healthcheck")
.protocol(SessionProtocol.HTTP)
.retryInterval(Duration.ofSeconds(10))
.build();
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 6a40f3eee2..6fa5460bb2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -74,6 +74,7 @@
* Bump up dependencies to fix CVEs.
* Add a loading view for initialization page.
* Fix a bug for selectors when clicking the refresh icon.
+* Fix health check to OAP backend.
Documentation
(skywalking) 01/01: Fix wrong health check endpoint to OAP backend
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch fixhc
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 337e38f3ea79881e1486a4acb8211d782fa00f38
Author: kezhenxu94
AuthorDate: Thu Sep 5 19:07:44 2024 +0800
Fix wrong health check endpoint to OAP backend
---
.../java/org/apache/skywalking/oap/server/webapp/OapProxyService.java | 2 +-
docs/en/changes/changes.md | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
b/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
index bffd1a53ec..2e996af455 100644
---
a/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
+++
b/apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
@@ -58,7 +58,7 @@ public final class OapProxyService extends
AbstractHttpService {
private static WebClient newLoadBalancingClient(EndpointGroup oapGroup) {
final HealthCheckedEndpointGroup healthCheckedGroup =
HealthCheckedEndpointGroup
-.builder(oapGroup, "/internal/l7check")
+.builder(oapGroup, "/healthcheck")
.protocol(SessionProtocol.HTTP)
.retryInterval(Duration.ofSeconds(10))
.build();
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 6a40f3eee2..6fa5460bb2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -74,6 +74,7 @@
* Bump up dependencies to fix CVEs.
* Add a loading view for initialization page.
* Fix a bug for selectors when clicking the refresh icon.
+* Fix health check to OAP backend.
Documentation
(skywalking) branch otelso117 updated (a3e832cf06 -> e81546b7c9)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git discard a3e832cf06 Add self observability metrics for otel handler new e81546b7c9 Add self observability metrics for otel handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a3e832cf06) \ N -- N -- N refs/heads/otelso117 (e81546b7c9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: oap-server/server-starter/src/main/resources/otel-rules/oap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(skywalking) 01/01: Add self observability metrics for otel handler
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch otelso117
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit a3e832cf0644f96f5675fcdf2ac01aa5be43a270
Author: kezhenxu94
AuthorDate: Thu Sep 5 15:56:00 2024 +0800
Add self observability metrics for otel handler
---
.github/workflows/publish-docker.yaml | 1 +
.../otlp/OpenTelemetryMetricRequestProcessor.java | 27 ++
.../src/main/resources/otel-rules/oap.yaml | 27 ++
3 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 01c7e0b20d..ca6278dc33 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - otelso117
release:
types:
- released
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
index 0be3aaaf2c..c85087338f 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
@@ -42,6 +42,10 @@ import
org.apache.skywalking.oap.server.library.util.prometheus.metrics.Histogra
import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Metric;
import
org.apache.skywalking.oap.server.library.util.prometheus.metrics.Summary;
import org.apache.skywalking.oap.server.receiver.otel.OtelMetricReceiverConfig;
+import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
+import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics;
+import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator;
+import org.apache.skywalking.oap.server.telemetry.api.MetricsTag;
import java.io.IOException;
import java.util.HashMap;
@@ -49,6 +53,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Stream;
+import lombok.Getter;
import static
io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA;
import static
io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_UNSPECIFIED;
@@ -73,7 +78,27 @@ public class OpenTelemetryMetricRequestProcessor implements
Service {
.build();
private List converters;
+@Getter(lazy = true)
+private final MetricsCreator metricsCreator =
manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
+
+@Getter(lazy = true)
+private final CounterMetrics receivedCounter =
getMetricsCreator().createCounter(
+"otel_metrics_received",
+"The number of metrics received by the OTLP receiver",
+new MetricsTag.Keys("protocol"),
+new MetricsTag.Values("otlp")
+);
+@Getter(lazy = true)
+private final CounterMetrics processedCounter =
getMetricsCreator().createCounter(
+"otel_metrics_processed",
+"The number of metrics processed by the OTLP receiver",
+new MetricsTag.Keys("protocol"),
+new MetricsTag.Values("otlp")
+);
+
public void processMetricsRequest(final ExportMetricsServiceRequest
requests) {
+getReceivedCounter().inc(requests.getResourceMetricsList().size());
+
requests.getResourceMetricsList().forEach(request -> {
if (log.isDebugEnabled()) {
log.debug("Resource attributes: {}",
request.getResource().getAttributesList());
@@ -104,6 +129,8 @@ public class OpenTelemetryMetricRequestProcessor implements
Service {
tryIt,
"Convert OTEL metric to prometheus metric"
);
+
+getProcessedCounter().inc();
});
}
diff --git a/oap-server/server-starter/src/main/resources/otel-rules/oap.yaml
b/oap-server/server-starter/src/main/resources/otel-rules/oap.yaml
index 6de0e00b53..95143353bc 100644
--- a/oap-server/server-starter/src/main/resources/otel-rules/oap.yaml
+++ b/oap-server/server-starter/src/main/resources/otel-rules/oap.yaml
@@ -37,15 +37,17 @@ metricsRules:
- name: instance_jvm_memory_bytes_used
exp: jvm_memory_bytes_used.sum(['service', 'host_name'])
- name: instance_jvm_gc_count
-exp: "jvm_gc_collection_seconds_count.t
(skywalking) branch otelso117 created (now a3e832cf06)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch otelso117 in repository https://gitbox.apache.org/repos/asf/skywalking.git at a3e832cf06 Add self observability metrics for otel handler This branch includes the following new commits: new a3e832cf06 Add self observability metrics for otel handler 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-python) branch dependabot/github_actions/dot-github/workflows/actions/download-artifact-4.1.7 deleted (was 1fc8045)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch dependabot/github_actions/dot-github/workflows/actions/download-artifact-4.1.7 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git was 1fc8045 Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows 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: Split pipelines for each monitoring feature (#184)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 a092df1 Split pipelines for each monitoring feature (#184)
a092df1 is described below
commit a092df1cf99fd57c9ca11a70ee3a14796e2a07cc
Author: kezhenxu94
AuthorDate: Tue Sep 3 19:42:59 2024 +0800
Split pipelines for each monitoring feature (#184)
---
.../templates/otel-collector-config.yaml | 47 ++
1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/deploy/platform/kubernetes/templates/otel-collector-config.yaml
b/deploy/platform/kubernetes/templates/otel-collector-config.yaml
index 9d163aa..33a9f37 100644
--- a/deploy/platform/kubernetes/templates/otel-collector-config.yaml
+++ b/deploy/platform/kubernetes/templates/otel-collector-config.yaml
@@ -16,7 +16,22 @@
# under the License.
#
{{- if .Values.opentelemetry.enabled }}
-
+{{- $configs := list
+ "opentelemetry-config-nginx"
+ "opentelemetry-config-apisix"
+ "opentelemetry-config-istiod-monitor"
+ "opentelemetry-config-kubernetes-monitor"
+ "opentelemetry-config-mysql-monitor"
+ "opentelemetry-config-postgresql-monitor"
+ "opentelemetry-config-so11y"
+ "opentelemetry-config-vm"
+ "opentelemetry-config-elasticsearch-monitor"
+ "opentelemetry-config-rabbitmq-monitor"
+ "opentelemetry-config-mongodb-monitor"
+ "opentelemetry-config-rocketmq-monitor"
+ "opentelemetry-config-pulsar-monitor"
+ "opentelemetry-config-activemq-monitor"
+}}
---
apiVersion: v1
kind: ConfigMap
@@ -25,23 +40,15 @@ metadata:
data:
config.yaml: |
receivers:
- prometheus:
+ {{- $root := . -}}
+ {{- range $idx, $config := $configs -}}
+ {{- if not (include $config $root | trim | empty) }}
+ prometheus/{{ $idx }}:
config:
scrape_configs:
-{{- include "opentelemetry-config-nginx" . | indent 12 }}
-{{- include "opentelemetry-config-apisix" . | indent 12 }}
-{{- include "opentelemetry-config-istiod-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-kubernetes-monitor" . | indent
12 }}
-{{- include "opentelemetry-config-mysql-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-postgresql-monitor" . | indent
12 }}
-{{- include "opentelemetry-config-so11y" . | indent 12 }}
-{{- include "opentelemetry-config-vm" . | indent 12 }}
-{{- include "opentelemetry-config-elasticsearch-monitor" . |
indent 12 }}
-{{- include "opentelemetry-config-rabbitmq-monitor" . | indent 12
}}
-{{- include "opentelemetry-config-mongodb-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-rocketmq-monitor" . | indent 12
}}
-{{- include "opentelemetry-config-pulsar-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-activemq-monitor" . | indent 12
}}
+{{- include $config $root | indent 12 }}
+ {{- end }}
+ {{- end }}
exporters:
otlp:
@@ -60,7 +67,13 @@ data:
service:
pipelines:
metrics:
- receivers: [ prometheus ]
+ receivers:
+ {{- $root := . }}
+ {{- range $idx, $config := $configs }}
+ {{- if not (include $config $root | trim | empty) }}
+- prometheus/{{ $idx }}
+ {{- end }}
+ {{- end }}
exporters: [ otlp,logging ]
extensions:
- health_check
(skywalking-showcase) branch splitpipeline deleted (was 892b784)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch splitpipeline in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git was 892b784 Split pipelines for each monitoring feature 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) 01/01: Split pipelines for each monitoring feature
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch splitpipeline
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 892b78488486010d9fd8a57d687c5cd80e01e0f8
Author: kezhenxu94
AuthorDate: Tue Sep 3 19:41:51 2024 +0800
Split pipelines for each monitoring feature
---
.../templates/otel-collector-config.yaml | 47 ++
1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/deploy/platform/kubernetes/templates/otel-collector-config.yaml
b/deploy/platform/kubernetes/templates/otel-collector-config.yaml
index 9d163aa..33a9f37 100644
--- a/deploy/platform/kubernetes/templates/otel-collector-config.yaml
+++ b/deploy/platform/kubernetes/templates/otel-collector-config.yaml
@@ -16,7 +16,22 @@
# under the License.
#
{{- if .Values.opentelemetry.enabled }}
-
+{{- $configs := list
+ "opentelemetry-config-nginx"
+ "opentelemetry-config-apisix"
+ "opentelemetry-config-istiod-monitor"
+ "opentelemetry-config-kubernetes-monitor"
+ "opentelemetry-config-mysql-monitor"
+ "opentelemetry-config-postgresql-monitor"
+ "opentelemetry-config-so11y"
+ "opentelemetry-config-vm"
+ "opentelemetry-config-elasticsearch-monitor"
+ "opentelemetry-config-rabbitmq-monitor"
+ "opentelemetry-config-mongodb-monitor"
+ "opentelemetry-config-rocketmq-monitor"
+ "opentelemetry-config-pulsar-monitor"
+ "opentelemetry-config-activemq-monitor"
+}}
---
apiVersion: v1
kind: ConfigMap
@@ -25,23 +40,15 @@ metadata:
data:
config.yaml: |
receivers:
- prometheus:
+ {{- $root := . -}}
+ {{- range $idx, $config := $configs -}}
+ {{- if not (include $config $root | trim | empty) }}
+ prometheus/{{ $idx }}:
config:
scrape_configs:
-{{- include "opentelemetry-config-nginx" . | indent 12 }}
-{{- include "opentelemetry-config-apisix" . | indent 12 }}
-{{- include "opentelemetry-config-istiod-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-kubernetes-monitor" . | indent
12 }}
-{{- include "opentelemetry-config-mysql-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-postgresql-monitor" . | indent
12 }}
-{{- include "opentelemetry-config-so11y" . | indent 12 }}
-{{- include "opentelemetry-config-vm" . | indent 12 }}
-{{- include "opentelemetry-config-elasticsearch-monitor" . |
indent 12 }}
-{{- include "opentelemetry-config-rabbitmq-monitor" . | indent 12
}}
-{{- include "opentelemetry-config-mongodb-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-rocketmq-monitor" . | indent 12
}}
-{{- include "opentelemetry-config-pulsar-monitor" . | indent 12 }}
-{{- include "opentelemetry-config-activemq-monitor" . | indent 12
}}
+{{- include $config $root | indent 12 }}
+ {{- end }}
+ {{- end }}
exporters:
otlp:
@@ -60,7 +67,13 @@ data:
service:
pipelines:
metrics:
- receivers: [ prometheus ]
+ receivers:
+ {{- $root := . }}
+ {{- range $idx, $config := $configs }}
+ {{- if not (include $config $root | trim | empty) }}
+- prometheus/{{ $idx }}
+ {{- end }}
+ {{- end }}
exporters: [ otlp,logging ]
extensions:
- health_check
(skywalking-showcase) branch splitpipeline created (now 892b784)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch splitpipeline in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git at 892b784 Split pipelines for each monitoring feature This branch includes the following new commits: new 892b784 Split pipelines for each monitoring feature 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 codeql deleted (was 752cb6ebd8)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git was 752cb6ebd8 Bump up codeql GHA 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: Bump up codeql GHA (#12547)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 9f14c15345 Bump up codeql GHA (#12547)
9f14c15345 is described below
commit 9f14c153453c0686786319c991cd091aa51f9c5a
Author: kezhenxu94
AuthorDate: Tue Aug 20 11:02:14 2024 +0800
Bump up codeql GHA (#12547)
---
.github/workflows/codeql.yaml | 6 ++
docs/en/changes/changes.md| 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 4510063cef..4ab92bb148 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -19,8 +19,6 @@ name: "CodeQL"
on:
push:
branches: ["master"]
-paths:
- - "**.java"
pull_request:
branches: ["master"]
paths:
@@ -55,11 +53,11 @@ jobs:
submodules: true
- name: Initialize CodeQL
-uses: github/codeql-action/init@v2
+uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- run: ./mvnw -q -Dmaven.test.skip=true clean install || ./mvnw -q
-Dmaven.test.skip=true clean install
- name: Perform CodeQL Analysis
-uses: github/codeql-action/analyze@v2
+uses: github/codeql-action/analyze@v3
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 6deb3943f3..ad526ac833 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,7 +5,7 @@
* E2E: bump up the version of the opentelemetry-collector to 0.102.1.
* Push snapshot data-generator docker image to ghcr.io.
* Bump up skywalking-infra-e2e to work around GHA removing `docker-compose` v1.
-* Fix CodeQL CI.
+* Bump up CodeQL GitHub Actions.
OAP Server
(skywalking) branch codeql updated (9365bd028e -> 752cb6ebd8)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 9365bd028e Bump up codeql GHA add 752cb6ebd8 Bump up codeql GHA This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9365bd028e) \ N -- N -- N refs/heads/codeql (752cb6ebd8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: docs/en/changes/changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking) 01/01: Bump up codeql GHA
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch codeql
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 9365bd028eea215f6d0333e9aaf1e9f0d89e4b25
Author: kezhenxu94
AuthorDate: Mon Aug 19 16:22:03 2024 +0800
Bump up codeql GHA
---
.github/workflows/codeql.yaml | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 4510063cef..4ab92bb148 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -19,8 +19,6 @@ name: "CodeQL"
on:
push:
branches: ["master"]
-paths:
- - "**.java"
pull_request:
branches: ["master"]
paths:
@@ -55,11 +53,11 @@ jobs:
submodules: true
- name: Initialize CodeQL
-uses: github/codeql-action/init@v2
+uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- run: ./mvnw -q -Dmaven.test.skip=true clean install || ./mvnw -q
-Dmaven.test.skip=true clean install
- name: Perform CodeQL Analysis
-uses: github/codeql-action/analyze@v2
+uses: github/codeql-action/analyze@v3
(skywalking) branch codeql updated (6f52730b9f -> 9365bd028e)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 6f52730b9f Bump up codeql GHA discard 7e473f9014 Bump up codeql GHA discard 5e72ba5112 Test codeql new 9365bd028e Bump up codeql GHA This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6f52730b9f) \ N -- N -- N refs/heads/codeql (9365bd028e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(skywalking) branch codeql updated: Bump up codeql GHA
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/codeql by this push: new 6f52730b9f Bump up codeql GHA 6f52730b9f is described below commit 6f52730b9f39ef6b9c046ecb595472c7fd73ed33 Author: kezhenxu94 AuthorDate: Tue Aug 20 10:09:06 2024 +0800 Bump up codeql GHA --- .github/workflows/codeql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 837f076aa0..4ab92bb148 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -18,7 +18,7 @@ name: "CodeQL" on: push: -branches: ["master", "codeql"] +branches: ["master"] pull_request: branches: ["master"] paths:
(skywalking) branch codeql updated: Bump up codeql GHA
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch codeql
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/codeql by this push:
new 7e473f9014 Bump up codeql GHA
7e473f9014 is described below
commit 7e473f90145c7ca7dc12878deaa58f0816d5e049
Author: kezhenxu94
AuthorDate: Tue Aug 20 09:21:26 2024 +0800
Bump up codeql GHA
---
.github/workflows/codeql.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 7cc65ade3a..837f076aa0 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -53,11 +53,11 @@ jobs:
submodules: true
- name: Initialize CodeQL
-uses: github/codeql-action/init@v2
+uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- run: ./mvnw -q -Dmaven.test.skip=true clean install || ./mvnw -q
-Dmaven.test.skip=true clean install
- name: Perform CodeQL Analysis
-uses: github/codeql-action/analyze@v2
+uses: github/codeql-action/analyze@v3
(skywalking) branch codeql updated (ade89e2dfe -> 5e72ba5112)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git discard ade89e2dfe Test codeql new 5e72ba5112 Test codeql This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ade89e2dfe) \ N -- N -- N refs/heads/codeql (5e72ba5112) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/codeql.yaml | 2 -- 1 file changed, 2 deletions(-)
(skywalking) 01/01: Test codeql
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 5e72ba511215688a4ad20c0a3aeaf44a52bfe3bb Author: kezhenxu94 AuthorDate: Mon Aug 19 16:22:03 2024 +0800 Test codeql --- .github/workflows/codeql.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 4510063cef..7cc65ade3a 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -18,9 +18,7 @@ name: "CodeQL" on: push: -branches: ["master"] -paths: - - "**.java" +branches: ["master", "codeql"] pull_request: branches: ["master"] paths:
(skywalking) branch codeql created (now ade89e2dfe)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git at ade89e2dfe Test codeql This branch includes the following new commits: new ade89e2dfe Test codeql 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: Test codeql
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch codeql in repository https://gitbox.apache.org/repos/asf/skywalking.git commit ade89e2dfec1ce643e59b60de6a091af77617c95 Author: kezhenxu94 AuthorDate: Mon Aug 19 16:22:03 2024 +0800 Test codeql --- .github/workflows/codeql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 4510063cef..f3cb52d014 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -18,7 +18,7 @@ name: "CodeQL" on: push: -branches: ["master"] +branches: ["master", "codeql"] paths: - "**.java" pull_request:
(skywalking-banyandb-helm) branch hanahmily-patch-1 deleted (was 312bacc)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch hanahmily-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git was 312bacc Set kind version to v1.21.14 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-infra-e2e) 03/03: Upgrade testcontainers to use docker compose
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch composev2
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git
commit d5b50f2710c89c1578c8fb93922f0f42e0243133
Author: kezhenxu94
AuthorDate: Mon Aug 5 22:21:23 2024 +0800
Upgrade testcontainers to use docker compose
---
.github/workflows/e2e-test.yaml| 11 ++--
commands/setup/setup.go| 7 +--
go.mod | 24 +
go.sum | 60 +++---
internal/components/setup/compose.go | 11 ++--
internal/components/setup/compose_provider.go | 15 +++---
.../components/setup/{compose.go => composev2.go} | 22 +++-
internal/components/setup/kind.go | 12 ++---
8 files changed, 76 insertions(+), 86 deletions(-)
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
index a39c498..2146345 100644
--- a/.github/workflows/e2e-test.yaml
+++ b/.github/workflows/e2e-test.yaml
@@ -5,9 +5,9 @@
# 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
@@ -26,13 +26,13 @@ on:
pull_request:
branches:
- main
+ - composev2
jobs:
build:
name: E2E Test
runs-on: ubuntu-latest
steps:
-
- name: Set up Go 1.18
uses: actions/setup-go@v4
with:
@@ -48,7 +48,4 @@ jobs:
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@main
with:
- e2e-file: ./test/e2e/e2e.yaml
-
-
-
+ e2e-file: ./test/e2e/e2e.yaml
diff --git a/commands/setup/setup.go b/commands/setup/setup.go
index 0d73aab..eeb8b01 100644
--- a/commands/setup/setup.go
+++ b/commands/setup/setup.go
@@ -63,18 +63,19 @@ func DoSetupAccordingE2E() error {
e2eConfig := config.GlobalConfig.E2EConfig
setup.InitLogFollower()
- if e2eConfig.Setup.Env == constant.Kind {
+ switch e2eConfig.Setup.Env {
+ case constant.Kind:
err := setup.KindSetup(&e2eConfig)
if err != nil {
return err
}
- } else if e2eConfig.Setup.Env == constant.Compose {
+ case constant.Compose:
err := setup.ComposeSetup(&e2eConfig)
if err != nil {
return err
}
return nil
- } else {
+ default:
return fmt.Errorf("no such env for setup: [%s]. should use kind
or compose instead", e2eConfig.Setup.Env)
}
diff --git a/go.mod b/go.mod
index b126b17..c353ceb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
module github.com/apache/skywalking-infra-e2e
-go 1.22.2
+go 1.22.0
+
+toolchain go1.22.2
require (
github.com/docker/docker v27.0.3+incompatible
@@ -9,8 +11,8 @@ require (
github.com/pterm/pterm v0.12.45
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.1
- github.com/testcontainers/testcontainers-go v0.32.0
- github.com/testcontainers/testcontainers-go/modules/compose v0.32.0
+ github.com/testcontainers/testcontainers-go
v0.32.1-0.20240718121053-70b90cce99b4
+ github.com/testcontainers/testcontainers-go/modules/compose
v0.32.1-0.20240718121053-70b90cce99b4
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
@@ -199,20 +201,20 @@ require (
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/mock v0.4.0 // indirect
- golang.org/x/crypto v0.22.0 // indirect
+ golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
- golang.org/x/net v0.24.0 // indirect
- golang.org/x/oauth2 v0.11.0 // indirect
+ golang.org/x/net v0.26.0 // indirect
+ golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
- golang.org/x/term v0.19.0 // indirect
- golang.org/x/text v0.14.0 // indirect
+ golang.org/x/term v0.21.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b //
indirect
- google.golang.org/genproto/googleapis/api
v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-
(skywalking-infra-e2e) branch composev2 created (now d5b50f2)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch composev2 in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git at d5b50f2 Upgrade testcontainers to use docker compose This branch includes the following new commits: new 0bd9f90 Bump up to go 1.22 new e9e4b45 Bump up dependencies new d5b50f2 Upgrade testcontainers to use docker compose The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-infra-e2e) 01/03: Bump up to go 1.22
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch composev2
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git
commit 0bd9f90ad68263d7a381d26e1ec685835fb7234a
Author: kezhenxu94
AuthorDate: Sat Aug 3 19:33:12 2024 +0800
Bump up to go 1.22
---
.golangci.yml | 20 ++--
commands/cleanup/cleanup.go | 2 +-
commands/root.go | 6 ++
commands/run/run.go | 2 +-
commands/setup/setup.go | 2 +-
commands/trigger/trigger.go | 2 +-
commands/verify/verify.go | 2 +-
go.mod| 2 +-
internal/components/setup/compose.go | 13 +++--
internal/components/verifier/funcs.go | 2 +-
internal/util/k8s.go | 2 +-
11 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index 1e9901e..b959a62 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,26 +5,26 @@
# 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.
-#
+#
run:
tests: false
go: "1.18"
- skip-dirs:
+issues:
+ exclude-dirs:
- third-party
linters-settings:
- govet:
-check-shadowing: true
+ shadow: true
revive:
min-confidence: 0
gocyclo:
@@ -92,7 +92,6 @@ linters-settings:
linters:
enable:
-- deadcode
- dogsled
- dupl
- errcheck
@@ -114,14 +113,7 @@ linters:
- typecheck
- unconvert
- unused
-- varcheck
- whitespace
disable:
-- structcheck
- depguard
- nakedret
-
-service:
- golangci-lint-version: 1.20.x
- prepare:
-- echo "here I can run custom commands, but no preparation needed for this
repo"
diff --git a/commands/cleanup/cleanup.go b/commands/cleanup/cleanup.go
index fdc5daa..24976f8 100644
--- a/commands/cleanup/cleanup.go
+++ b/commands/cleanup/cleanup.go
@@ -32,7 +32,7 @@ import (
var Cleanup = &cobra.Command{
Use: "cleanup",
Short: "",
- RunE: func(cmd *cobra.Command, args []string) error {
+ RunE: func(_ *cobra.Command, _ []string) error {
err := DoCleanupAccordingE2E()
if err != nil {
err = fmt.Errorf("[Cleanup] %s", err)
diff --git a/commands/root.go b/commands/root.go
index 31e3c8f..2268634 100644
--- a/commands/root.go
+++ b/commands/root.go
@@ -34,9 +34,7 @@ import (
"github.com/apache/skywalking-infra-e2e/internal/util"
)
-var (
- verbosity string
-)
+var verbosity string
// Root represents the base command when called without any subcommands
var Root = &cobra.Command{
@@ -45,7 +43,7 @@ var Root = &cobra.Command{
Version: version,
SilenceErrors: true,
SilenceUsage: true,
- PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+ PersistentPreRunE: func(_ *cobra.Command, _ []string) error {
config.ReadGlobalConfigFile()
level, err := logrus.ParseLevel(verbosity)
diff --git a/commands/run/run.go b/commands/run/run.go
index a304779..733de27 100644
--- a/commands/run/run.go
+++ b/commands/run/run.go
@@ -33,7 +33,7 @@ import (
var Run = &cobra.Command{
Use: "run",
Short: "",
- RunE: func(cmd *cobra.Command, args []string) error {
+ RunE: func(_ *cobra.Command, _ []string) error {
err := runAccordingE2E()
if err != nil {
return err
diff --git a/commands/setup/setup.go b/commands/setup/setup.go
index a932d4d..0d73aab 100644
--- a/commands/setup/setup.go
+++ b/commands/setup/setup.go
@@ -33,7 +33,7 @@ import (
var Setup = &cobra.Command{
Use: "setup",
Short: "",
- RunE: func(cmd *cobra.Command, args []string) error {
+ RunE: func(_ *cobra.Command, _ []string) error {
if err := util.CheckDockerDaemon(); err != nil {
return err
}
diff --git a/commands/trigger/trigger.go b/commands/trigger/trigger.go
index cb49b54..3c013fb 100644
--- a/commands/trigger/trigger.go
+++ b/commands/trigger/trigger.go
@@ -32,7 +32,7 @@ import (
var Trigger = &cobra.Command{
Use: "trigger",
- RunE: func(cmd *cobra.Command, args []s
(skywalking) branch master updated: bug fix: concurrent increase by CounterWindow may cause PriorityQueue broken (#12505)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 5c33ee016d bug fix: concurrent increase by CounterWindow may cause
PriorityQueue broken (#12505)
5c33ee016d is described below
commit 5c33ee016dcc45585e158624981c2b7584aa99b7
Author: kael
AuthorDate: Sun Aug 4 20:33:11 2024 +0800
bug fix: concurrent increase by CounterWindow may cause PriorityQueue
broken (#12505)
---
docs/en/changes/changes.md | 1 +
.../meter/analyzer/dsl/counter/CounterWindow.java | 34 --
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 43402c4a01..3b4d290aa2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -47,6 +47,7 @@
* BanyanDB: stream sort-by `time` query, use internal time-series rather than
`index` to improve the query performance.
* Bump up graphql-java to 21.5.
* Add Unknown Node when receive Kubernetes peer address is not aware in
current cluster.
+* Fix CounterWindow concurrent increase cause NPE by PriorityQueue
UI
diff --git
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java
index b1e4eac68a..5e7e6039ee 100644
---
a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java
+++
b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java
@@ -48,25 +48,27 @@ public class CounterWindow {
public Tuple2 increase(String name, ImmutableMap labels, Double value, long windowSize, long now) {
ID id = new ID(name, labels);
Queue> window = windows.computeIfAbsent(id,
unused -> new PriorityQueue<>());
-window.offer(Tuple.of(now, value));
-long waterLevel = now - windowSize;
-Tuple2 peek = window.peek();
-if (peek._1 > waterLevel) {
-return peek;
-}
+synchronized (window) {
+window.offer(Tuple.of(now, value));
+long waterLevel = now - windowSize;
+Tuple2 peek = window.peek();
+if (peek._1 > waterLevel) {
+return peek;
+}
-Tuple2 result = peek;
-while (peek._1 < waterLevel) {
-result = window.poll();
-peek = window.element();
-}
+Tuple2 result = peek;
+while (peek._1 < waterLevel) {
+result = window.poll();
+peek = window.element();
+}
-// Choose the closed slot to the expected timestamp
-if (waterLevel - result._1 <= peek._1 - waterLevel) {
-return result;
-}
+// Choose the closed slot to the expected timestamp
+if (waterLevel - result._1 <= peek._1 - waterLevel) {
+return result;
+}
-return peek;
+return peek;
+}
}
public Tuple2 pop(String name, ImmutableMap
labels, Double value, long now) {
(skywalking-infra-e2e) branch installdockercompose updated (3f4ab14 -> ca90fc7)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch installdockercompose in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git from 3f4ab14 Install docker-compose if absent add ca90fc7 Install docker-compose for self-test No new revisions were added by this update. Summary of changes: .github/workflows/e2e-test.yaml | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-)
(skywalking-infra-e2e) branch installdockercompose updated (0aa0b34 -> 3f4ab14)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch installdockercompose in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git discard 0aa0b34 Install docker-compose if absent add 3f4ab14 Install docker-compose if absent This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0aa0b34) \ N -- N -- N refs/heads/installdockercompose (3f4ab14) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(skywalking-infra-e2e) 01/01: Install docker-compose if absent
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch installdockercompose
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git
commit 0aa0b34a8443c89d693ae4eb02818eca6a917ac2
Author: kezhenxu94
AuthorDate: Sun Aug 4 13:32:49 2024 +0800
Install docker-compose if absent
---
action.yaml | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/action.yaml b/action.yaml
index c627fd2..9fbb6ee 100644
--- a/action.yaml
+++ b/action.yaml
@@ -27,10 +27,19 @@ inputs:
batch-mode:
description: Whether to run in batch mode, all interactive operations are
disabled
required: false
-default: 'true'
+default: "true"
runs:
using: "composite"
steps:
+- name: Install docker-compose
+ shell: bash
+ if: runner.os != 'Windows'
+ run: |
+if ! command docker-compose; then
+ echo "Installing docker-compose"
+ sudo curl -L
"https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname
-s)-$(uname -m)" -o /usr/local/bin/docker-compose
+ sudo chmod +x /usr/local/bin/docker-compose
+fi
- name: Set up Go 1.18
uses: actions/setup-go@v4
with:
@@ -39,7 +48,7 @@ runs:
- shell: bash
run: make -C $GITHUB_ACTION_PATH install DESTDIR=/usr/local/bin
- name: E2E Dir Generator
- id: 'e2e-dir-generator'
+ id: "e2e-dir-generator"
shell: bash
run: |
WORK_DIR="${{ runner.temp }}/skywalking-infra-e2e"
(skywalking-infra-e2e) branch installdockercompose created (now 0aa0b34)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch installdockercompose in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git at 0aa0b34 Install docker-compose if absent This branch includes the following new commits: new 0aa0b34 Install docker-compose if absent 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) branch main updated: fix: fix invalid image tag of otel-collector in docker-compose mode (#183)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 7caec68 fix: fix invalid image tag of otel-collector in
docker-compose mode (#183)
7caec68 is described below
commit 7caec6857d4db27df933a92dff599c5a012c51b0
Author: gyqsophila
AuthorDate: Sat Aug 3 21:50:49 2024 +0800
fix: fix invalid image tag of otel-collector in docker-compose mode (#183)
---
deploy/platform/docker/docker-compose.activemq-monitor.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deploy/platform/docker/docker-compose.activemq-monitor.yaml
b/deploy/platform/docker/docker-compose.activemq-monitor.yaml
index d2a809f..ee65c37 100644
--- a/deploy/platform/docker/docker-compose.activemq-monitor.yaml
+++ b/deploy/platform/docker/docker-compose.activemq-monitor.yaml
@@ -30,7 +30,7 @@ services:
- sw
otel-collector:
-image: ${OTEL_COLLECTOR_IMAGE}:${OTEL_COLLECTOR_VERSION}
+image: ${OTEL_COLLECTOR_IMAGE}:${OTEL_COLLECTOR_IMAGE_TAG}
environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: ${BACKEND_SERVICE}:11800
OTEL_TARGET_ADDREESS: amqexporter:5556
(skywalking) branch master updated: Bump up graphql-java (#12495)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 212431e1ed Bump up graphql-java (#12495) 212431e1ed is described below commit 212431e1edbc1d5a4d68dfcd8d23da673bea3e1b Author: kezhenxu94 AuthorDate: Wed Jul 31 14:49:07 2024 +0800 Bump up graphql-java (#12495) --- dist-material/release-docs/LICENSE | 4 ++-- docs/en/changes/changes.md | 1 + oap-server-bom/pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 6e0abc9d70..2f1fdd10e3 100644 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -237,7 +237,7 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/com.google.guava/listenablefuture/.0-empty-to-avoid-conflict-with-guava Apache-2.0 https://mvnrepository.com/artifact/com.google.inject/guice/4.1.0 Apache-2.0 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/2.8 Apache-2.0 -https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.0 Apache-2.0 +https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.1 Apache-2.0 https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.29.3 Apache-2.0 https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.29.3 Apache-2.0 https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.29.3 Apache-2.0 @@ -514,7 +514,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://npmjs.com/package/axios/node_modules/proxy-from-env/v/1.1.0 1.1.0 MIT https://npmjs.com/package/batch-processor/v/1.0.0 1.0.0 MIT https://mvnrepository.com/artifact/com.graphql-java-kickstart/graphql-java-tools/13.0.1 MIT -https://mvnrepository.com/artifact/com.graphql-java/graphql-java/21.0 MIT +https://mvnrepository.com/artifact/com.graphql-java/graphql-java/21.5 MIT https://mvnrepository.com/artifact/com.graphql-java/graphql-java-extended-scalars/18.1 MIT https://npmjs.com/package/combined-stream/v/1.0.8 1.0.8 MIT https://npmjs.com/package/component-emitter/v/1.3.0 1.3.0 MIT diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 20e463feb3..eff84e5d9a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -44,6 +44,7 @@ * Bump up Armeria and transitive dependencies. * BanyanDB: if the model column is already a `@BanyanDB.TimestampColumn`, set `@BanyanDB.NoIndexing` on it to reduce indexes. * BanyanDB: stream sort-by `time` query, use internal time-series rather than `index` to improve the query performance. +* Bump up graphql-java to 21.5. UI diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 083372ee87..2c548e698d 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -32,7 +32,7 @@ 2.17.1 2.11.0 13.0.1 -21.0 +21.5 18.1 3.14.9 4.5.13
(skywalking) branch master updated: Add an http endpoint wrapper for health check (#12485)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 6462436ae9 Add an http endpoint wrapper for health check (#12485) 6462436ae9 is described below commit 6462436ae97404cdcaa8770a6d3197bd0156ff14 Author: kezhenxu94 AuthorDate: Mon Jul 29 15:16:55 2024 +0800 Add an http endpoint wrapper for health check (#12485) --- .licenserc.yaml| 6 +-- dist-material/release-docs/LICENSE | 32 +++ docs/en/api/health-check.md| 9 + docs/en/changes/changes.md | 2 + docs/en/setup/backend/backend-health-check.md | 4 +- docs/menu.yml | 2 + oap-server-bom/pom.xml | 8 +++- .../oap/server/core/query/type/HealthStatus.java | 2 + .../checker/provider/HealthCheckerHttpService.java | 45 ++ .../checker/provider/HealthCheckerProvider.java| 15 +++- .../oap/server/library/server/http/HTTPServer.java | 2 - 11 files changed, 102 insertions(+), 25 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index e9f54c0804..48421ae282 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -106,10 +106,10 @@ dependency: version: 2.13.4 license: Apache-2.0 - name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 - version: 2.16.1 + version: 2.17.1 license: Apache-2.0 - name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 - version: 2.16.1 + version: 2.17.1 license: Apache-2.0 - name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml version: 2.15.2 @@ -139,7 +139,7 @@ dependency: version: 0.6.13 license: Apache-2.0 - name: com.aayushatharva.brotli4j:service - version: 1.15.0 + version: 1.16.0 license: Apache-2.0 - name: io.vertx:vertx-grpc version: 4.5.1 diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 7cbf202b27..6e0abc9d70 100644 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -210,8 +210,8 @@ The following components are provided under the Apache-2.0 License. See project The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/pgv-java-stub/0.6.13 Apache-2.0 https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/protoc-gen-validate/0.6.13 Apache-2.0 - https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.15.0 Apache-2.0 - https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.15.0 Apache-2.0 + https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.16.0 Apache-2.0 + https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/service/1.16.0 Apache-2.0 https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-auth-plugin/2.3.2 Apache-2.0 https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/2.3.2 Apache-2.0 https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-encryption-plugin/2.3.2 Apache-2.0 @@ -222,8 +222,8 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.16.0 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.2 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.12.0 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.16.1 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.1 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.17.1 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.1 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-kotlin/2.13.4 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1 Apache-2.0 https://mvnrepository.com/artifact/com.google.api.grpc/proto-google-common-protos/2.29.0 Apache-2.0 @@ -238,12 +238,12 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/com.google.inject/guice/4.1.0 Apache-2.0 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/2.8 Apache-2.0 https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.0 Apache-2.0 -https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.27.3 Apache-2.0 - https
(skywalking-python) branch master updated: Fix pulsar client not support init arguments other than service_url (#351)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new 1ce6910 Fix pulsar client not support init arguments other than
service_url (#351)
1ce6910 is described below
commit 1ce69108e33e9f72f87ef53619660aee2e5c033a
Author: Tsonglew
AuthorDate: Sun Jul 28 12:15:50 2024 +0800
Fix pulsar client not support init arguments other than service_url (#351)
---
skywalking/plugins/sw_pulsar.py | 4 ++--
tests/plugin/data/sw_pulsar/services/consumer.py | 17 -
tests/plugin/data/sw_pulsar/services/producer.py | 17 -
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/skywalking/plugins/sw_pulsar.py b/skywalking/plugins/sw_pulsar.py
index 33b24a3..8976f81 100644
--- a/skywalking/plugins/sw_pulsar.py
+++ b/skywalking/plugins/sw_pulsar.py
@@ -45,8 +45,8 @@ def install():
nonlocal _peer
_peer = value
-def _sw_init(self, service_url):
-__init(self, service_url)
+def _sw_init(self, service_url, *args, **kwargs):
+__init(self, service_url, *args, **kwargs)
set_peer(service_url)
def _sw_send_func(_send):
diff --git a/tests/plugin/data/sw_pulsar/services/consumer.py
b/tests/plugin/data/sw_pulsar/services/consumer.py
index fc444b1..ac842ef 100644
--- a/tests/plugin/data/sw_pulsar/services/consumer.py
+++ b/tests/plugin/data/sw_pulsar/services/consumer.py
@@ -18,7 +18,22 @@
if __name__ == '__main__':
import pulsar
-client = pulsar.Client(service_url='pulsar://pulsar-server:6650')
+client = pulsar.Client(
+service_url='pulsar://pulsar-server:6650',
+authentication=None,
+operation_timeout_seconds=30,
+io_threads=1,
+message_listener_threads=1,
+concurrent_lookup_requests=5,
+log_conf_file_path=None,
+use_tls=False,
+tls_trust_certs_file_path=None,
+tls_allow_insecure_connection=False,
+tls_validate_hostname=False,
+logger=None,
+connection_timeout_ms=1,
+listener_name=None
+)
consumer = client.subscribe('sw-topic', 'sw-subscription')
while True:
diff --git a/tests/plugin/data/sw_pulsar/services/producer.py
b/tests/plugin/data/sw_pulsar/services/producer.py
index 9505f82..7cb0b3c 100644
--- a/tests/plugin/data/sw_pulsar/services/producer.py
+++ b/tests/plugin/data/sw_pulsar/services/producer.py
@@ -22,7 +22,22 @@ if __name__ == '__main__':
from pulsar import BatchingType
app = Flask(__name__)
-client = pulsar.Client(service_url='pulsar://pulsar-server:6650')
+client = pulsar.Client(
+service_url='pulsar://pulsar-server:6650',
+authentication=None,
+operation_timeout_seconds=30,
+io_threads=1,
+message_listener_threads=1,
+concurrent_lookup_requests=5,
+log_conf_file_path=None,
+use_tls=False,
+tls_trust_certs_file_path=None,
+tls_allow_insecure_connection=False,
+tls_validate_hostname=False,
+logger=None,
+connection_timeout_ms=1,
+listener_name=None
+)
producer = client.create_producer(
'sw-topic',
block_if_queue_full=True,
(skywalking-python) branch master updated: Fix outdated make dev-fix rule in CodeStyle.md (#350)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-python.git The following commit(s) were added to refs/heads/master by this push: new 64ee67e Fix outdated make dev-fix rule in CodeStyle.md (#350) 64ee67e is described below commit 64ee67ed148e3d559b5363038b807d0cb392b651 Author: Tsonglew AuthorDate: Sun Jul 28 09:44:39 2024 +0800 Fix outdated make dev-fix rule in CodeStyle.md (#350) --- docs/en/contribution/CodingStyle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/contribution/CodingStyle.md b/docs/en/contribution/CodingStyle.md index 37e488f..1acf548 100644 --- a/docs/en/contribution/CodingStyle.md +++ b/docs/en/contribution/CodingStyle.md @@ -38,7 +38,7 @@ if logger_debug_enabled: # Imports Please make sure the imports are placed in a good order, or flake8-isort will notify you of the violations. -Run `make dev-fix` to automatically fix the sorting problem. +Run `make fix` to automatically fix the sorting problem. # Naming In PEP8 convention, we are required to use snake_case as the accepted style.
(skywalking-website) branch rel/python-110 deleted (was 040431aa596)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch rel/python-110 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git was 040431aa596 Add release event for python 110 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-website) branch master updated: Add release event for python 110 (#728)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 c2244aaf7a9 Add release event for python 110 (#728) c2244aaf7a9 is described below commit c2244aaf7a9302d7527190a88c61fc02f35d9c4f Author: kezhenxu94 AuthorDate: Mon Jul 22 11:16:34 2024 +0800 Add release event for python 110 (#728) --- .../index.md | 41 ++ data/docs.yml | 6 ++-- data/releases.yml | 16 - 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/content/events/release-apache-skywalking-python-1-1-0/index.md b/content/events/release-apache-skywalking-python-1-1-0/index.md new file mode 100644 index 000..841c36ea39a --- /dev/null +++ b/content/events/release-apache-skywalking-python-1-1-0/index.md @@ -0,0 +1,41 @@ +--- +title: "Release Apache SkyWalking Python 1.1.0" +date: 2024-07-22 +author: SkyWalking Team +description: "Release Apache SkyWalking Python 1.1.0." +--- + +SkyWalking Python 1.1.0 is released! Go to [downloads](/downloads) page to find release tars. + +**PyPI Wheel**: <https://pypi.org/project/apache-skywalking/1.1.0/> + +**DockerHub Image**: <https://hub.docker.com/r/apache/skywalking-python> + +## What's Changed + +* Fix wrong docker tag name by @kezhenxu94 in <https://github.com/apache/skywalking-python/pull/307> +* Update release doc to reflect new steps by @Superskyyy in <https://github.com/apache/skywalking-python/pull/306> +* Fix unexpected 'No active span' IllegalStateError by @ZEALi in <https://github.com/apache/skywalking-python/pull/311> +* Add Neo4j plugin. by @Jedore in <https://github.com/apache/skywalking-python/pull/312> +* Update README.md to reflect new slack channel by @Superskyyy in <https://github.com/apache/skywalking-python/pull/313> +* Replace Kafka CI image tags to sha by @FAWC438 in <https://github.com/apache/skywalking-python/pull/319> +* Python agent performance enhancement with asyncio by @FAWC438 in <https://github.com/apache/skywalking-python/pull/316> +* loose restrict of greenlet (#3) by @jaychoww in <https://github.com/apache/skywalking-python/pull/326> +* Add support printing TID to logs by @CodePrometheus in <https://github.com/apache/skywalking-python/pull/323> +* Fix psutil dockerfile version constraint by @Superskyyy in <https://github.com/apache/skywalking-python/pull/328> +* Change from pkg_resources to importlib metadata by @shenxiangzhuang in <https://github.com/apache/skywalking-python/pull/329> +* Update NOTICE to 2024 by @Superskyyy in <https://github.com/apache/skywalking-python/pull/332> +* Disable uwsgi e2e by @Superskyyy in <https://github.com/apache/skywalking-python/pull/337> +* Fix unexpected 'decode' AttributeError when MySQLdb module is mapped by PyMySQL by @ZEALi in <https://github.com/apache/skywalking-python/pull/336> +* Add Pulsar plugin by @CodePrometheus in <https://github.com/apache/skywalking-python/pull/345> +* fix(agent): no attribute '_SkyWalkingAgent__log_queue' using kafka plain text by @tsonglew in <https://github.com/apache/skywalking-python/pull/343> +* Bump up version to 1.1.0 by @kezhenxu94 in <https://github.com/apache/skywalking-python/pull/347> + +## New Contributors + +* @CodePrometheus made their first contribution in <https://github.com/apache/skywalking-python/pull/323> +* @shenxiangzhuang made their first contribution in <https://github.com/apache/skywalking-python/pull/329> +* @tsonglew made their first contribution in <https://github.com/apache/skywalking-python/pull/343> + +**Full Changelog**: <https://github.com/apache/skywalking-python/compare/v1.0.1...v1.1.0> + diff --git a/data/docs.yml b/data/docs.yml index fbb5b18cdbb..1bcffba15be 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -118,10 +118,10 @@ link: /docs/skywalking-python/next/readme/ - version: Latest link: /docs/skywalking-python/latest/readme/ - commitId: 4717e1b66da9fd9025ef8e7f5f9bab1c4b1e409e -- version: v1.0.1 + commitId: 28602aec01a7f5434c7fe1bd73338cd4478e0761 +- version: v1.1.0 link: /docs/skywalking-python/next/readme/ - commitId: 4717e1b66da9fd9025ef8e7f5f9bab1c4b1e409e + commitId: 28602aec01a7f5434c7fe1bd73338cd4478e0761 - name: NodeJS Agent icon: nodejs-agent diff --git a/data/releases.yml b/data/releases.yml index 0823031aa6b..4e46730c49c 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -213,21 +213,21 @@ icon: python-agent description: The Python Ag
(skywalking-website) 01/01: Add release event for python 110
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch rel/python-110 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 040431aa596f798c6ff917fb7bb01bd8628c6b67 Author: kezhenxu94 AuthorDate: Mon Jul 22 03:05:22 2024 + Add release event for python 110 --- .../index.md | 41 ++ data/docs.yml | 6 ++-- data/releases.yml | 16 - 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/content/events/release-apache-skywalking-python-1-1-0/index.md b/content/events/release-apache-skywalking-python-1-1-0/index.md new file mode 100644 index 000..841c36ea39a --- /dev/null +++ b/content/events/release-apache-skywalking-python-1-1-0/index.md @@ -0,0 +1,41 @@ +--- +title: "Release Apache SkyWalking Python 1.1.0" +date: 2024-07-22 +author: SkyWalking Team +description: "Release Apache SkyWalking Python 1.1.0." +--- + +SkyWalking Python 1.1.0 is released! Go to [downloads](/downloads) page to find release tars. + +**PyPI Wheel**: <https://pypi.org/project/apache-skywalking/1.1.0/> + +**DockerHub Image**: <https://hub.docker.com/r/apache/skywalking-python> + +## What's Changed + +* Fix wrong docker tag name by @kezhenxu94 in <https://github.com/apache/skywalking-python/pull/307> +* Update release doc to reflect new steps by @Superskyyy in <https://github.com/apache/skywalking-python/pull/306> +* Fix unexpected 'No active span' IllegalStateError by @ZEALi in <https://github.com/apache/skywalking-python/pull/311> +* Add Neo4j plugin. by @Jedore in <https://github.com/apache/skywalking-python/pull/312> +* Update README.md to reflect new slack channel by @Superskyyy in <https://github.com/apache/skywalking-python/pull/313> +* Replace Kafka CI image tags to sha by @FAWC438 in <https://github.com/apache/skywalking-python/pull/319> +* Python agent performance enhancement with asyncio by @FAWC438 in <https://github.com/apache/skywalking-python/pull/316> +* loose restrict of greenlet (#3) by @jaychoww in <https://github.com/apache/skywalking-python/pull/326> +* Add support printing TID to logs by @CodePrometheus in <https://github.com/apache/skywalking-python/pull/323> +* Fix psutil dockerfile version constraint by @Superskyyy in <https://github.com/apache/skywalking-python/pull/328> +* Change from pkg_resources to importlib metadata by @shenxiangzhuang in <https://github.com/apache/skywalking-python/pull/329> +* Update NOTICE to 2024 by @Superskyyy in <https://github.com/apache/skywalking-python/pull/332> +* Disable uwsgi e2e by @Superskyyy in <https://github.com/apache/skywalking-python/pull/337> +* Fix unexpected 'decode' AttributeError when MySQLdb module is mapped by PyMySQL by @ZEALi in <https://github.com/apache/skywalking-python/pull/336> +* Add Pulsar plugin by @CodePrometheus in <https://github.com/apache/skywalking-python/pull/345> +* fix(agent): no attribute '_SkyWalkingAgent__log_queue' using kafka plain text by @tsonglew in <https://github.com/apache/skywalking-python/pull/343> +* Bump up version to 1.1.0 by @kezhenxu94 in <https://github.com/apache/skywalking-python/pull/347> + +## New Contributors + +* @CodePrometheus made their first contribution in <https://github.com/apache/skywalking-python/pull/323> +* @shenxiangzhuang made their first contribution in <https://github.com/apache/skywalking-python/pull/329> +* @tsonglew made their first contribution in <https://github.com/apache/skywalking-python/pull/343> + +**Full Changelog**: <https://github.com/apache/skywalking-python/compare/v1.0.1...v1.1.0> + diff --git a/data/docs.yml b/data/docs.yml index fbb5b18cdbb..1bcffba15be 100644 --- a/data/docs.yml +++ b/data/docs.yml @@ -118,10 +118,10 @@ link: /docs/skywalking-python/next/readme/ - version: Latest link: /docs/skywalking-python/latest/readme/ - commitId: 4717e1b66da9fd9025ef8e7f5f9bab1c4b1e409e -- version: v1.0.1 + commitId: 28602aec01a7f5434c7fe1bd73338cd4478e0761 +- version: v1.1.0 link: /docs/skywalking-python/next/readme/ - commitId: 4717e1b66da9fd9025ef8e7f5f9bab1c4b1e409e + commitId: 28602aec01a7f5434c7fe1bd73338cd4478e0761 - name: NodeJS Agent icon: nodejs-agent diff --git a/data/releases.yml b/data/releases.yml index 0823031aa6b..4e46730c49c 100644 --- a/data/releases.yml +++ b/data/releases.yml @@ -213,21 +213,21 @@ icon: python-agent description: The Python Agent for Apache SkyWalking, which provides the native tracing/metrics/logging/profiling abilities for Python projects. source: -- version: v1.0.
(skywalking-website) branch rel/python-110 updated (47377eb1310 -> 040431aa596)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch rel/python-110 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git discard 47377eb1310 Add release event for python 110 new 040431aa596 Add release event for python 110 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (47377eb1310) \ N -- N -- N refs/heads/rel/python-110 (040431aa596) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: data/docs.yml | 6 +++--- data/releases.yml | 16 2 files changed, 11 insertions(+), 11 deletions(-)
(skywalking-website) 01/01: Add release event for python 110
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch rel/python-110 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git commit 47377eb13102fcfffa00e3f44d07e0ece1527974 Author: kezhenxu94 AuthorDate: Mon Jul 22 03:05:22 2024 + Add release event for python 110 --- .../index.md | 41 ++ 1 file changed, 41 insertions(+) diff --git a/content/events/release-apache-skywalking-python-1-1-0/index.md b/content/events/release-apache-skywalking-python-1-1-0/index.md new file mode 100644 index 000..841c36ea39a --- /dev/null +++ b/content/events/release-apache-skywalking-python-1-1-0/index.md @@ -0,0 +1,41 @@ +--- +title: "Release Apache SkyWalking Python 1.1.0" +date: 2024-07-22 +author: SkyWalking Team +description: "Release Apache SkyWalking Python 1.1.0." +--- + +SkyWalking Python 1.1.0 is released! Go to [downloads](/downloads) page to find release tars. + +**PyPI Wheel**: <https://pypi.org/project/apache-skywalking/1.1.0/> + +**DockerHub Image**: <https://hub.docker.com/r/apache/skywalking-python> + +## What's Changed + +* Fix wrong docker tag name by @kezhenxu94 in <https://github.com/apache/skywalking-python/pull/307> +* Update release doc to reflect new steps by @Superskyyy in <https://github.com/apache/skywalking-python/pull/306> +* Fix unexpected 'No active span' IllegalStateError by @ZEALi in <https://github.com/apache/skywalking-python/pull/311> +* Add Neo4j plugin. by @Jedore in <https://github.com/apache/skywalking-python/pull/312> +* Update README.md to reflect new slack channel by @Superskyyy in <https://github.com/apache/skywalking-python/pull/313> +* Replace Kafka CI image tags to sha by @FAWC438 in <https://github.com/apache/skywalking-python/pull/319> +* Python agent performance enhancement with asyncio by @FAWC438 in <https://github.com/apache/skywalking-python/pull/316> +* loose restrict of greenlet (#3) by @jaychoww in <https://github.com/apache/skywalking-python/pull/326> +* Add support printing TID to logs by @CodePrometheus in <https://github.com/apache/skywalking-python/pull/323> +* Fix psutil dockerfile version constraint by @Superskyyy in <https://github.com/apache/skywalking-python/pull/328> +* Change from pkg_resources to importlib metadata by @shenxiangzhuang in <https://github.com/apache/skywalking-python/pull/329> +* Update NOTICE to 2024 by @Superskyyy in <https://github.com/apache/skywalking-python/pull/332> +* Disable uwsgi e2e by @Superskyyy in <https://github.com/apache/skywalking-python/pull/337> +* Fix unexpected 'decode' AttributeError when MySQLdb module is mapped by PyMySQL by @ZEALi in <https://github.com/apache/skywalking-python/pull/336> +* Add Pulsar plugin by @CodePrometheus in <https://github.com/apache/skywalking-python/pull/345> +* fix(agent): no attribute '_SkyWalkingAgent__log_queue' using kafka plain text by @tsonglew in <https://github.com/apache/skywalking-python/pull/343> +* Bump up version to 1.1.0 by @kezhenxu94 in <https://github.com/apache/skywalking-python/pull/347> + +## New Contributors + +* @CodePrometheus made their first contribution in <https://github.com/apache/skywalking-python/pull/323> +* @shenxiangzhuang made their first contribution in <https://github.com/apache/skywalking-python/pull/329> +* @tsonglew made their first contribution in <https://github.com/apache/skywalking-python/pull/343> + +**Full Changelog**: <https://github.com/apache/skywalking-python/compare/v1.0.1...v1.1.0> +
(skywalking-website) branch rel/python-110 created (now 47377eb1310)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch rel/python-110 in repository https://gitbox.apache.org/repos/asf/skywalking-website.git at 47377eb1310 Add release event for python 110 This branch includes the following new commits: new 47377eb1310 Add release event for python 110 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-python) branch master updated: Fix: user/password replacement is not allowed for relative urls (#349)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new 9c79cc6 Fix: user/password replacement is not allowed for relative
urls (#349)
9c79cc6 is described below
commit 9c79cc68a17f47d9d2c5bd033adb3cebb4614abb
Author: Tsonglew
AuthorDate: Sun Jul 21 09:42:27 2024 +0800
Fix: user/password replacement is not allowed for relative urls (#349)
fix error `user/password replacement is not allowed for relative URLs` when
using the parameter base_url of ClientSession constructor to send aiohttp
requests
---
skywalking/plugins/sw_aiohttp.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/skywalking/plugins/sw_aiohttp.py b/skywalking/plugins/sw_aiohttp.py
index f1cb4ad..ae89a40 100644
--- a/skywalking/plugins/sw_aiohttp.py
+++ b/skywalking/plugins/sw_aiohttp.py
@@ -40,7 +40,8 @@ def install():
_request = ClientSession._request
async def _sw_request(self: ClientSession, method: str, str_or_url,
**kwargs):
-url = URL(str_or_url).with_user(None).with_password(None)
+abs_url = self._build_url(str_or_url) if hasattr(self, '_build_url')
else URL(str_or_url)
+url = abs_url.with_user(None).with_password(None)
peer = f"{url.host or ''}:{url.port or ''}"
if config.agent_protocol == 'http' and
config.agent_collector_backend_services.rstrip('/') \
(skywalking-python) tag v1.1.0 created (now 28602ae)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git at 28602ae (commit) No new revisions were added by this update.
(skywalking-python) annotated tag v1.1.0 deleted (was a1d356a)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to annotated tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git *** WARNING: tag v1.1.0 was deleted! *** tag was a1d356a 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-python) annotated tag v1.1.0 updated (28602ae -> a1d356a)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to annotated tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git *** WARNING: tag v1.1.0 was modified! *** from 28602ae (commit) to a1d356a (tag) tagging 28602aec01a7f5434c7fe1bd73338cd4478e0761 (commit) replaces v1.0.1 by kezhenxu94 on Wed Jul 17 15:16:24 2024 +0800 - Log - Release Apache SkyWalking-Python 1.1.0 --- No new revisions were added by this update. Summary of changes:
(skywalking-python) 01/01: Bump up version to 1.1.0
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch rel/1.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git commit 09cf068de0275ead2349b20b6dc4dfb909bd8005 Author: kezhenxu94 AuthorDate: Wed Jul 17 12:10:37 2024 +0800 Bump up version to 1.1.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8fc836f..d0daf01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ [tool.poetry] name = "apache-skywalking" -version = "1.0.1" +version = "1.1.0" description = "The Python Agent for Apache SkyWalking, which provides the native tracing/metrics/logging/profiling abilities for Python projects." license = "Apache-2.0" authors = ["Apache Software Foundation "]
(skywalking-python) branch rel/1.1.0 created (now 09cf068)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch rel/1.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-python.git at 09cf068 Bump up version to 1.1.0 This branch includes the following new commits: new 09cf068 Bump up version to 1.1.0 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: Update data generator repo (#488)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 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 40be74c1 Update data generator repo (#488)
40be74c1 is described below
commit 40be74c186c1afd99c908c1a1029700e42c55afe
Author: Gao Hongtao
AuthorDate: Tue Jul 16 16:27:50 2024 +0800
Update data generator repo (#488)
Signed-off-by: Gao Hongtao
---
test/e2e-v2/script/env| 2 +-
test/stress/classic/env | 2 +-
test/stress/classic/env.dev | 2 +-
test/stress/trace/docker-compose-cluster.yaml | 2 +-
test/stress/trace/docker-compose-single.yaml | 2 +-
test/stress/trace/env | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 64676744..e16487d1 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -25,5 +25,5 @@
SW_KUBERNETES_COMMIT_SHA=3eb9fc8235fd3a773650d1f08adfccfd5d0745fc
SW_ROVER_COMMIT=fc8d074c6d34ecfee585a7097cbd5aef1ca680a5
SW_CTL_COMMIT=d5f3597733aa5217373986d776a3ee5ee8b3c468
-SW_OAP_COMMIT=28bf55219f2cc6d6be58e50b92983e57cd42a97e
+SW_OAP_COMMIT=9c5f4ab6950dbc9ea3477e3301550adb49528af2
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=cc7a2c9e97fd2c421adbe3e9c471688459a446d9
diff --git a/test/stress/classic/env b/test/stress/classic/env
index a2a74394..e7a51146 100644
--- a/test/stress/classic/env
+++ b/test/stress/classic/env
@@ -26,7 +26,7 @@
SW_KUBERNETES_COMMIT_SHA=3eb9fc8235fd3a773650d1f08adfccfd5d0745fc
SW_ROVER_COMMIT=fc8d074c6d34ecfee585a7097cbd5aef1ca680a5
SW_CTL_COMMIT=d5f3597733aa5217373986d776a3ee5ee8b3c468
-SW_OAP_COMMIT=28bf55219f2cc6d6be58e50b92983e57cd42a97e
+SW_OAP_COMMIT=9c5f4ab6950dbc9ea3477e3301550adb49528af2
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=cc7a2c9e97fd2c421adbe3e9c471688459a446d9
VUS=10
diff --git a/test/stress/classic/env.dev b/test/stress/classic/env.dev
index ced05957..2193d9d0 100644
--- a/test/stress/classic/env.dev
+++ b/test/stress/classic/env.dev
@@ -25,7 +25,7 @@
SW_KUBERNETES_COMMIT_SHA=3eb9fc8235fd3a773650d1f08adfccfd5d0745fc
SW_ROVER_COMMIT=fc8d074c6d34ecfee585a7097cbd5aef1ca680a5
SW_CTL_COMMIT=d5f3597733aa5217373986d776a3ee5ee8b3c468
-SW_OAP_COMMIT=28bf55219f2cc6d6be58e50b92983e57cd42a97e
+SW_OAP_COMMIT=9c5f4ab6950dbc9ea3477e3301550adb49528af2
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=cc7a2c9e97fd2c421adbe3e9c471688459a446d9
VUS=1
diff --git a/test/stress/trace/docker-compose-cluster.yaml
b/test/stress/trace/docker-compose-cluster.yaml
index 6173801f..f05598b1 100644
--- a/test/stress/trace/docker-compose-cluster.yaml
+++ b/test/stress/trace/docker-compose-cluster.yaml
@@ -92,7 +92,7 @@ services:
extends:
file: ../../docker/base-compose.yml
service: oap
-image: "hanahmily/data-generator:${SW_OAP_COMMIT}"
+image: "ghcr.io/apache/skywalking/data-generator:${SW_OAP_COMMIT}"
environment:
SW_STORAGE: banyandb
SW_STORAGE_BANYANDB_TARGETS: "liaison:17912"
diff --git a/test/stress/trace/docker-compose-single.yaml
b/test/stress/trace/docker-compose-single.yaml
index 9cbd2191..7c787f98 100644
--- a/test/stress/trace/docker-compose-single.yaml
+++ b/test/stress/trace/docker-compose-single.yaml
@@ -53,7 +53,7 @@ services:
extends:
file: ../../docker/base-compose.yml
service: oap
-image: "hanahmily/data-generator:${SW_OAP_COMMIT}"
+image: "ghcr.io/apache/skywalking/data-generator:${SW_OAP_COMMIT}"
environment:
SW_STORAGE: banyandb
SW_STORAGE_BANYANDB_FLUSH_INTERVAL: 5
diff --git a/test/stress/trace/env b/test/stress/trace/env
index 8e7eda3b..957ddfa2 100644
--- a/test/stress/trace/env
+++ b/test/stress/trace/env
@@ -14,4 +14,4 @@
# limitations under the License.
-SW_OAP_COMMIT=28bf55219f2cc6d6be58e50b92983e57cd42a97e
+SW_OAP_COMMIT=9c5f4ab6950dbc9ea3477e3301550adb49528af2
(skywalking-banyandb) branch data-generator-image deleted (was 6ce1cd15)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch data-generator-image in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git was 6ce1cd15 Update data generator repo 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 docker-push deleted (was 7febb63f26)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git was 7febb63f26 Fix wrong syntax in github workflow 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 syntax in github workflow (#12453)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 9c5f4ab695 Fix wrong syntax in github workflow (#12453) 9c5f4ab695 is described below commit 9c5f4ab6950dbc9ea3477e3301550adb49528af2 Author: kezhenxu94 AuthorDate: Tue Jul 16 15:16:33 2024 +0800 Fix wrong syntax in github workflow (#12453) --- .github/workflows/publish-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 9fd138902e..01c7e0b20d 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -87,5 +87,5 @@ jobs: - name: Build and push docker images run: make build.all docker.push - name: Build and push data-generator image -if: github.event_name != "release" +if: github.event_name != 'release' run: make push.docker.data-generator
(skywalking) 01/02: Fix wrong syntax in github workflow
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 0ab3378a0ac01c7d74506753f1500976bba3a2b4 Author: kezhenxu94 AuthorDate: Tue Jul 16 14:17:43 2024 +0800 Fix wrong syntax in github workflow --- .github/workflows/publish-docker.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 9fd138902e..50cb0cbefa 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -20,6 +20,7 @@ on: push: branches: - master + - docker-push release: types: - released @@ -87,5 +88,5 @@ jobs: - name: Build and push docker images run: make build.all docker.push - name: Build and push data-generator image -if: github.event_name != "release" +if: github.event_name != 'release' run: make push.docker.data-generator
(skywalking) 02/02: Fix wrong syntax in github workflow
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 7febb63f26120a2019d45dbae2db9e08c19e847d Author: kezhenxu94 AuthorDate: Tue Jul 16 14:25:30 2024 +0800 Fix wrong syntax in github workflow --- .github/workflows/publish-docker.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 50cb0cbefa..01c7e0b20d 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -20,7 +20,6 @@ on: push: branches: - master - - docker-push release: types: - released
(skywalking) branch docker-push updated (2fda7969be -> 7febb63f26)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git discard 2fda7969be Fix wrong syntax in github workflow discard e1e6227594 Fix wrong syntax in github workflow omit 137edd2eec Push data-generator image to ghcr.io add 0949e5a425 Support BanyanDB internal stream query execution tracing (#12439) add 96f44657ad Push data-generator image to ghcr.io (#12452) new 0ab3378a0a Fix wrong syntax in github workflow new 7febb63f26 Fix wrong syntax in github workflow This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2fda7969be) \ N -- N -- N refs/heads/docker-push (7febb63f26) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/en/changes/changes.md | 3 ++- .../server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java | 6 +- test/e2e-v2/script/env | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-)
(skywalking) branch docker-push updated: Fix wrong syntax in github workflow
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/docker-push by this push: new 2fda7969be Fix wrong syntax in github workflow 2fda7969be is described below commit 2fda7969be8f4ab2063ee402b1f2ae05aa7ea867 Author: kezhenxu94 AuthorDate: Tue Jul 16 14:25:30 2024 +0800 Fix wrong syntax in github workflow --- .github/workflows/publish-docker.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 50cb0cbefa..01c7e0b20d 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -20,7 +20,6 @@ on: push: branches: - master - - docker-push release: types: - released
(skywalking) 01/01: Fix wrong syntax in github workflow
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git commit e1e6227594f110bcedd56c3feff96dbd8d69992a Author: kezhenxu94 AuthorDate: Tue Jul 16 14:17:43 2024 +0800 Fix wrong syntax in github workflow --- .github/workflows/publish-docker.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 9fd138902e..50cb0cbefa 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -20,6 +20,7 @@ on: push: branches: - master + - docker-push release: types: - released @@ -87,5 +88,5 @@ jobs: - name: Build and push docker images run: make build.all docker.push - name: Build and push data-generator image -if: github.event_name != "release" +if: github.event_name != 'release' run: make push.docker.data-generator
(skywalking) branch docker-push created (now e1e6227594)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch docker-push in repository https://gitbox.apache.org/repos/asf/skywalking.git at e1e6227594 Fix wrong syntax in github workflow This branch includes the following new commits: new e1e6227594 Fix wrong syntax in github workflow 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-swck) branch bumpupdependencies deleted (was 4400e6d)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch bumpupdependencies in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git was 4400e6d Fix check The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-swck) branch bumpupdependencies updated (412aea2 -> 4400e6d)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch bumpupdependencies in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git from 412aea2 Bump up some dependencies add 4400e6d Fix check No new revisions were added by this update. Summary of changes: adapter/dist/LICENSE | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)
(skywalking-swck) branch bumpupdependencies created (now 412aea2)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch bumpupdependencies in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git at 412aea2 Bump up some dependencies This branch includes the following new commits: new 412aea2 Bump up some dependencies 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-satellite) branch main updated: Bump up dependencies to fix CVEs (#154)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
The following commit(s) were added to refs/heads/main by this push:
new 5f104ea Bump up dependencies to fix CVEs (#154)
5f104ea is described below
commit 5f104ead6bcf70a5b308baa91b996f80c7b44f3b
Author: kezhenxu94
AuthorDate: Thu Jul 11 17:07:07 2024 +0800
Bump up dependencies to fix CVEs (#154)
---
.github/workflows/build-and-test.yaml | 4 +-
.github/workflows/e2e-istio.yaml | 11 ++--
.github/workflows/e2e-native.yaml | 7 +--
.golangci.yml | 8 ---
Makefile | 2 +-
docs/en/guides/compile/How-to-compile.md | 2 +-
.../plugins/forwarder_native-clr-grpc-forwarder.md | 0
.../plugins/receiver_grpc-native-clr-receiver.md | 0
go.mod | 29 +--
go.sum | 60 +-
internal/satellite/tools/catalog.go| 2 +-
internal/satellite/tools/generate_plugin_doc.go| 4 +-
plugins/client/grpc/client.go | 2 +-
plugins/client/grpc/static_clients_test.go | 2 +-
plugins/receiver/grpc/common_test_help.go | 20 +---
.../receiver/grpc/nativetracing/receiver_test.go | 13 +++--
plugins/server/grpc/server_connections.go | 1 -
test/e2e/base/satellite/Dockerfile | 2 +-
18 files changed, 89 insertions(+), 80 deletions(-)
diff --git a/.github/workflows/build-and-test.yaml
b/.github/workflows/build-and-test.yaml
index 0c62cf0..c22ef89 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -28,8 +28,8 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
-go-version: [ 1.19 ]
-runner: [ ubuntu, macos, windows ]
+go-version: [ 1.21 ]
+runner: [ ubuntu, windows ]
fail-fast: true
steps:
- name: Set up Go ${{ matrix.go-version }}
diff --git a/.github/workflows/e2e-istio.yaml b/.github/workflows/e2e-istio.yaml
index 2c7946b..0d50a7c 100644
--- a/.github/workflows/e2e-istio.yaml
+++ b/.github/workflows/e2e-istio.yaml
@@ -40,10 +40,10 @@ jobs:
ISTIO_VERSION: ${{ matrix.istio_version }}
ALS_ANALYZER: ${{ matrix.analyzer }}
steps:
- - name: Set up Go 1.17
+ - name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.17
+ go-version: 1.21
id: go
- uses: actions/checkout@v2
with:
@@ -66,10 +66,10 @@ jobs:
env:
ISTIO_VERSION: ${{ matrix.istio_version }}
steps:
- - name: Set up Go 1.17
+ - name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.17
+ go-version: 1.21
id: go
- uses: actions/checkout@v2
with:
@@ -85,4 +85,5 @@ jobs:
name: Upload Logs
with:
name: logs
- path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
\ No newline at end of file
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+
diff --git a/.github/workflows/e2e-native.yaml
b/.github/workflows/e2e-native.yaml
index d96b608..ce471b5 100644
--- a/.github/workflows/e2e-native.yaml
+++ b/.github/workflows/e2e-native.yaml
@@ -34,10 +34,10 @@ jobs:
name: Native E2E test
runs-on: ubuntu-latest
steps:
- - name: Set up Go 1.17
+ - name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.17
+ go-version: 1.21
id: go
- uses: actions/checkout@v2
with:
@@ -57,4 +57,5 @@ jobs:
name: Upload Logs
with:
name: logs
- path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
\ No newline at end of file
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+
diff --git a/.golangci.yml b/.golangci.yml
index c14bd61..526594f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -28,13 +28,6 @@ linters-settings:
goconst:
min-len: 2
min-occurrences: 2
- depguard:
-list-type: blacklist
-packages:
- -
-include-go-root: true
-packages-with-error-messages:
- fmt: "logging is allowed only by logutils.Log"
misspell:
locale: US
lll:
@@ -61,7 +54,6 @@ linters:
enable:
- bodyclose
- deadcode
-- depguard
- dogsled
- dupl
- errcheck
diff --git a/Makefile b/Makefile
index 561b9a6..c058f05 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ all: deps verify build gen-docs check
.PHONY: tools
tools:
- $(GO_LINT) version || curl -sfL
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh
-s -- -b $(GO_PATH)/bin v1.48.0
+ $(GO_LINT) version || curl -sfL
https://raw.g
(skywalking-satellite) branch cve updated (6c78841 -> 01c1b2e)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git from 6c78841 Bump up dependencies to fix CVEs add 01c1b2e Fix build No new revisions were added by this update. Summary of changes: .github/workflows/e2e-istio.yaml | 11 ++- .github/workflows/e2e-native.yaml | 7 --- 2 files changed, 10 insertions(+), 8 deletions(-)
(skywalking-satellite) 01/01: Bump up dependencies to fix CVEs
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch cve
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
commit 6c78841e54f8850547fe7f2c3dca993801eca211
Author: kezhenxu94
AuthorDate: Thu Jul 11 04:58:25 2024 +
Bump up dependencies to fix CVEs
---
.github/workflows/build-and-test.yaml | 2 +-
.../plugins/forwarder_native-clr-grpc-forwarder.md | 0
.../plugins/receiver_grpc-native-clr-receiver.md | 0
go.mod | 27 ++-
go.sum | 52 +++---
plugins/client/grpc/client.go | 2 +-
plugins/receiver/grpc/common_test_help.go | 12 +++--
7 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/.github/workflows/build-and-test.yaml
b/.github/workflows/build-and-test.yaml
index 0c62cf0..1d4ec4d 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -29,7 +29,7 @@ jobs:
strategy:
matrix:
go-version: [ 1.19 ]
-runner: [ ubuntu, macos, windows ]
+runner: [ ubuntu, windows ]
fail-fast: true
steps:
- name: Set up Go ${{ matrix.go-version }}
diff --git a/docs/en/setup/plugins/forwarder_native-clr-grpc-forwarder.md
b/docs/en/setup/plugins/forwarder_native-clr-grpc-forwarder.md
old mode 100644
new mode 100755
diff --git a/docs/en/setup/plugins/receiver_grpc-native-clr-receiver.md
b/docs/en/setup/plugins/receiver_grpc-native-clr-receiver.md
old mode 100644
new mode 100755
diff --git a/go.mod b/go.mod
index aca607f..65bdda5 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.19
require (
github.com/Shopify/sarama v1.27.2
github.com/enriquebris/goconcurrentqueue v0.6.0
- github.com/google/go-cmp v0.5.9
+ github.com/google/go-cmp v0.6.0
github.com/grandecola/mmap v0.6.0
github.com/hashicorp/go-multierror v1.1.1
github.com/prometheus/client_golang v1.14.0
@@ -16,10 +16,10 @@ require (
github.com/spf13/viper v1.7.1
github.com/urfave/cli/v2 v2.3.0
go.uber.org/automaxprocs v1.5.1
- golang.org/x/mod v0.9.0
- golang.org/x/text v0.14.0
- google.golang.org/grpc v1.59.0
- google.golang.org/protobuf v1.33.0
+ golang.org/x/mod v0.17.0
+ golang.org/x/text v0.16.0
+ google.golang.org/grpc v1.65.0
+ google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.26.2
skywalking.apache.org/repo/goapi v0.0.0-20240118085825-a7fa70cc38b7
@@ -27,7 +27,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
@@ -44,7 +44,7 @@ require (
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/protobuf v1.5.3 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
@@ -82,14 +82,13 @@ require (
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
- golang.org/x/crypto v0.14.0 // indirect
- golang.org/x/net v0.17.0 // indirect
- golang.org/x/oauth2 v0.11.0 // indirect
- golang.org/x/sys v0.14.0 // indirect
- golang.org/x/term v0.13.0 // indirect
+ golang.org/x/crypto v0.25.0 // indirect
+ golang.org/x/net v0.27.0 // indirect
+ golang.org/x/oauth2 v0.20.0 // indirect
+ golang.org/x/sys v0.22.0 // indirect
+ golang.org/x/term v0.22.0 // indirect
golang.org/x/time v0.3.0 // indirect
- google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto/googleapis/rpc
v0.0.0-20231106174013-bbf56f31fb17 // indirect
+ google.golang.org/genproto/googleapis/rpc
v0.0.0-20240709173604-40e1e62336c5 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
diff --git a/go.sum b/go.sum
index 0c6869a..973bb36 100644
--- a/go.sum
+++ b/go.sum
@@ -59,8 +59,8 @@ github.com/bketelsen/crypt
v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
github.com/buger/jsonparser v1.1.1/go.mod
h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod
h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU
(skywalking-satellite) branch cve created (now 6c78841)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git at 6c78841 Bump up dependencies to fix CVEs This branch includes the following new commits: new 6c78841 Bump up dependencies to fix CVEs 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-satellite) branch kezhenxu94-patch-1 deleted (was a373552)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git was a373552 Try run test 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-satellite) 01/01: Try run test
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git commit a37355251989aa9cc7165ef20c141c2117b37346 Author: kezhenxu94 AuthorDate: Thu Jul 11 12:38:59 2024 +0800 Try run test
(skywalking-satellite) branch kezhenxu94-patch-1 created (now a373552)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git at a373552 Try run test This branch includes the following new commits: new a373552 Try run test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-showcase) branch main updated: Lock the cilium and CLI version (#182)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 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 e3c857b Lock the cilium and CLI version (#182) e3c857b is described below commit e3c857bc94ec13b54bdffdb5908801b63035d71b Author: mrproliu <741550...@qq.com> AuthorDate: Wed Jul 10 15:52:29 2024 +0800 Lock the cilium and CLI version (#182) --- Makefile.in| 3 +++ deploy/platform/kubernetes/Makefile| 7 +-- deploy/platform/kubernetes/values.yaml | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 695a7f9..162e290 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,5 +63,8 @@ OTEL_COLLECTOR_IMAGE_TAG ?= 0.102.1 SW_R3_IMAGE ?= ghcr.io/skyapm/r3 SW_R3_IMAGE_TAG ?= 0.1.0 +CILIUM_VERSION ?= 1.13.4 +CILIUM_CLI_VERSION ?= v0.15.0 + # ALL variables should be listed above ^^ EXPORTED_VARS := $(filter-out <%,$(.VARIABLES)) diff --git a/deploy/platform/kubernetes/Makefile b/deploy/platform/kubernetes/Makefile index 33151b7..61cfcd3 100644 --- a/deploy/platform/kubernetes/Makefile +++ b/deploy/platform/kubernetes/Makefile @@ -216,10 +216,13 @@ feature-activemq-monitor: cilium: ifeq (, $(shell which cilium)) $(error "No cilium in PATH, please make sure cilium CLI is available in PATH") +endif +ifeq (,$(findstring $(CILIUM_CLI_VERSION),$(shell cilium version --client))) + $(error "Cilium CLI version is not $(CILIUM_CLI_VERSION), please make sure cilium CLI is $(CILIUM_CLI_VERSION))") endif @INSTALL_OR_UPDATE=$$(cilium status 2>&1 | grep -q "daemonsets.apps \"cilium\" not found" && echo "install" || echo "upgrade"); \ echo "Cilium will be $$INSTALL_OR_UPDATE"; \ - cilium $$INSTALL_OR_UPDATE --set cni.exclusive=false --set socketLB.hostNamespaceOnly=true --set hubble.tls.enabled=false + cilium $$INSTALL_OR_UPDATE --version $(CILIUM_VERSION) --set cni.exclusive=false --set socketLB.hostNamespaceOnly=true --set hubble.tls.enabled=false # @feature: function; install open function resources .PHONY: feature-cilium @@ -237,7 +240,7 @@ endif .PHONY: undeploy undeploy: - helm -n $(NAMESPACE) delete $(RELEASE) --wait + helm -n $(NAMESPACE) delete $(RELEASE) --wait || true ifneq ($(findstring cilium,$(FEATURE_FLAGS)),) cilium uninstall endif diff --git a/deploy/platform/kubernetes/values.yaml b/deploy/platform/kubernetes/values.yaml index 865a49b..f02cc86 100644 --- a/deploy/platform/kubernetes/values.yaml +++ b/deploy/platform/kubernetes/values.yaml @@ -443,3 +443,6 @@ features: activemqMonitor: enabled: false + + cilium: +enabled: false
(skywalking-satellite) branch cve deleted (was 18bb258)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch cve in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git was 18bb258 Bump up dependencies to fix CVE The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
