Skip to content

Commit 654a039

Browse files
SrikarMannepalliSrikarMannepalli
authored
remove inclusion rule apis (#149)
* remove inclusion rule apis * update config service version
1 parent ac42029 commit 654a039

32 files changed

+1
-860
lines changed

‎hypertrace-graphql-platform/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dependencies {
1313
api("org.hypertrace.config.service:spaces-config-service-api:0.1.1")
1414
api("org.hypertrace.config.service:labels-config-service-api:0.1.15")
1515
api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.16")
16-
api("org.hypertrace.config.service:span-processing-config-service-api:0.1.34")
16+
api("org.hypertrace.config.service:span-processing-config-service-api:0.1.36")
1717
}
1818
}

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,22 @@
88
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanCreateRuleRequest;
99
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanDeleteRuleRequest;
1010
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanUpdateRuleRequest;
11-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanCreateRuleRequest;
12-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanDeleteRuleRequest;
13-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanUpdateRuleRequest;
1411
import org.hypertrace.graphql.spanprocessing.schema.mutation.ApiNamingRuleCreate;
1512
import org.hypertrace.graphql.spanprocessing.schema.mutation.ApiNamingRuleUpdate;
1613
import org.hypertrace.graphql.spanprocessing.schema.mutation.ExcludeSpanRuleCreate;
1714
import org.hypertrace.graphql.spanprocessing.schema.mutation.ExcludeSpanRuleUpdate;
18-
import org.hypertrace.graphql.spanprocessing.schema.mutation.IncludeSpanRuleCreate;
19-
import org.hypertrace.graphql.spanprocessing.schema.mutation.IncludeSpanRuleUpdate;
2015
import org.hypertrace.span.processing.config.service.v1.ApiNamingRuleConfig;
2116
import org.hypertrace.span.processing.config.service.v1.ApiNamingRuleInfo;
2217
import org.hypertrace.span.processing.config.service.v1.CreateApiNamingRuleRequest;
2318
import org.hypertrace.span.processing.config.service.v1.CreateExcludeSpanRuleRequest;
24-
import org.hypertrace.span.processing.config.service.v1.CreateIncludeSpanRuleRequest;
2519
import org.hypertrace.span.processing.config.service.v1.DeleteApiNamingRuleRequest;
2620
import org.hypertrace.span.processing.config.service.v1.DeleteExcludeSpanRuleRequest;
27-
import org.hypertrace.span.processing.config.service.v1.DeleteIncludeSpanRuleRequest;
2821
import org.hypertrace.span.processing.config.service.v1.ExcludeSpanRuleInfo;
29-
import org.hypertrace.span.processing.config.service.v1.IncludeSpanRuleInfo;
3022
import org.hypertrace.span.processing.config.service.v1.SegmentMatchingBasedConfig;
3123
import org.hypertrace.span.processing.config.service.v1.UpdateApiNamingRule;
3224
import org.hypertrace.span.processing.config.service.v1.UpdateApiNamingRuleRequest;
3325
import org.hypertrace.span.processing.config.service.v1.UpdateExcludeSpanRule;
3426
import org.hypertrace.span.processing.config.service.v1.UpdateExcludeSpanRuleRequest;
35-
import org.hypertrace.span.processing.config.service.v1.UpdateIncludeSpanRule;
36-
import org.hypertrace.span.processing.config.service.v1.UpdateIncludeSpanRuleRequest;
3727

