From a6c7c7166388ca65f1682569b109d93863691b6e Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Tue, 11 Jun 2024 21:14:36 +0800 Subject: [PATCH] Increase `SW_CORE_GRPC_MAX_MESSAGE_SIZE` to 50MB and e2e bump up the version of the opentelemetry-collector to 0.102.1. (#12321) --- .github/workflows/skywalking.yaml | 2 +- docs/en/changes/changes.md | 3 ++- docs/en/setup/backend/backend-expose.md | 2 +- docs/en/setup/backend/configuration-vocabulary.md | 3 ++- docs/en/setup/backend/grpc-security.md | 2 +- oap-server/server-starter/src/main/resources/application.yml | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index a6c47db5deff..943730c75a1f 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -332,7 +332,7 @@ jobs: runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }} timeout-minutes: 60 env: - OTEL_COLLECTOR_VERSION: 0.92.0 + OTEL_COLLECTOR_VERSION: 0.102.1 strategy: fail-fast: false matrix: diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 7a5d87fbc018..fca04eede65e 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -1,7 +1,7 @@ ## 10.1.0 #### Project - +* E2E: bump up the version of the opentelemetry-collector to 0.102.1. #### OAP Server @@ -9,6 +9,7 @@ * Support exclude the specific namespaces traffic in the eBPF Access Log receiver. * Add Golang as a supported language for Elasticsearch. * Remove unnecessary BanyanDB flushing logs(info). +* Increase `SW_CORE_GRPC_MAX_MESSAGE_SIZE` to 50MB. #### UI diff --git a/docs/en/setup/backend/backend-expose.md b/docs/en/setup/backend/backend-expose.md index f016ebd7b2b5..f540a77f2834 100644 --- a/docs/en/setup/backend/backend-expose.md +++ b/docs/en/setup/backend/backend-expose.md @@ -22,7 +22,7 @@ receiver-sharing-server: gRPCHost: ${SW_RECEIVER_GRPC_HOST:0.0.0.0} gRPCPort: ${SW_RECEIVER_GRPC_PORT:0} maxConcurrentCallsPerConnection: ${SW_RECEIVER_GRPC_MAX_CONCURRENT_CALL:0} - maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:0} + maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:52428800} #50MB gRPCThreadPoolSize: ${SW_RECEIVER_GRPC_THREAD_POOL_SIZE:0} gRPCSslEnabled: ${SW_RECEIVER_GRPC_SSL_ENABLED:false} gRPCSslKeyPath: ${SW_RECEIVER_GRPC_SSL_KEY_PATH:""} diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index a76c44746faf..e721922c5260 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -38,7 +38,7 @@ The Configuration Vocabulary lists all available configurations provided by `app | - | - | autocompleteTagValuesQueryMaxSize | The max size of tags values for autocomplete select. | SW_AUTOCOMPLETE_TAG_VALUES_QUERY_MAX_SIZE | 100 | | - | - | gRPCThreadPoolSize | Pool size of gRPC server. | SW_CORE_GRPC_THREAD_POOL_SIZE | Default to gRPC's implementation, which is a cached thread pool that can grow infinitely. | | - | - | maxConcurrentCallsPerConnection | The maximum number of concurrent calls permitted for each incoming connection. Defaults to no limit. | SW_CORE_GRPC_MAX_CONCURRENT_CALL | - | -| - | - | maxMessageSize | Sets the maximum message size allowed to be received on the server. Empty means 4 MiB. | SW_CORE_GRPC_MAX_MESSAGE_SIZE | 4M(based on Netty) | +| - | - | maxMessageSize | Sets the maximum message size allowed to be received on the server. Empty means 4 MiB. | SW_CORE_GRPC_MAX_MESSAGE_SIZE | 52428800 (50MB) | | - | - | remoteTimeout | Timeout for cluster internal communication (in seconds). | - | 20 | | - | - | maxSizeOfNetworkAddressAlias | The maximum size of network address detected in the system being monitored. | - | 1_000_000 | | - | - | maxPageSizeOfQueryProfileSnapshot | The maximum size for snapshot analysis in an OAP query. | - | 500 | @@ -171,6 +171,7 @@ The Configuration Vocabulary lists all available configurations provided by `app | - | - | gRPCSslKeyPath | File path of gRPC SSL key. | SW_RECEIVER_GRPC_SSL_KEY_PATH | - | | - | - | gRPCSslCertChainPath | File path of gRPC SSL cert chain. | SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH | - | | - | - | maxConcurrentCallsPerConnection | The maximum number of concurrent calls permitted for each incoming connection. Defaults to no limit. | SW_RECEIVER_GRPC_MAX_CONCURRENT_CALL | - | +| - | - | maxMessageSize | Sets the maximum message size allowed to be received on the server. Empty means 4 MiB. | SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE | 52428800 (50MB) | | - | - | authentication | The token text for authentication. Works for gRPC connection only. Once this is set, the client is required to use the same token. | SW_AUTHENTICATION | - | | log-analyzer | default | Log Analyzer. | SW_LOG_ANALYZER | default | | | - | - | lalFiles | The LAL configuration file names (without file extension) to be activated. Read [LAL](../../concepts-and-designs/lal.md) for more details. | SW_LOG_LAL_FILES | default | diff --git a/docs/en/setup/backend/grpc-security.md b/docs/en/setup/backend/grpc-security.md index 59f78356789b..d5dae1984524 100644 --- a/docs/en/setup/backend/grpc-security.md +++ b/docs/en/setup/backend/grpc-security.md @@ -78,7 +78,7 @@ receiver-sharing-server: gRPCHost: ${SW_RECEIVER_GRPC_HOST:0.0.0.0} gRPCPort: ${SW_RECEIVER_GRPC_PORT:"changeMe"} maxConcurrentCallsPerConnection: ${SW_RECEIVER_GRPC_MAX_CONCURRENT_CALL:0} - maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:0} + maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:52428800} #50MB gRPCThreadPoolSize: ${SW_RECEIVER_GRPC_THREAD_POOL_SIZE:0} gRPCSslEnabled: ${SW_RECEIVER_GRPC_SSL_ENABLED:true} gRPCSslKeyPath: ${SW_RECEIVER_GRPC_SSL_KEY_PATH:"/path/to/server.pem"} diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 3d97836093fa..9e391d49216e 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -81,7 +81,7 @@ core: gRPCHost: ${SW_CORE_GRPC_HOST:0.0.0.0} gRPCPort: ${SW_CORE_GRPC_PORT:11800} maxConcurrentCallsPerConnection: ${SW_CORE_GRPC_MAX_CONCURRENT_CALL:0} - maxMessageSize: ${SW_CORE_GRPC_MAX_MESSAGE_SIZE:0} + maxMessageSize: ${SW_CORE_GRPC_MAX_MESSAGE_SIZE:52428800} #50MB gRPCThreadPoolSize: ${SW_CORE_GRPC_THREAD_POOL_SIZE:-1} gRPCSslEnabled: ${SW_CORE_GRPC_SSL_ENABLED:false} gRPCSslKeyPath: ${SW_CORE_GRPC_SSL_KEY_PATH:""} @@ -295,7 +295,7 @@ receiver-sharing-server: gRPCHost: ${SW_RECEIVER_GRPC_HOST:0.0.0.0} gRPCPort: ${SW_RECEIVER_GRPC_PORT:0} maxConcurrentCallsPerConnection: ${SW_RECEIVER_GRPC_MAX_CONCURRENT_CALL:0} - maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:0} + maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:52428800} #50MB gRPCThreadPoolSize: ${SW_RECEIVER_GRPC_THREAD_POOL_SIZE:0} gRPCSslEnabled: ${SW_RECEIVER_GRPC_SSL_ENABLED:false} gRPCSslKeyPath: ${SW_RECEIVER_GRPC_SSL_KEY_PATH:""}