Skip to content

Use hypertrace core common logical operator #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Use hypertrace core common logical operator #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hypertrace-core-graphql
Open in desktop
Submodule hypertrace-core-graphql updated 1 files
+12 −0 ...graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/schema/operator/LogicalOperator.java
13 changes: 7 additions & 6 deletions ...main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import lombok.experimental.Accessors;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingFilterField;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalFilter;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalOperator;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRelationalFilter;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRelationalOperator;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
Expand All @@ -26,15 +25,17 @@

public class ConfigServiceSpanFilterConverter {

private static final ImmutableBiMap<LogicalOperator, SpanProcessingLogicalOperator>
private static final ImmutableBiMap<
LogicalOperator, org.hypertrace.core.graphql.common.schema.operator.LogicalOperator>
LOGICAL_OPERATOR_OPERATOR_BI_MAP =
ImmutableBiMap.of(
LogicalOperator.LOGICAL_OPERATOR_AND,
SpanProcessingLogicalOperator.AND,
org.hypertrace.core.graphql.common.schema.operator.LogicalOperator.AND,
LogicalOperator.LOGICAL_OPERATOR_OR,
SpanProcessingLogicalOperator.OR);
org.hypertrace.core.graphql.common.schema.operator.LogicalOperator.OR);

private static final ImmutableBiMap<SpanProcessingLogicalOperator, LogicalOperator>
private static final ImmutableBiMap<
org.hypertrace.core.graphql.common.schema.operator.LogicalOperator, LogicalOperator>
OPERATOR_LOGICAL_OPERATOR_IMMUTABLE_BI_MAP = LOGICAL_OPERATOR_OPERATOR_BI_MAP.inverse();

private static final ImmutableBiMap<RelationalOperator, SpanProcessingRelationalOperator>
Expand Down Expand Up @@ -223,7 +224,7 @@ private static class ConvertedSpanProcessingRelationalFilter
@Value
@Accessors(fluent = true)
private static class ConvertedSpanProcessingLogicalFilter implements SpanProcessingLogicalFilter {
SpanProcessingLogicalOperator logicalOperator;
org.hypertrace.core.graphql.common.schema.operator.LogicalOperator logicalOperator;
List<SpanProcessingRuleFilter> spanFilters;
}

Expand Down
4 changes: 2 additions & 2 deletions ...hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import lombok.Value;
import lombok.experimental.Accessors;
import lombok.extern.jackson.Jacksonized;
import org.hypertrace.core.graphql.common.schema.operator.LogicalOperator;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalFilter;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalOperator;
import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;

@Value
@Accessors(fluent = true)
@Jacksonized
@Builder
public class DefaultSpanProcessingLogicalFilter implements SpanProcessingLogicalFilter {
SpanProcessingLogicalOperator logicalOperator;
LogicalOperator logicalOperator;
List<SpanProcessingRuleFilter> spanFilters;
}
3 changes: 2 additions & 1 deletion ...org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import graphql.annotations.annotationTypes.GraphQLName;
import graphql.annotations.annotationTypes.GraphQLNonNull;
import java.util.List;
import org.hypertrace.core.graphql.common.schema.operator.LogicalOperator;

@GraphQLName(SpanProcessingLogicalFilter.TYPE_NAME)
public interface SpanProcessingLogicalFilter {
Expand All @@ -15,7 +16,7 @@ public interface SpanProcessingLogicalFilter {
@GraphQLField
@GraphQLName(SPAN_PROCESSING_LOGICAL_OPERATOR_KEY)
@GraphQLNonNull
SpanProcessingLogicalOperator logicalOperator();
LogicalOperator logicalOperator();

@GraphQLField
@GraphQLName(SPAN_PROCESSING_FILTERS_KEY)
Expand Down
10 changes: 0 additions & 10 deletions ...g/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalOperator.java
View file
Open in desktop

This file was deleted.