Skip to content

Commit 7785c41

Browse files
mrproliumrproliu
authored
Move metrics-baseline into ai-pipeline module (#13041)
1 parent 68ab2ed commit 7785c41

File tree

38 files changed

+166
-371
lines changed

38 files changed

+166
-371
lines changed

‎docs/en/api/metrics-query-expression.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ baseline(service_resp_time, upper)
511511
```
512512

513513
**Notice**:
514-
- This feature is required to enable the `baseline module` and deploy a baseline service. And the baseline service should implement the protocol of the [baseline.proto](../../../oap-server/metrics-baseline/src/main/proto/baseline.proto).
514+
- This feature is required to enable the `baseline module` and deploy a baseline service. And the baseline service should implement the protocol of the [baseline.proto](../../../oap-server/ai-pipeline/src/main/proto/baseline.proto).
515515
Otherwise, the result will be empty.
516516
- The baseline operation requires the relative metrics declared through baseline service.
517517
Otherwise, the result will be empty, which means there is no baseline or predicated value.

‎docs/en/changes/changes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
production-ready. Don't need H2 as default storage anymore.
1616
* [Breaking Change] Bump up BanyanDB server version to 0.8.0. This version is not compatible with the previous
1717
versions. Please upgrade the BanyanDB server to 0.8.0 before upgrading OAP to 10.2.0.
18+
* Move `metrics-baseline` module into `ai-pipeline` module.
1819

1920
#### OAP Server
2021

‎oap-server/ai-pipeline/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,21 @@
6262
<artifactId>library-client</artifactId>
6363
<version>${project.version}</version>
6464
</dependency>
65+
<dependency>
66+
<groupId>org.apache.skywalking</groupId>
67+
<artifactId>server-core</artifactId>
68+
<version>${project.version}</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.grpc</groupId>
72+
<artifactId>grpc-testing</artifactId>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.powermock</groupId>
77+
<artifactId>powermock-reflect</artifactId>
78+
<scope>test</scope>
79+
</dependency>
6580
</dependencies>
6681

6782
<build>
@@ -95,4 +110,4 @@
95110
</plugin>
96111
</plugins>
97112
</build>
98-
</project>
113+
</project>

‎oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@
2727
public class AIPipelineConfig extends ModuleConfig {
2828
private String uriRecognitionServerAddr;
2929
private int uriRecognitionServerPort = 17128;
30+
private String baselineServerAddr;
31+
private int baselineServerPort = 18080;
3032
}

‎oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineModule.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.skywalking.oap.server.ai.pipeline;
2020

21-
import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriRecognition;
21+
import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryService;
2222
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
2323

2424
public class AIPipelineModule extends ModuleDefine {
@@ -30,8 +30,6 @@ public AIPipelineModule() {
3030

3131
@Override
3232
public Class[] services() {
33-
return new Class[]{
34-
HttpUriRecognition.class
35-
};
33+
return new Class[]{BaselineQueryService.class};
3634
}
3735
}

‎oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/AIPipelineProvider.java‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818

1919
package org.apache.skywalking.oap.server.ai.pipeline;
2020

21+
import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryService;
22+
import org.apache.skywalking.oap.server.ai.pipeline.services.BaselineQueryServiceImpl;
2123
import org.apache.skywalking.oap.server.ai.pipeline.services.HttpUriRecognitionService;
22-
import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriRecognition;
24+
import org.apache.skywalking.oap.server.core.CoreModule;
25+
import org.apache.skywalking.oap.server.core.config.group.EndpointNameGroupService;
2326
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
2427
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
2528
import org.apache.skywalking.oap.server.library.module.ModuleProvider;
@@ -56,25 +59,31 @@ public void onInitialized(final AIPipelineConfig initialized) {
5659

5760
@Override
5861
public void prepare() throws ServiceNotProvidedException, ModuleStartException {
59-
final HttpUriRecognitionService httpUriRecognitionService = new HttpUriRecognitionService(
60-
aiPipelineConfig.getUriRecognitionServerAddr(),
61-
aiPipelineConfig.getUriRecognitionServerPort()
62-
);
63-
this.registerServiceImplementation(HttpUriRecognition.class, httpUriRecognitionService);
62+
this.registerServiceImplementation(BaselineQueryService.class, new BaselineQueryServiceImpl(
63+
aiPipelineConfig.getBaselineServerAddr(),
64+
aiPipelineConfig.getBaselineServerPort()
65+
));
6466
}
6567

6668
@Override
6769
public void start() throws ServiceNotProvidedException, ModuleStartException {
68-
70+
final HttpUriRecognitionService httpUriRecognitionService = new HttpUriRecognitionService(
71+
aiPipelineConfig.getUriRecognitionServerAddr(),
72+
aiPipelineConfig.getUriRecognitionServerPort()
73+
);
74+
getManager().find(CoreModule.NAME).provider()
75+
.getService(EndpointNameGroupService.class)
76+
.startHttpUriRecognitionSvr(httpUriRecognitionService);
6977
}
7078

7179
@Override
7280
public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException {
73-
7481
}
7582

7683
@Override
7784
public String[] requiredModules() {
78-
return new String[0];
85+
return new String[] {
86+
CoreModule.NAME
87+
};
7988
}
8089
}

oap-server/metrics-baseline/src/main/java/org/apache/skywalking/oap/server/baseline/service/BaselineQueryService.java renamed to oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/services/BaselineQueryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.oap.server.baseline.service;
19+
package org.apache.skywalking.oap.server.ai.pipeline.services;
2020

2121
import java.util.Map;
2222
import org.apache.skywalking.oap.server.library.module.Service;

oap-server/metrics-baseline/src/main/java/org/apache/skywalking/oap/server/baseline/service/BaselineQueryServiceImpl.java renamed to oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/services/BaselineQueryServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.oap.server.baseline.service;
19+
package org.apache.skywalking.oap.server.ai.pipeline.services;
2020

2121
import com.google.common.cache.Cache;
2222
import com.google.common.cache.CacheBuilder;

‎oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/services/HttpUriRecognitionService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.apache.skywalking.oap.server.ai.pipeline.grpc.HttpUriRecognitionResponse;
2929
import org.apache.skywalking.oap.server.ai.pipeline.grpc.HttpUriRecognitionServiceGrpc;
3030
import org.apache.skywalking.oap.server.ai.pipeline.grpc.HttpUriRecognitionSyncRequest;
31-
import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriPattern;
32-
import org.apache.skywalking.oap.server.ai.pipeline.services.api.HttpUriRecognition;
31+
import org.apache.skywalking.oap.server.core.config.group.ai.HttpUriPattern;
32+
import org.apache.skywalking.oap.server.core.config.group.ai.HttpUriRecognition;
3333
import org.apache.skywalking.oap.server.library.client.grpc.GRPCClient;
3434
import org.apache.skywalking.oap.server.library.util.StringUtil;
3535

oap-server/metrics-baseline/src/main/java/org/apache/skywalking/oap/server/baseline/service/PredictServiceMetrics.java renamed to oap-server/ai-pipeline/src/main/java/org/apache/skywalking/oap/server/ai/pipeline/services/PredictServiceMetrics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.oap.server.baseline.service;
19+
package org.apache.skywalking.oap.server.ai.pipeline.services;
2020

2121
import lombok.Builder;
2222
import lombok.Data;

0 commit comments

Comments
 (0)