Move metrics-baseline into ai-pipeline module

apache · Feb 18, 2025 · 6442631 · 6442631
1 parent 8d9aa67
commit 6442631
Show file tree

Hide file tree

Showing 30 changed files with 158 additions and 363 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -15,6 +15,7 @@
   production-ready. Don't need H2 as default storage anymore.
 * [Breaking Change] Bump up BanyanDB server version to 0.8.0. This version is not compatible with the previous 
   versions. Please upgrade the BanyanDB server to 0.8.0 before upgrading OAP to 10.2.0.
+* Move `metrics-baseline` module into `ai-pipeline` module.
 
 #### OAP Server
 

diff --git a/oap-server/ai-pipeline/pom.xml b/oap-server/ai-pipeline/pom.xml
@@ -62,6 +62,21 @@
             <artifactId>library-client</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>server-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-reflect</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -95,4 +110,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/...pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineConfig.java b/...pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineConfig.java
@@ -27,4 +27,6 @@
 public class AIPipelineConfig extends ModuleConfig {
     private String uriRecognitionServerAddr;
     private int uriRecognitionServerPort = 17128;
+    private String baselineServerAddr;
+    private int baselineServerPort = 18080;
 }
diff --git a/...pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineModule.java b/...pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineModule.java
@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.oap.server.ai.pipeline;
 
