Skip to content

Commit 73f24e1

Browse files
SrikarMannepalliSrikarMannepalli
authored
fix: remove api naming rule apis (#163)
1 parent a0b23b7 commit 73f24e1

File tree

36 files changed

+0
-1028
lines changed

36 files changed

+0
-1028
lines changed

‎hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanProcessingRequestConverter.java

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,16 @@
22

33
import java.util.NoSuchElementException;
44
import javax.inject.Inject;
5-
import org.hypertrace.graphql.spanprocessing.request.mutation.ApiNamingCreateRuleRequest;
6-
import org.hypertrace.graphql.spanprocessing.request.mutation.ApiNamingDeleteRuleRequest;
7-
import org.hypertrace.graphql.spanprocessing.request.mutation.ApiNamingUpdateRuleRequest;
85
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanCreateRuleRequest;
96
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanDeleteRuleRequest;
107
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanUpdateRuleRequest;
11-
import org.hypertrace.graphql.spanprocessing.schema.mutation.ApiNamingRuleCreate;
12-
import org.hypertrace.graphql.spanprocessing.schema.mutation.ApiNamingRuleUpdate;
138
import org.hypertrace.graphql.spanprocessing.schema.mutation.ExcludeSpanRuleCreate;
149
import org.hypertrace.graphql.spanprocessing.schema.mutation.ExcludeSpanRuleUpdate;
1510
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRuleRuleType;
16-
import org.hypertrace.span.processing.config.service.v1.ApiNamingRuleConfig;
17-
import org.hypertrace.span.processing.config.service.v1.ApiNamingRuleInfo;
18-
import org.hypertrace.span.processing.config.service.v1.CreateApiNamingRuleRequest;
1911
import org.hypertrace.span.processing.config.service.v1.CreateExcludeSpanRuleRequest;
20-
import org.hypertrace.span.processing.config.service.v1.DeleteApiNamingRuleRequest;
2112
import org.hypertrace.span.processing.config.service.v1.DeleteExcludeSpanRuleRequest;
2213
import org.hypertrace.span.processing.config.service.v1.ExcludeSpanRuleInfo;
2314
import org.hypertrace.span.processing.config.service.v1.RuleType;
24-
import org.hypertrace.span.processing.config.service.v1.SegmentMatchingBasedConfig;
25-
import org.hypertrace.span.processing.config.service.v1.UpdateApiNamingRule;
26-
import org.hypertrace.span.processing.config.service.v1.UpdateApiNamingRuleRequest;
2715
import org.hypertrace.span.processing.config.service.v1.UpdateExcludeSpanRule;
2816
import org.hypertrace.span.processing.config.service.v1.UpdateExcludeSpanRuleRequest;
2917

@@ -70,59 +58,6 @@ DeleteExcludeSpanRuleRequest convert(ExcludeSpanDeleteRuleRequest request) {
7058
return DeleteExcludeSpanRuleRequest.newBuilder().setId(request.id()).build();
7159
}
7260

73-
CreateApiNamingRuleRequest convert(ApiNamingCreateRuleRequest request) {
74-
return CreateApiNamingRuleRequest.newBuilder()
75-
.setRuleInfo(convertInput(request.createInput()))
76-
.build();
77-
}
78-
79-
private org.hypertrace.span.processing.config.service.v1.ApiNamingRuleInfo convertInput(
80-
ApiNamingRuleCreate apiNamingRuleCreate) {
81-
return ApiNamingRuleInfo.newBuilder()
82-
.setName(apiNamingRuleCreate.name())
83-
.setFilter(this.filterConverter.convert(apiNamingRuleCreate.spanFilter()))
84-
.setDisabled(apiNamingRuleCreate.disabled())
85-
.setRuleConfig(convertRuleConfig(apiNamingRuleCreate.apiNamingRuleConfig()))
86-
.build();
87-
}
88-
89-
private ApiNamingRuleConfig convertRuleConfig(
90-
org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRuleConfig apiNamingRuleConfig) {
91-
switch (apiNamingRuleConfig.apiNamingRuleConfigType()) {
92-
case SEGMENT_MATCHING:
93-
return ApiNamingRuleConfig.newBuilder()
94-
.setSegmentMatchingBasedConfig(
95-
SegmentMatchingBasedConfig.newBuilder()
96-
.addAllRegexes(apiNamingRuleConfig.segmentMatchingBasedRuleConfig().regexes())
97-
.addAllValues(apiNamingRuleConfig.segmentMatchingBasedRuleConfig().values())
98-
.build())
99-
.build();
100-
default:
101-
throw new NoSuchElementException(
102-
"Unsupported api naming rule config type: " + apiNamingRuleConfig);
103-
}
104-
}
105-
106-
UpdateApiNamingRuleRequest convert(ApiNamingUpdateRuleRequest request) {
107-
return UpdateApiNamingRuleRequest.newBuilder()
108-
.setRule(convertInput(request.updateInput()))
109-
.build();
110-
}
111-
112-
private UpdateApiNamingRule convertInput(ApiNamingRuleUpdate apiNamingRuleUpdate) {
113-
return UpdateApiNamingRule.newBuilder()
114-
.setId(apiNamingRuleUpdate.id())
115-
.setName(apiNamingRuleUpdate.name())
116-
.setFilter(this.filterConverter.convert(apiNamingRuleUpdate.spanFilter()))
117-
.setDisabled(apiNamingRuleUpdate.disabled())
118-
.setRuleConfig(convertRuleConfig(apiNamingRuleUpdate.apiNamingRuleConfig()))
119-
.build();
120-
}
121-
122-
DeleteApiNamingRuleRequest convert(ApiNamingDeleteRuleRequest request) {
123-
return DeleteApiNamingRuleRequest.newBuilder().setId(request.id()).build();
124-
}
125-
12661
RuleType convertExcludeSpanRuleRuleType(ExcludeSpanRuleRuleType ruleType) {
12762
// TODO: remove this check after making this field non-nullable
12863
if (ruleType == null) {

‎hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanProcessingResponseConverter.java

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.hypertrace.graphql.spanprocessing.dao;
22

3-
import static org.hypertrace.span.processing.config.service.v1.ApiNamingRuleConfig.RuleConfigCase.API_SPEC_BASED_CONFIG;
4-
53
import io.reactivex.rxjava3.core.Maybe;
64
import io.reactivex.rxjava3.core.Observable;
75
import io.reactivex.rxjava3.core.Single;
@@ -11,17 +9,11 @@
119
import lombok.experimental.Accessors;
1210
import lombok.extern.slf4j.Slf4j;
1311
import org.hypertrace.graphql.spanprocessing.schema.mutation.DeleteSpanProcessingRuleResponse;
14-
import org.hypertrace.graphql.spanprocessing.schema.query.ApiNamingRuleResultSet;
1512
import org.hypertrace.graphql.spanprocessing.schema.query.ExcludeSpanRuleResultSet;
16-
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
1713
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
18-
import org.hypertrace.span.processing.config.service.v1.CreateApiNamingRuleResponse;
1914
import org.hypertrace.span.processing.config.service.v1.CreateExcludeSpanRuleResponse;
20-
import org.hypertrace.span.processing.config.service.v1.DeleteApiNamingRuleResponse;
2115
import org.hypertrace.span.processing.config.service.v1.DeleteExcludeSpanRuleResponse;
22-
import org.hypertrace.span.processing.config.service.v1.GetAllApiNamingRulesResponse;
2316
import org.hypertrace.span.processing.config.service.v1.GetAllExcludeSpanRulesResponse;
24-
import org.hypertrace.span.processing.config.service.v1.UpdateApiNamingRuleResponse;
2517
import org.hypertrace.span.processing.config.service.v1.UpdateExcludeSpanRuleResponse;
2618

2719
@Slf4j
@@ -39,10 +31,6 @@ Single<ExcludeSpanRuleResultSet> convert(GetAllExcludeSpanRulesResponse response
3931
return this.convertExcludeSpanRuleResultSet(response.getRuleDetailsList());
4032
}
4133

42-
Single<ApiNamingRuleResultSet> convert(GetAllApiNamingRulesResponse response) {
43-
return this.convertApiNamingRuleResultSet(response.getRuleDetailsList());
44-
}
45-
4634
private Maybe<ExcludeSpanRule> convertOrDrop(
4735
org.hypertrace.span.processing.config.service.v1.ExcludeSpanRuleDetails ruleDetails) {
4836
return this.ruleConverter
@@ -51,20 +39,6 @@ private Maybe<ExcludeSpanRule> convertOrDrop(
5139
.onErrorComplete();
5240
}
5341

54-
private Maybe<ApiNamingRule> convertOrDrop(
55-
org.hypertrace.span.processing.config.service.v1.ApiNamingRuleDetails ruleDetails) {
56-
// drop api spec based rules
57-
if (API_SPEC_BASED_CONFIG.equals(
58-
ruleDetails.getRule().getRuleInfo().getRuleConfig().getRuleConfigCase())) {
59-
return Maybe.empty();
60-
}
61-
62-
return this.ruleConverter
63-
.convert(ruleDetails)
64-
.doOnError(error -> log.error("Error converting ApiNamingRule", error))
65-
.onErrorComplete();
66-
}
67-
6842
private Single<ExcludeSpanRuleResultSet> convertExcludeSpanRuleResultSet(
6943
List<org.hypertrace.span.processing.config.service.v1.ExcludeSpanRuleDetails> ruleDetails) {
7044
return Observable.fromIterable(ruleDetails)
@@ -73,14 +47,6 @@ private Single<ExcludeSpanRuleResultSet> convertExcludeSpanRuleResultSet(
7347
.map(ConvertedExcludeSpanRuleResultSet::new);
7448
}
7549

76-
private Single<ApiNamingRuleResultSet> convertApiNamingRuleResultSet(
77-
List<org.hypertrace.span.processing.config.service.v1.ApiNamingRuleDetails> ruleDetails) {
78-
return Observable.fromIterable(ruleDetails)
79-
.concatMapMaybe(this::convertOrDrop)
80-
.toList()
81-
.map(ConvertedApiNamingRuleResultSet::new);
82-
}
83-
8450
Single<ExcludeSpanRule> convert(CreateExcludeSpanRuleResponse response) {
8551
return this.ruleConverter.convert(response.getRuleDetails());
8652
}
@@ -93,18 +59,6 @@ Single<DeleteSpanProcessingRuleResponse> convert(DeleteExcludeSpanRuleResponse r
9359
return Single.just(new DefaultDeleteSpanProcessingRuleResponse(true));
9460
}
9561

96-
Single<ApiNamingRule> convert(CreateApiNamingRuleResponse response) {
97-
return this.ruleConverter.convert(response.getRuleDetails());
98-
}
99-
100-
Single<ApiNamingRule> convert(UpdateApiNamingRuleResponse response) {
101-
return this.ruleConverter.convert(response.getRuleDetails());
102-
}
103-
104-
Single<DeleteSpanProcessingRuleResponse> convert(DeleteApiNamingRuleResponse response) {
105-
return Single.just(new DefaultDeleteSpanProcessingRuleResponse(true));
106-
}
107-
10862
@Value
10963
@Accessors(fluent = true)
11064
private static class DefaultDeleteSpanProcessingRuleResponse
@@ -125,18 +79,4 @@ private ConvertedExcludeSpanRuleResultSet(List<ExcludeSpanRule> results) {
12579
this.total = results.size();
12680
}
12781
}
128-
129-
@Value
130-
@Accessors(fluent = true)
131-
private static class ConvertedApiNamingRuleResultSet implements ApiNamingRuleResultSet {
132-
List<ApiNamingRule> results;
133-
long total;
134-
long count;
135-
136-
private ConvertedApiNamingRuleResultSet(List<ApiNamingRule> results) {
137-
this.results = results;
138-
this.count = results.size();
139-
this.total = results.size();
140-
}
141-
}
14282
}

‎hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanProcessingRuleConverter.java

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22

33
import io.reactivex.rxjava3.core.Single;
44
import java.time.Instant;
5-
import java.util.List;
65
import java.util.NoSuchElementException;
76
import javax.inject.Inject;
87
import lombok.Value;
98
import lombok.experimental.Accessors;
10-
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
11-
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRuleConfig;
12-
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRuleConfigType;
139
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
1410
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRuleRuleType;
15-
import org.hypertrace.graphql.spanprocessing.schema.rule.SegmentMatchingBasedRuleConfig;
1611
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
17-
import org.hypertrace.span.processing.config.service.v1.ApiNamingRuleDetails;
1812
import org.hypertrace.span.processing.config.service.v1.RuleType;
19-
import org.hypertrace.span.processing.config.service.v1.SegmentMatchingBasedConfig;
2013

2114
class ConfigServiceSpanProcessingRuleConverter {
2215

@@ -47,41 +40,6 @@ public Single<ExcludeSpanRule> convert(
4740
ruleDetails.getMetadata().getLastUpdatedTimestamp().getNanos())));
4841
}
4942

50-
public Single<ApiNamingRule> convert(ApiNamingRuleDetails ruleDetails) {
51-
return this.filterConverter
52-
.convert(ruleDetails.getRule().getRuleInfo().getFilter())
53-
.map(
54-
spanProcessingRuleFilter ->
55-
new ConvertedApiNamingRule(
56-
ruleDetails.getRule().getId(),
57-
ruleDetails.getRule().getRuleInfo().getName(),
58-
spanProcessingRuleFilter,
59-
ruleDetails.getRule().getRuleInfo().getDisabled(),
60-
convertApiNamingRuleConfig(ruleDetails.getRule().getRuleInfo().getRuleConfig()),
61-
Instant.ofEpochSecond(
62-
ruleDetails.getMetadata().getCreationTimestamp().getSeconds(),
63-
ruleDetails.getMetadata().getCreationTimestamp().getNanos()),
64-
Instant.ofEpochSecond(
65-
ruleDetails.getMetadata().getLastUpdatedTimestamp().getSeconds(),
66-
ruleDetails.getMetadata().getLastUpdatedTimestamp().getNanos())));
67-
}
68-
69-
private ApiNamingRuleConfig convertApiNamingRuleConfig(
70-
org.hypertrace.span.processing.config.service.v1.ApiNamingRuleConfig apiNamingRuleConfig) {
71-
switch (apiNamingRuleConfig.getRuleConfigCase()) {
72-
case SEGMENT_MATCHING_BASED_CONFIG:
73-
SegmentMatchingBasedConfig segmentMatchingBasedConfig =
74-
apiNamingRuleConfig.getSegmentMatchingBasedConfig();
75-
return new ConvertedApiNamingRuleConfig(
76-
ApiNamingRuleConfigType.SEGMENT_MATCHING,
77-
new ConvertedSegmentMatchingBasedRuleConfig(
78-
segmentMatchingBasedConfig.getRegexesList(),
79-
segmentMatchingBasedConfig.getValuesList()));
80-
default:
81-
throw new NoSuchElementException("Unsupported Rule config type: " + apiNamingRuleConfig);
82-
}
83-
}
84-
8543
private ExcludeSpanRuleRuleType convertExcludeSpanRuleRuleType(RuleType ruleType) {
8644
switch (ruleType) {
8745
case RULE_TYPE_UNSPECIFIED: // required to cater for the older user configs(as they didn't
@@ -106,31 +64,4 @@ private static class ConvertedExcludeSpanRule implements ExcludeSpanRule {
10664
Instant creationTime;
10765
Instant lastUpdatedTime;
10866
}
109-
110-
@Value
111-
@Accessors(fluent = true)
112-
private static class ConvertedApiNamingRule implements ApiNamingRule {
113-
String id;
114-
String name;
115-
SpanProcessingRuleFilter spanFilter;
116-
boolean disabled;
117-
ApiNamingRuleConfig apiNamingRuleConfig;
118-
Instant creationTime;
119-
Instant lastUpdatedTime;
120-
}
121-
122-
@Value
123-
@Accessors(fluent = true)
124-
private static class ConvertedApiNamingRuleConfig implements ApiNamingRuleConfig {
125-
ApiNamingRuleConfigType apiNamingRuleConfigType;
126-
SegmentMatchingBasedRuleConfig segmentMatchingBasedRuleConfig;
127-
}
128-
129-
@Value
130-
@Accessors(fluent = true)
131-
private static class ConvertedSegmentMatchingBasedRuleConfig
132-
implements SegmentMatchingBasedRuleConfig {
133-
List<String> regexes;
134-
List<String> values;
135-
}
13667
}

‎hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanProcessingRuleDao.java

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@
99
import org.hypertrace.core.graphql.utils.grpc.GrpcChannelRegistry;
1010
import org.hypertrace.core.graphql.utils.grpc.GrpcContextBuilder;
1111
import org.hypertrace.graphql.config.HypertraceGraphQlServiceConfig;
12-
import org.hypertrace.graphql.spanprocessing.request.mutation.ApiNamingCreateRuleRequest;
13-
import org.hypertrace.graphql.spanprocessing.request.mutation.ApiNamingDeleteRuleRequest;
14-
import org.hypertrace.graphql.spanprocessing.request.mutation.ApiNamingUpdateRuleRequest;
1512
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanCreateRuleRequest;
1613
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanDeleteRuleRequest;
1714
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanUpdateRuleRequest;
1815
import org.hypertrace.graphql.spanprocessing.schema.mutation.DeleteSpanProcessingRuleResponse;
19-
import org.hypertrace.graphql.spanprocessing.schema.query.ApiNamingRuleResultSet;
2016
import org.hypertrace.graphql.spanprocessing.schema.query.ExcludeSpanRuleResultSet;
21-
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
2217
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
23-
import org.hypertrace.span.processing.config.service.v1.GetAllApiNamingRulesRequest;
2418
import org.hypertrace.span.processing.config.service.v1.GetAllExcludeSpanRulesRequest;
2519
import org.hypertrace.span.processing.config.service.v1.SpanProcessingConfigServiceGrpc;
2620

@@ -108,62 +102,4 @@ public Single<DeleteSpanProcessingRuleResponse> deleteExcludeSpanRule(
108102
.deleteExcludeSpanRule(this.requestConverter.convert(request))))
109103
.flatMap(this.responseConverter::convert);
110104
}
111-
112-
@Override
113-
public Single<ApiNamingRuleResultSet> getApiNamingRules(ContextualRequest request) {
114-
return Single.fromFuture(
115-
this.grpcContextBuilder
116-
.build(request.context())
117-
.call(
118-
() ->
119-
this.configStub
120-
.withDeadlineAfter(
121-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
122-
.getAllApiNamingRules(
123-
GetAllApiNamingRulesRequest.getDefaultInstance())))
124-
.flatMap(this.responseConverter::convert);
125-
}
126-
127-
@Override
128-
public Single<ApiNamingRule> createApiNamingRule(ApiNamingCreateRuleRequest request) {
129-
return Single.fromFuture(
130-
this.grpcContextBuilder
131-
.build(request.context())
132-
.call(
133-
() ->
134-
this.configStub
135-
.withDeadlineAfter(
136-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
137-
.createApiNamingRule(this.requestConverter.convert(request))))
138-
.flatMap(this.responseConverter::convert);
139-
}
140-
141-
@Override
142-
public Single<ApiNamingRule> updateApiNamingRule(ApiNamingUpdateRuleRequest request) {
143-
return Single.fromFuture(
144-
this.grpcContextBuilder
145-
.build(request.context())
146-
.call(
147-
() ->
148-
this.configStub
149-
.withDeadlineAfter(
150-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
151-
.updateApiNamingRule(this.requestConverter.convert(request))))
152-
.flatMap(this.responseConverter::convert);
153-
}
154-
155-
@Override
156-
public Single<DeleteSpanProcessingRuleResponse> deleteApiNamingRule(
157-
ApiNamingDeleteRuleRequest request) {
158-
return Single.fromFuture(
159-
this.grpcContextBuilder
160-
.build(request.context())
161-
.call(
162-
() ->
163-
this.configStub
164-
.withDeadlineAfter(
165-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
166-
.deleteApiNamingRule(this.requestConverter.convert(request))))
167-
.flatMap(this.responseConverter::convert);
168-
}
169105
}

0 commit comments

Comments
 (0)