Skip to content

Commit

Permalink
Merge branch 'master' into native-image-support
Browse files Browse the repository at this point in the history
  • Loading branch information
@yswdqz
yswdqz authored Oct 19, 2023
2 parents 094e4ab + 1a27da5 commit 44e47ce
Show file tree
Hide file tree
Showing 121 changed files with 472 additions and 1,134 deletions.
32 changes: 27 additions & 5 deletions .github/workflows/skywalking.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,11 @@ jobs:
ISTIO_VERSION=1.18.0
KUBERNETES_VERSION=25
- name: Rover with Istio Process 1.15.0
config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
env: ISTIO_VERSION=1.15.0
runs-on: ubuntu-20.04

- name: Satellite
config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
- name: Auth
Expand Down Expand Up @@ -587,11 +592,6 @@ jobs:
- name: MariaDB Prometheus and slowsql
config: test/e2e-v2/cases/mariadb/mariadb-slowsql/e2e.yaml

- name: Rover with Istio Process 1.15.0
config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
env: ISTIO_VERSION=1.15.0
runs-on: ubuntu-20.04

- name: Zipkin ES
config: test/e2e-v2/cases/zipkin/es/e2e.yaml
- name: Zipkin ES Sharding
Expand Down Expand Up @@ -679,6 +679,12 @@ jobs:
run: |
find docker-images -name "*.tar" -exec docker load -i {} \;
find docker-images -name "*.tar" -exec rm {} \;
- name: Login to ghcr
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Cache maven repository
uses: actions/cache@v3
with:
Expand All @@ -695,6 +701,11 @@ jobs:
uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
with:
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
- if: ${{ failure() }}
run: |
df -h
du -sh .
docker images
- uses: actions/upload-artifact@v2
if: ${{ failure() }}
name: Upload Logs
Expand Down Expand Up @@ -737,6 +748,12 @@ jobs:
run: |
find docker-images -name "*.tar" -exec docker load -i {} \;
find docker-images -name "*.tar" -exec rm {} \;
- name: Login to ghcr
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: ${{ matrix.test.name }}
uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
env:
Expand All @@ -745,6 +762,11 @@ jobs:
ALS_ANALYZER: ${{ matrix.analyzer }}
with:
e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/istio/als/e2e.yaml
- if: ${{ failure() }}
run: |
df -h
du -sh .
docker images
- uses: actions/upload-artifact@v2
if: ${{ failure() }}
name: Upload Logs
Expand Down
16 changes: 8 additions & 8 deletions dist-material/release-docs/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,16 +298,16 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.11.1 Apache-2.0
https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.11.1 Apache-2.0
https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.11.1 Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.94.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.94.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-http2/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-socks/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-common/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-handler/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-handler-proxy/4.1.86.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-http2/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-codec-socks/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-common/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-handler/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-handler-proxy/4.1.100.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.94.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.94.Final Apache-2.0
https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.94.Final Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions docs/en/academy/diagnose-service-mesh-network-performance-with-ebpf.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ kubectl apply -f https://raw.githubusercontent.com/mrproliu/skywalking-network-p
The following will install the storage, backend, and UI needed for SkyWalking:

```bash
git clone https://github.com/apache/skywalking-kubernetes.git
cd skywalking-kubernetes
git clone https://github.com/apache/skywalking-helm.git
cd skywalking-helm
cd chart
helm dep up skywalking
helm -n istio-system install skywalking skywalking \
Expand Down
15 changes: 14 additions & 1 deletion docs/en/changes/changes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#### Project

* Add distribution/graal module to make preliminary preparations for supporting native-image.
* Bump Java agent to 9.1-dev in the e2e tests.
* Bump up netty to 4.1.100.

#### OAP Server

Expand All @@ -13,6 +15,16 @@
including `ui_template，ui_menu，continuous_profiling_policy`.
* Add a release mechanism for alarm windows when it is expired in case of OOM.
* Fix Zipkin trace receiver response: make the HTTP status code from `200` to `202`.
* Update BanyanDB Java Client to 0.5.0.
* Fix getInstances query in the BanyanDB Metadata DAO.
* BanyanDBStorageClient: Add `keepAliveProperty` API.
* Fix table exists check in the JDBC Storage Plugin.
* Enhance extensibility of HTTP Server library.
* Adjust `AlarmRecord` alarmMessage column length to 512.
* Fix `EventHookCallback` build event: build the layer from `Service's Layer`.
* Fix `AlarmCore` doAlarm: catch exception for each callback to avoid interruption.
* Optimize queryBasicTraces in TraceQueryEsDAO.
* Fix `WebhookCallback` send incorrect messages, add catch exception for each callback HTTP Post.
* Support GraalVM native-image (Experimental).

#### UI
Expand All @@ -22,7 +34,8 @@
* Fix the display height of the link tree structure.
* Replace the name by shortName on service widget.
* Refactor: update pagination style. No visualization style change.
* Apply MQE on K8s layer UI-templates
* Apply MQE on K8s layer UI-templates.
* Fix icons display in trace tree diagram.

#### Documentation