-import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriRecognition;
+import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryService;
 import org.apache.skywalking.oap.server.library.module.ModuleDefine;
 
 public class AIPipelineModule extends ModuleDefine {
@@ -30,8 +30,6 @@ public AIPipelineModule() {
 
     @Override
     public Class[] services() {
-        return new Class[]{
-            HttpUriRecognition.class
-        };
+        return new Class[]{BaselineQueryService.class};
     }
 }
diff --git a/...peline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineProvider.java b/...peline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineProvider.java
@@ -18,8 +18,11 @@
 
 package org.apache.skywalking.oap.server.ai.pipeline;
 
+import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryService;
+import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryServiceImpl;
 import org.apache.skywalking.oap.server.ai.pipeline.services.HttpUriRecognitionService;
-import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriRecognition;
+import org.apache.skywalking.oap.server.core.CoreModule;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGroupService;
 import org.apache.skywalking.oap.server.library.module.ModuleConfig;
 import org.apache.skywalking.oap.server.library.module.ModuleDefine;
 import org.apache.skywalking.oap.server.library.module.ModuleProvider;
@@ -56,25 +59,31 @@ public void onInitialized(final AIPipelineConfig initialized) {
 
     @Override
     public void prepare() throws ServiceNotProvidedException, ModuleStartException {
-        final HttpUriRecognitionService httpUriRecognitionService = new HttpUriRecognitionService(
-            aiPipelineConfig.getUriRecognitionServerAddr(),
-            aiPipelineConfig.getUriRecognitionServerPort()
-        );
-        this.registerServiceImplementation(HttpUriRecognition.class, httpUriRecognitionService);
+        this.registerServiceImplementation(BaselineQueryService.class, new BaselineQueryServiceImpl(
+            aiPipelineConfig.getBaselineServerAddr(),
+            aiPipelineConfig.getBaselineServerPort()
+        ));
     }
 
     @Override
     public void start() throws ServiceNotProvidedException, ModuleStartException {
-
+        final HttpUriRecognitionService httpUriRecognitionService = new HttpUriRecognitionService(
+            aiPipelineConfig.getUriRecognitionServerAddr(),
+            aiPipelineConfig.getUriRecognitionServerPort()
+        );
+        getManager().find(CoreModule.NAME).provider()
+            .getService(EndpointNameGroupService.class)
+            .startHttpUriRecognitionSvr(httpUriRecognitionService);
     }
 
     @Override
     public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException {
-
     }
 
     @Override
     public String[] requiredModules() {
-        return new String[0];
+        return new String[] {
+            CoreModule.NAME
+        };
     }
 }
diff --git a/...aseline/service/BaselineQueryService.java → ...peline/services/BaselineQueryService.java b/...aseline/service/BaselineQueryService.java → ...peline/services/BaselineQueryService.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.skywalking.oap.server.baseline.service;
+package org.apache.skywalking.oap.server.ai.pipeline.services;
 
 import java.util.Map;
 import org.apache.skywalking.oap.server.library.module.Service;

diff --git a/...ine/service/BaselineQueryServiceImpl.java → ...ne/services/BaselineQueryServiceImpl.java b/...ine/service/BaselineQueryServiceImpl.java → ...ne/services/BaselineQueryServiceImpl.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.skywalking.oap.server.baseline.service;
+package org.apache.skywalking.oap.server.ai.pipeline.services;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

diff --git a/...java/org/apache/skywalking/oap/server/ai/pipeline/services/HttpUriRecognitionService.java b/...java/org/apache/skywalking/oap/server/ai/pipeline/services/HttpUriRecognitionService.java
@@ -28,8 +28,8 @@
 import org.apache.skywalking.oap.server.ai.pipeline.grpc.HttpUriRecognitionResponse;
 import org.apache.skywalking.oap.server.ai.pipeline.grpc.HttpUriRecognitionServiceGrpc;
 import org.apache.skywalking.oap.server.ai.pipeline.grpc.HttpUriRecognitionSyncRequest;
-import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriPattern;
-import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriRecognition;
+import org.apache.skywalking.oap.server.core.config.group.ai.HttpUriPattern;
+import org.apache.skywalking.oap.server.core.config.group.ai.HttpUriRecognition;
 import org.apache.skywalking.oap.server.library.client.grpc.GRPCClient;
 import org.apache.skywalking.oap.server.library.util.StringUtil;
 

diff --git a/...seline/service/PredictServiceMetrics.java → ...eline/services/PredictServiceMetrics.java b/...seline/service/PredictServiceMetrics.java → ...eline/services/PredictServiceMetrics.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.skywalking.oap.server.baseline.service;
+package org.apache.skywalking.oap.server.ai.pipeline.services;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...rver/baseline/service/ServiceMetrics.java → .../ai/pipeline/services/ServiceMetrics.java b/...rver/baseline/service/ServiceMetrics.java → .../ai/pipeline/services/ServiceMetrics.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.skywalking.oap.server.baseline.service;
+package org.apache.skywalking.oap.server.ai.pipeline.services;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...cs-baseline/src/main/proto/baseline.proto → ...ai-pipeline/src/main/proto/baseline.proto b/...cs-baseline/src/main/proto/baseline.proto → ...ai-pipeline/src/main/proto/baseline.proto
diff --git a/.../server/baseline/BaselineQueryServer.java → ...ne/src/test/java/BaselineQueryServer.java b/.../server/baseline/BaselineQueryServer.java → ...ne/src/test/java/BaselineQueryServer.java
@@ -16,19 +16,17 @@
  *
  */
 
-package org.apache.skywalking.oap.server.baseline;
-
 import com.google.protobuf.Empty;
 import io.grpc.stub.StreamObserver;
 import lombok.Builder;
 import lombok.Data;
+import org.apache.skywalking.apm.baseline.v3.AlarmBaselineLabeledValue;
 import org.apache.skywalking.apm.baseline.v3.AlarmBaselineMetricsNames;
-import org.apache.skywalking.oap.server.core.analysis.DownSampling;
-import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
 import org.apache.skywalking.apm.baseline.v3.AlarmBaselineServiceGrpc;
-import org.apache.skywalking.apm.baseline.v3.AlarmBaselineLabeledValue;
 import org.apache.skywalking.apm.baseline.v3.AlarmBaselineValue;
 import org.apache.skywalking.apm.baseline.v3.KeyStringValuePair;
+import org.apache.skywalking.oap.server.core.analysis.DownSampling;
+import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
 
 import java.util.ArrayList;
 import java.util.Calendar;

diff --git a/...p/server/baseline/BaselineServerTest.java → ...ine/src/test/java/BaselineServerTest.java b/...p/server/baseline/BaselineServerTest.java → ...ine/src/test/java/BaselineServerTest.java
@@ -16,17 +16,15 @@
  *
  */
 
-package org.apache.skywalking.oap.server.baseline;
-
 import io.grpc.ManagedChannel;
 import io.grpc.Server;
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.util.MutableHandlerRegistry;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.server.baseline.service.BaselineQueryServiceImpl;
-import org.apache.skywalking.oap.server.baseline.service.PredictServiceMetrics;
-import org.apache.skywalking.oap.server.baseline.service.ServiceMetrics;
+import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryServiceImpl;
+import org.apache.skywalking.oap.server.ai.pipeline.services.PredictServiceMetrics;
+import org.apache.skywalking.oap.server.ai.pipeline.services.ServiceMetrics;
 import org.apache.skywalking.oap.server.core.analysis.DownSampling;
 import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
 import org.junit.jupiter.api.AfterEach;

diff --git a/oap-server/metrics-baseline/pom.xml b/oap-server/metrics-baseline/pom.xml
diff --git a/...rics-baseline/src/main/java/org/apache/skywalking/oap/server/baseline/BaselineModule.java b/...rics-baseline/src/main/java/org/apache/skywalking/oap/server/baseline/BaselineModule.java
diff --git a/...eline/src/main/java/org/apache/skywalking/oap/server/baseline/BaselineModuleProvider.java b/...eline/src/main/java/org/apache/skywalking/oap/server/baseline/BaselineModuleProvider.java