3828
public class ConfigServiceSpanProcessingRequestConverter {
3929

@@ -77,39 +67,6 @@ DeleteExcludeSpanRuleRequest convert(ExcludeSpanDeleteRuleRequest request) {
7767
return DeleteExcludeSpanRuleRequest.newBuilder().setId(request.id()).build();
7868
}
7969

80-
CreateIncludeSpanRuleRequest convert(IncludeSpanCreateRuleRequest request) {
81-
return CreateIncludeSpanRuleRequest.newBuilder()
82-
.setRuleInfo(convertInput(request.createInput()))
83-
.build();
84-
}
85-
86-
private IncludeSpanRuleInfo convertInput(IncludeSpanRuleCreate includeSpanRuleCreate) {
87-
return IncludeSpanRuleInfo.newBuilder()
88-
.setName(includeSpanRuleCreate.name())
89-
.setFilter(this.filterConverter.convert(includeSpanRuleCreate.spanFilter()))
90-
.setDisabled(includeSpanRuleCreate.disabled())
91-
.build();
92-
}
93-
94-
UpdateIncludeSpanRuleRequest convert(IncludeSpanUpdateRuleRequest request) {
95-
return UpdateIncludeSpanRuleRequest.newBuilder()
96-
.setRule(convertInput(request.updateInput()))
97-
.build();
98-
}
99-
100-
private UpdateIncludeSpanRule convertInput(IncludeSpanRuleUpdate includeSpanRuleUpdate) {
101-
return UpdateIncludeSpanRule.newBuilder()
102-
.setId(includeSpanRuleUpdate.id())
103-
.setName(includeSpanRuleUpdate.name())
104-
.setFilter(this.filterConverter.convert(includeSpanRuleUpdate.spanFilter()))
105-
.setDisabled(includeSpanRuleUpdate.disabled())
106-
.build();
107-
}
108-
109-
DeleteIncludeSpanRuleRequest convert(IncludeSpanDeleteRuleRequest request) {
110-
return DeleteIncludeSpanRuleRequest.newBuilder().setId(request.id()).build();
111-
}
112-
11370
CreateApiNamingRuleRequest convert(ApiNamingCreateRuleRequest request) {
11471
return CreateApiNamingRuleRequest.newBuilder()
11572
.setRuleInfo(convertInput(request.createInput()))

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

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,16 @@
1111
import org.hypertrace.graphql.spanprocessing.schema.mutation.DeleteSpanProcessingRuleResponse;
1212
import org.hypertrace.graphql.spanprocessing.schema.query.ApiNamingRuleResultSet;
1313
import org.hypertrace.graphql.spanprocessing.schema.query.ExcludeSpanRuleResultSet;
14-
import org.hypertrace.graphql.spanprocessing.schema.query.IncludeSpanRuleResultSet;
1514
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
1615
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
17-
import org.hypertrace.graphql.spanprocessing.schema.rule.IncludeSpanRule;
1816
import org.hypertrace.span.processing.config.service.v1.CreateApiNamingRuleResponse;
1917
import org.hypertrace.span.processing.config.service.v1.CreateExcludeSpanRuleResponse;
20-
import org.hypertrace.span.processing.config.service.v1.CreateIncludeSpanRuleResponse;
2118
import org.hypertrace.span.processing.config.service.v1.DeleteApiNamingRuleResponse;
2219
import org.hypertrace.span.processing.config.service.v1.DeleteExcludeSpanRuleResponse;
23-
import org.hypertrace.span.processing.config.service.v1.DeleteIncludeSpanRuleResponse;
2420
import org.hypertrace.span.processing.config.service.v1.GetAllApiNamingRulesResponse;
2521
import org.hypertrace.span.processing.config.service.v1.GetAllExcludeSpanRulesResponse;
26-
import org.hypertrace.span.processing.config.service.v1.GetAllIncludeSpanRulesResponse;
2722
import org.hypertrace.span.processing.config.service.v1.UpdateApiNamingRuleResponse;
2823
import org.hypertrace.span.processing.config.service.v1.UpdateExcludeSpanRuleResponse;
29-
import org.hypertrace.span.processing.config.service.v1.UpdateIncludeSpanRuleResponse;
3024

3125
@Slf4j
3226
public class ConfigServiceSpanProcessingResponseConverter {
@@ -43,10 +37,6 @@ Single<ExcludeSpanRuleResultSet> convert(GetAllExcludeSpanRulesResponse response
4337
return this.convertExcludeSpanRuleResultSet(response.getRuleDetailsList());
4438
}
4539

46-
Single<IncludeSpanRuleResultSet> convert(GetAllIncludeSpanRulesResponse response) {
47-
return this.convertIncludeSpanRuleResultSet(response.getRuleDetailsList());
48-
}
49-
5040
Single<ApiNamingRuleResultSet> convert(GetAllApiNamingRulesResponse response) {
5141
return this.convertApiNamingRuleResultSet(response.getRuleDetailsList());
5242
}
@@ -59,14 +49,6 @@ private Maybe<ExcludeSpanRule> convertOrDrop(
5949
.onErrorComplete();
6050
}
6151

62-
private Maybe<IncludeSpanRule> convertOrDrop(
63-
org.hypertrace.span.processing.config.service.v1.IncludeSpanRuleDetails ruleDetails) {
64-
return this.ruleConverter
65-
.convert(ruleDetails)
66-
.doOnError(error -> log.error("Error converting IncludeSpanRule", error))
67-
.onErrorComplete();
68-
}
69-
7052
private Maybe<ApiNamingRule> convertOrDrop(
7153
org.hypertrace.span.processing.config.service.v1.ApiNamingRuleDetails ruleDetails) {
7254
return this.ruleConverter
@@ -83,14 +65,6 @@ private Single<ExcludeSpanRuleResultSet> convertExcludeSpanRuleResultSet(
8365
.map(ConvertedExcludeSpanRuleResultSet::new);
8466
}
8567

86-
private Single<IncludeSpanRuleResultSet> convertIncludeSpanRuleResultSet(
87-
List<org.hypertrace.span.processing.config.service.v1.IncludeSpanRuleDetails> ruleDetails) {
88-
return Observable.fromIterable(ruleDetails)
89-
.concatMapMaybe(this::convertOrDrop)
90-
.toList()
91-
.map(ConvertedIncludeSpanRuleResultSet::new);
92-
}
93-
9468
private Single<ApiNamingRuleResultSet> convertApiNamingRuleResultSet(
9569
List<org.hypertrace.span.processing.config.service.v1.ApiNamingRuleDetails> ruleDetails) {
9670
return Observable.fromIterable(ruleDetails)
@@ -111,18 +85,6 @@ Single<DeleteSpanProcessingRuleResponse> convert(DeleteExcludeSpanRuleResponse r
11185
return Single.just(new DefaultDeleteSpanProcessingRuleResponse(true));
11286
}
11387

114-
Single<IncludeSpanRule> convert(CreateIncludeSpanRuleResponse response) {
115-
return this.ruleConverter.convert(response.getRuleDetails());
116-
}
117-
118-
Single<IncludeSpanRule> convert(UpdateIncludeSpanRuleResponse response) {
119-
return this.ruleConverter.convert(response.getRuleDetails());
120-
}
121-
122-
Single<DeleteSpanProcessingRuleResponse> convert(DeleteIncludeSpanRuleResponse response) {
123-
return Single.just(new DefaultDeleteSpanProcessingRuleResponse(true));
124-
}
125-
12688
Single<ApiNamingRule> convert(CreateApiNamingRuleResponse response) {
12789
return this.ruleConverter.convert(response.getRuleDetails());
12890
}
@@ -156,20 +118,6 @@ private ConvertedExcludeSpanRuleResultSet(List<ExcludeSpanRule> results) {
156118
}
157119
}
158120

159-
@Value
160-
@Accessors(fluent = true)
161-
private static class ConvertedIncludeSpanRuleResultSet implements IncludeSpanRuleResultSet {
162-
List<IncludeSpanRule> results;
163-
long total;
164-
long count;
165-
166-
private ConvertedIncludeSpanRuleResultSet(List<IncludeSpanRule> results) {
167-
this.results = results;
168-
this.count = results.size();
169-
this.total = results.size();
170-
}
171-
}
172-
173121
@Value
174122
@Accessors(fluent = true)
175123
private static class ConvertedApiNamingRuleResultSet implements ApiNamingRuleResultSet {

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
import java.util.List;
66
import java.util.NoSuchElementException;
77
import javax.inject.Inject;
8-
import lombok.Builder;
98
import lombok.Value;
109
import lombok.experimental.Accessors;
1110
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
1211
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRuleConfig;
1312
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRuleConfigType;
1413
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
15-
import org.hypertrace.graphql.spanprocessing.schema.rule.IncludeSpanRule;
1614
import org.hypertrace.graphql.spanprocessing.schema.rule.SegmentMatchingBasedRuleConfig;
1715
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
1816
import org.hypertrace.span.processing.config.service.v1.ApiNamingRuleDetails;
@@ -46,28 +44,6 @@ public Single<ExcludeSpanRule> convert(
4644
ruleDetails.getMetadata().getLastUpdatedTimestamp().getNanos())));
4745
}
4846

49-
public Single<IncludeSpanRule> convert(
50-
org.hypertrace.span.processing.config.service.v1.IncludeSpanRuleDetails ruleDetails) {
51-
return this.filterConverter
52-
.convert(ruleDetails.getRule().getRuleInfo().getFilter())
53-
.map(
54-
spanProcessingRuleFilter ->
55-
ConvertedIncludeSpanRule.builder()
56-
.id(ruleDetails.getRule().getId())
57-
.name(ruleDetails.getRule().getRuleInfo().getName())
58-
.spanFilter(spanProcessingRuleFilter)
59-
.disabled(ruleDetails.getRule().getRuleInfo().getDisabled())
60-
.creationTime(
61-
Instant.ofEpochSecond(
62-
ruleDetails.getMetadata().getCreationTimestamp().getSeconds(),
63-
ruleDetails.getMetadata().getCreationTimestamp().getNanos()))
64-
.lastUpdatedTime(
65-
Instant.ofEpochSecond(
66-
ruleDetails.getMetadata().getLastUpdatedTimestamp().getSeconds(),
67-
ruleDetails.getMetadata().getLastUpdatedTimestamp().getNanos()))
68-
.build());
69-
}
70-
7147
public Single<ApiNamingRule> convert(ApiNamingRuleDetails ruleDetails) {
7248
return this.filterConverter
7349
.convert(ruleDetails.getRule().getRuleInfo().getFilter())
@@ -114,18 +90,6 @@ private static class ConvertedExcludeSpanRule implements ExcludeSpanRule {
11490
Instant lastUpdatedTime;
11591
}
11692

117-
@Value
118-
@Builder
119-
@Accessors(fluent = true)
120-
private static class ConvertedIncludeSpanRule implements IncludeSpanRule {
121-
String id;
122-
String name;
123-
SpanProcessingRuleFilter spanFilter;
124-
boolean disabled;
125-
Instant creationTime;
126-
Instant lastUpdatedTime;
127-
}
128-
12993
@Value
13094
@Accessors(fluent = true)
13195
private static class ConvertedApiNamingRule implements ApiNamingRule {

‎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
@@ -15,19 +15,13 @@
1515
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanCreateRuleRequest;
1616
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanDeleteRuleRequest;
1717
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanUpdateRuleRequest;
18-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanCreateRuleRequest;
19-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanDeleteRuleRequest;
20-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanUpdateRuleRequest;
2118
import org.hypertrace.graphql.spanprocessing.schema.mutation.DeleteSpanProcessingRuleResponse;
2219
import org.hypertrace.graphql.spanprocessing.schema.query.ApiNamingRuleResultSet;
2320
import org.hypertrace.graphql.spanprocessing.schema.query.ExcludeSpanRuleResultSet;
24-
import org.hypertrace.graphql.spanprocessing.schema.query.IncludeSpanRuleResultSet;
2521
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
2622
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
27-
import org.hypertrace.graphql.spanprocessing.schema.rule.IncludeSpanRule;
2823
import org.hypertrace.span.processing.config.service.v1.GetAllApiNamingRulesRequest;
2924
import org.hypertrace.span.processing.config.service.v1.GetAllExcludeSpanRulesRequest;
30-
import org.hypertrace.span.processing.config.service.v1.GetAllIncludeSpanRulesRequest;
3125
import org.hypertrace.span.processing.config.service.v1.SpanProcessingConfigServiceGrpc;
3226

3327
public class ConfigServiceSpanProcessingRuleDao implements SpanProcessingRuleDao {
@@ -115,64 +109,6 @@ public Single<DeleteSpanProcessingRuleResponse> deleteExcludeSpanRule(
115109
.flatMap(this.responseConverter::convert);
116110
}
117111

118-
@Override
119-
public Single<IncludeSpanRuleResultSet> getIncludeSpanRules(ContextualRequest request) {
120-
return Single.fromFuture(
121-
this.grpcContextBuilder
122-
.build(request.context())
123-
.call(
124-
() ->
125-
this.configStub
126-
.withDeadlineAfter(
127-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
128-
.getAllIncludeSpanRules(
129-
GetAllIncludeSpanRulesRequest.getDefaultInstance())))
130-
.flatMap(this.responseConverter::convert);
131-
}
132-
133-
@Override
134-
public Single<IncludeSpanRule> createIncludeSpanRule(IncludeSpanCreateRuleRequest request) {
135-
return Single.fromFuture(
136-
this.grpcContextBuilder
137-
.build(request.context())
138-
.call(
139-
() ->
140-
this.configStub
141-
.withDeadlineAfter(
142-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
143-
.createIncludeSpanRule(this.requestConverter.convert(request))))
144-
.flatMap(this.responseConverter::convert);
145-
}
146-
147-
@Override
148-
public Single<IncludeSpanRule> updateIncludeSpanRule(IncludeSpanUpdateRuleRequest request) {
149-
return Single.fromFuture(
150-
this.grpcContextBuilder
151-
.build(request.context())
152-
.call(
153-
() ->
154-
this.configStub
155-
.withDeadlineAfter(
156-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
157-
.updateIncludeSpanRule(this.requestConverter.convert(request))))
158-
.flatMap(this.responseConverter::convert);
159-
}
160-
161-
@Override
162-
public Single<DeleteSpanProcessingRuleResponse> deleteIncludeSpanRule(
163-
IncludeSpanDeleteRuleRequest request) {
164-
return Single.fromFuture(
165-
this.grpcContextBuilder
166-
.build(request.context())
167-
.call(
168-
() ->
169-
this.configStub
170-
.withDeadlineAfter(
171-
serviceConfig.getConfigServiceTimeout().toMillis(), MILLISECONDS)
172-
.deleteIncludeSpanRule(this.requestConverter.convert(request))))
173-
.flatMap(this.responseConverter::convert);
174-
}
175-
176112
@Override
177113
public Single<ApiNamingRuleResultSet> getApiNamingRules(ContextualRequest request) {
178114
return Single.fromFuture(

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,11 @@
88
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanCreateRuleRequest;
99
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanDeleteRuleRequest;
1010
import org.hypertrace.graphql.spanprocessing.request.mutation.ExcludeSpanUpdateRuleRequest;
11-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanCreateRuleRequest;
12-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanDeleteRuleRequest;
13-
import org.hypertrace.graphql.spanprocessing.request.mutation.IncludeSpanUpdateRuleRequest;
1411
import org.hypertrace.graphql.spanprocessing.schema.mutation.DeleteSpanProcessingRuleResponse;
1512
import org.hypertrace.graphql.spanprocessing.schema.query.ApiNamingRuleResultSet;
1613
import org.hypertrace.graphql.spanprocessing.schema.query.ExcludeSpanRuleResultSet;
17-
import org.hypertrace.graphql.spanprocessing.schema.query.IncludeSpanRuleResultSet;
1814
import org.hypertrace.graphql.spanprocessing.schema.rule.ApiNamingRule;
1915
import org.hypertrace.graphql.spanprocessing.schema.rule.ExcludeSpanRule;
20-
import org.hypertrace.graphql.spanprocessing.schema.rule.IncludeSpanRule;
2116

2217
public interface SpanProcessingRuleDao {
2318
Single<ExcludeSpanRuleResultSet> getExcludeSpanRules(ContextualRequest request);
@@ -29,15 +24,6 @@ public interface SpanProcessingRuleDao {
2924
Single<DeleteSpanProcessingRuleResponse> deleteExcludeSpanRule(
3025
ExcludeSpanDeleteRuleRequest request);
3126

32-
Single<IncludeSpanRuleResultSet> getIncludeSpanRules(ContextualRequest request);
33-
34-
Single<IncludeSpanRule> createIncludeSpanRule(IncludeSpanCreateRuleRequest request);
35-
36-
Single<IncludeSpanRule> updateIncludeSpanRule(IncludeSpanUpdateRuleRequest request);
37-
38-
Single<DeleteSpanProcessingRuleResponse> deleteIncludeSpanRule(
39-
IncludeSpanDeleteRuleRequest request);
40-
4127
Single<ApiNamingRuleResultSet> getApiNamingRules(ContextualRequest request);
4228

4329
Single<ApiNamingRule> createApiNamingRule(ApiNamingCreateRuleRequest request);

0 commit comments

Comments
 (0)