Expand Down
2 changes: 1 addition & 1 deletion docs/en/setup/backend/backend-cluster.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ containers:
fieldPath: metadata.uid
```
Read [the complete helm](https://github.com/apache/skywalking-kubernetes/blob/476afd51d44589c77a4cbaac950272cd5d064ea9/chart/skywalking/templates/oap-deployment.yaml#L125) for more details.
Read [the complete helm](https://github.com/apache/skywalking-helm/blob/476afd51d44589c77a4cbaac950272cd5d064ea9/chart/skywalking/templates/oap-deployment.yaml#L125) for more details.
## Zookeeper coordinator
Expand Down
2 changes: 1 addition & 1 deletion docs/en/setup/backend/backend-k8s.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Before you read Kubernetes deployment guidance, please make sure you have read `Quick Start` and `Advanced Setup` documents.
Most SkyWalking OAP settings are controlled through System environment variables when applying helm deployment.

Follow instructions in the [deploying SkyWalking backend to Kubernetes cluster](https://github.com/apache/skywalking-kubernetes)
Follow instructions in the [deploying SkyWalking backend to Kubernetes cluster](https://github.com/apache/skywalking-helm)
to deploy OAP and UI to a Kubernetes cluster.

Please refer to the Readme file.
2 changes: 1 addition & 1 deletion docs/en/setup/backend/backend-telemetry.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ adjust the configurations below to fit your scenarios.

If you deploy an OAP server cluster on Kubernetes, the oap-server instance (pod) would not have a static IP or hostname. We can leverage [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/getting-started/#kubernetes) to discover the oap-server instance, and scrape & transfer the metrics to OAP [OpenTelemetry receiver](opentelemetry-receiver.md).

On how to install SkyWalking on k8s, you can refer to [Apache SkyWalking Kubernetes](https://github.com/apache/skywalking-kubernetes).
On how to install SkyWalking on k8s, you can refer to [Apache SkyWalking Kubernetes](https://github.com/apache/skywalking-helm).

Set this up following these steps:

Expand Down
3 changes: 1 addition & 2 deletions docs/en/setup/backend/configuration-vocabulary.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ The Configuration Vocabulary lists all available configurations provided by `app
| - | - | maxSizeOfBatchSql | The maximum size of batch size of SQL execution | SW_STORAGE_MAX_SIZE_OF_BATCH_SQL | 2000 |
| - | - | asyncBatchPersistentPoolSize | async flush data into database thread size | SW_STORAGE_ASYNC_BATCH_PERSISTENT_POOL_SIZE | 4 |
| - | banyandb | - | BanyanDB storage. | - | - |
| - | - | host | Host of the BanyanDB. | SW_STORAGE_BANYANDB_HOST | 127.0.0.1 |
| - | - | port | Port of the BanyanDB. | SW_STORAGE_BANYANDB_PORT | 17912 |
| - | - | targets | Hosts with ports of the BanyanDB. | SW_STORAGE_BANYANDB_TARGETS | 127.0.0.1:17912 |
| - | - | maxBulkSize | The maximum size of write entities in a single batch write call. | SW_STORAGE_BANYANDB_MAX_BULK_SIZE | 5000 |
| - | - | flushInterval | Period of flush interval. In the timeunit of seconds. | SW_STORAGE_BANYANDB_FLUSH_INTERVAL | 15 |
| - | - | metricsShardsNumber | Shards Number for measure/metrics. | SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER | 1 |
Expand Down
7 changes: 4 additions & 3 deletions docs/en/setup/backend/storages/banyandb.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
[BanyanDB](https://github.com/apache/skywalking-banyandb) is a dedicated storage implementation developed by the SkyWalking Team and the community.
Activate BanyanDB as the storage, and set storage provider to **banyandb**.

The OAP requires BanyanDB 0.5 server. As BanyanDB is still in the beta phase, we don't provide any compatibility besides the required version.

```yaml
storage:
banyandb:
host: ${SW_STORAGE_BANYANDB_HOST:127.0.0.1}
port: ${SW_STORAGE_BANYANDB_PORT:17912}
targets: ${SW_STORAGE_BANYANDB_TARGETS:127.0.0.1:17912}
maxBulkSize: ${SW_STORAGE_BANYANDB_MAX_BULK_SIZE:5000}
flushInterval: ${SW_STORAGE_BANYANDB_FLUSH_INTERVAL:15}
metricsShardsNumber: ${SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER:1}
Expand All @@ -22,4 +23,4 @@ storage:
```
For more details, please refer to the documents of [BanyanDB](https://skywalking.apache.org/docs/skywalking-banyandb/next/readme/)
and [BanyanDB Java Client](https://github.com/apache/skywalking-banyandb-java-client) subprojects.
and [BanyanDB Java Client](https://github.com/apache/skywalking-banyandb-java-client) subprojects.
4 changes: 2 additions & 2 deletions docs/en/setup/envoy/als_setting.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ istioctl install \
--set meshConfig.enableEnvoyAccessLogService=true \
--set meshConfig.defaultConfig.envoyAccessLogService.address=skywalking-oap.istio-system:11800
git clone https://github.com/apache/skywalking-kubernetes.git
cd skywalking-kubernetes/chart
git clone https://github.com/apache/skywalking-helm.git
cd skywalking-helm/chart
helm repo add elastic https://helm.elastic.co
Expand Down
2 changes: 1 addition & 1 deletion oap-server-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
<banyandb-java-client.version>0.4.0</banyandb-java-client.version>
<banyandb-java-client.version>0.5.0</banyandb-java-client.version>
<kafka-clients.version>2.8.1</kafka-clients.version>
<spring-kafka-test.version>2.4.6.RELEASE</spring-kafka-test.version>
<consul.client.version>1.5.3</consul.client.version>
Expand Down
6 changes: 5 additions & 1 deletion ...-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ public void start(List<AlarmCallback> allCallbacks) {

if (!alarmMessageList.isEmpty()) {
for (AlarmCallback callback : allCallbacks) {
callback.doAlarm(alarmMessageList);
try {
callback.doAlarm(alarmMessageList);
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
}
}
} catch (Exception e) {
Expand Down
Loading

0 comments on commit 44e47ce

Please sign in to comment.