[config] add another config file 'application.yml' for graal, remove …

…useless code.
apache · Sep 27, 2023 · c8ba19b · c8ba19b
1 parent 3c4233f
commit c8ba19b
Show file tree

Hide file tree

Showing 9 changed files with 587 additions and 103 deletions.
diff --git a/graal/apache-skywalking-native-apm/src/main/assembly/binary.xml b/graal/apache-skywalking-native-apm/src/main/assembly/binary.xml
@@ -52,7 +52,6 @@
         <fileSet>
             <directory>${project.basedir}/../../oap-server/server-starter/src/main/resources</directory>
             <includes>
-                <include>application.yml</include>
                 <include>component-libraries.yml</include>
                 <include>gateways.yml</include>
                 <include>service-apdex-threshold.yml</include>
@@ -120,4 +119,11 @@
             <outputDirectory/>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>${project.basedir}/../graal-server-starter/src/main/resources/application.yml</source>
+            <outputDirectory>config</outputDirectory>
+            <fileMode>0644</fileMode>
+        </file>
+    </files>
 </assembly>
diff --git a/graal/dist-material/bin/exportEnv.sh b/graal/dist-material/bin/exportEnv.sh
diff --git a/graal/dist-material/bin/oapService-native-jar.sh b/graal/dist-material/bin/oapService-native-jar.sh
@@ -30,6 +30,8 @@ if [ ! -d "${OAP_LOG_DIR}" ]; then
     mkdir -p "${OAP_LOG_DIR}"
 fi
 
+export SW_CONFIG_PATHS=${OAP_HOME}/config
+
 _RUNJAVA=${JAVA_HOME}/bin/java
 [ -z "$JAVA_HOME" ] && _RUNJAVA=java
 

diff --git a/...g/apache/skywalking/oap/server/receiver/envoy/graal/EnvoyMetricReceiverProviderGraal.java b/...g/apache/skywalking/oap/server/receiver/envoy/graal/EnvoyMetricReceiverProviderGraal.java
@@ -29,7 +29,7 @@
 public class EnvoyMetricReceiverProviderGraal extends EnvoyMetricReceiverProvider {
     @Override
     public String name() {
-        return "default-graalvm";
+        return "graalvm";
     }
 
     @Override

diff --git a/graal/graal-server-starter/pom.xml b/graal/graal-server-starter/pom.xml
@@ -112,7 +112,6 @@
                             <execution>
                                 <id>generate</id>
                                 <goals>
-                                    <goal>envoy-generate</goal>
                                     <goal>oal-generate</goal>
                                 </goals>
                             </execution>

diff --git a/graal/graal-server-starter/src/main/resources/application.yml b/graal/graal-server-starter/src/main/resources/application.yml
diff --git a/...org/apache/skywalking/oap/log/analyzer/provider/graal/LogAnalyzerModuleProviderGraal.java b/...org/apache/skywalking/oap/log/analyzer/provider/graal/LogAnalyzerModuleProviderGraal.java
@@ -29,7 +29,7 @@
 public class LogAnalyzerModuleProviderGraal extends LogAnalyzerModuleProvider {
     @Override
     public String name() {
-        return "default-graalvm";
+        return "graalvm";
     }
 
     @Override

diff --git a/...-graal-compiling-plugin/src/main/java/org/apache/skywalking/graal/EnvoyGeneratorMojo.java b/...-graal-compiling-plugin/src/main/java/org/apache/skywalking/graal/EnvoyGeneratorMojo.java
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
@@ -248,9 +248,6 @@ log-analyzer:
   default:
     lalFiles: ${SW_LOG_LAL_FILES:envoy-als,mesh-dp,mysql-slowsql,pgsql-slowsql,redis-slowsql,k8s-service,default}
     malFiles: ${SW_LOG_MAL_FILES:""}
-  default-graalvm:
-    lalFiles: ${SW_LOG_LAL_FILES:envoy-als,mesh-dp,mysql-slowsql,pgsql-slowsql,redis-slowsql,k8s-service,default}
-    malFiles: ${SW_LOG_MAL_FILES:""}
 
 event-analyzer:
   selector: ${SW_EVENT_ANALYZER:default}
@@ -322,12 +319,6 @@ envoy-metric:
     # Be careful, when using environment variables to pass this configuration, use single quotes(`''`) to avoid it being evaluated by the shell.
     k8sServiceNameRule: ${K8S_SERVICE_NAME_RULE:"${pod.metadata.labels.(service.istio.io/canonical-name)}"}
     istioServiceNameRule: ${ISTIO_SERVICE_NAME_RULE:"${serviceEntry.metadata.name}"}
-  default-graalvm:
-    acceptMetricsService: ${SW_ENVOY_METRIC_SERVICE:true}
-    alsHTTPAnalysis: ${SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS:""}
-    alsTCPAnalysis: ${SW_ENVOY_METRIC_ALS_TCP_ANALYSIS:""}
-    k8sServiceNameRule: ${K8S_SERVICE_NAME_RULE:"${pod.metadata.labels.(service.istio.io/canonical-name)}"}
-    istioServiceNameRule: ${ISTIO_SERVICE_NAME_RULE:"${serviceEntry.metadata.name}"}
 
 kafka-fetcher:
   selector: ${SW_KAFKA_FETCHER:-}
@@ -440,7 +431,7 @@ promql:
     restMaxThreads: ${SW_PROMQL_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_PROMQL_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_PROMQL_REST_QUEUE_SIZE:0}
-    
+
 #This module is for LogQL API.
 logql:
   selector: ${SW_LOGQL:default}
@@ -584,4 +575,4 @@ ai-pipeline:
   selector: ${SW_AI_PIPELINE:default}
   default:
     uriRecognitionServerAddr: ${SW_AI_PIPELINE_URI_RECOGNITION_SERVER_ADDR:}
-    uriRecognitionServerPort: ${SW_AI_PIPELINE_URI_RECOGNITION_SERVER_PORT:17128}
+    uriRecognitionServerPort: ${SW_AI_PIPELINE_URI_RECOGNITION_SERVER_PORT:17128}