You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2026/08/11 14:50:56 UTC
(skywalking) 04/06: merge 10.2.0
This is an automated email from the ASF dual-hosted git repository.
JaredTan95 pushed a commit to branch 10.30-qirui-gyg
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 9d289bbec61b3d547adcdcb3038d57b3b06f8783
Author: Jared Tan <ji...@daocloud.io>
AuthorDate: Mon Oct 20 13:22:38 2025 +0800
merge 10.2.0
---
apm-webapp/pom.xml | 70 +++++++++++-----------
.../listener/strategy/SegmentStatusStrategy.java | 2 +-
.../StorageModuleElasticsearchProvider.java | 2 +-
3 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index ffc4a175a7..dbe959a95a 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -95,41 +95,41 @@
<build>
<finalName>skywalking-webapp</finalName>
<plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>${frontend-maven-plugin.version}</version>
- <configuration>
- <workingDirectory>${ui.path}</workingDirectory>
- <nodeVersion>v22.14.0</nodeVersion>
- </configuration>
- <executions>
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- </execution>
- <execution>
- <id>npm ci</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>ci --registry=https://registry.npmjs.org/</arguments>
- </configuration>
- </execution>
- <execution>
- <id>npm run build</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>run build</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin>-->
+<!-- <groupId>com.github.eirslett</groupId>-->
+<!-- <artifactId>frontend-maven-plugin</artifactId>-->
+<!-- <version>${frontend-maven-plugin.version}</version>-->
+<!-- <configuration>-->
+<!-- <workingDirectory>${ui.path}</workingDirectory>-->
+<!-- <nodeVersion>v22.14.0</nodeVersion>-->
+<!-- </configuration>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>install node and npm</id>-->
+<!-- <goals>-->
+<!-- <goal>install-node-and-npm</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>npm ci</id>-->
+<!-- <goals>-->
+<!-- <goal>npm</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <arguments>ci --registry=https://registry.npmjs.org/</arguments>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>npm run build</id>-->
+<!-- <goals>-->
+<!-- <goal>npm</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <arguments>run build</arguments>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/strategy/SegmentStatusStrategy.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/strategy/SegmentStatusStrategy.java
index 62c4e39951..8751c5c17c 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/strategy/SegmentStatusStrategy.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/strategy/SegmentStatusStrategy.java
@@ -62,7 +62,7 @@ public enum SegmentStatusStrategy {
AtomicBoolean isError = new AtomicBoolean(false);
if (spanObject != null) {
spanObject.getLogsList().forEach(l -> {
- for (KeyStringValuePair keyStringValuePair: l.getDataList()){
+ for (KeyStringValuePair keyStringValuePair : l.getDataList()) {
if (keyStringValuePair.getKey().equals("error.kind") && keyStringValuePair.getValue().contains("BusinessException")) {
isError.set(false);
break;
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
index 6bd985cb59..ec5a74af15 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
@@ -195,7 +195,7 @@ public class StorageModuleElasticsearchProvider extends ModuleProvider {
.getTrustStorePass(), config.getUser(), config.getPassword(),
indexNameConverter(config.getNamespace()), config.getConnectTimeout(),
config.getSocketTimeout(), config.getResponseTimeout(),
- config.getNumHttpClientThread(),config.getInsecureHosts()
+ config.getNumHttpClientThread(), config.getInsecureHosts()
);
modelInstaller = new StorageEsInstaller(elasticSearchClient, getManager(), config);