Introduce the isCustom field and map it from the gRPC response (#120)

suresh-prakash · web-flow · commit e0b0148870f4 · 2022-11-24T18:49:21.000+05:30
diff --git a/hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeModel.java b/hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeModel.java
@@ -23,4 +23,6 @@ public interface AttributeModel {
   List<AttributeModelMetricAggregationType> supportedMetricAggregationTypes();
 
   boolean groupable();
+
+  boolean isCustom();
 }
diff --git a/hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeModelTranslator.java b/hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeModelTranslator.java
@@ -36,23 +36,28 @@ public class AttributeModelTranslator {
   public Optional<AttributeModel> translate(AttributeMetadata attributeMetadata) {
     try {
       return Optional.of(
-          new DefaultAttributeModel(
-              attributeMetadata.getId(),
-              attributeMetadata.getScopeString(),
-              attributeMetadata.getKey(),
-              attributeMetadata.getDisplayName(),
-              this.convertType(attributeMetadata.getValueKind()),
-              attributeMetadata.getUnit(),
-              attributeMetadata.getOnlyAggregationsAllowed(),
-              attributeMetadata.getType().equals(AttributeType.METRIC),
-              this.convertMetricAggregationTypes(attributeMetadata.getSupportedAggregationsList()),
-              attributeMetadata.getGroupable()));
+          DefaultAttributeModel.builder()
+              .id(attributeMetadata.getId())
+              .scope(attributeMetadata.getScopeString())
+              .key(attributeMetadata.getKey())
+              .displayName(attributeMetadata.getDisplayName())
+              .type(this.convertType(attributeMetadata.getValueKind()))
+              .units(attributeMetadata.getUnit())
+              .onlySupportsGrouping(attributeMetadata.getOnlyAggregationsAllowed())
+              .onlySupportsAggregation(attributeMetadata.getType().equals(AttributeType.METRIC))
+              .supportedMetricAggregationTypes(
+                  this.convertMetricAggregationTypes(
+                      attributeMetadata.getSupportedAggregationsList()))
+              .groupable(attributeMetadata.getGroupable())
+              .isCustom(attributeMetadata.getCustom())
+              .build());
     } catch (Exception e) {
       LOGGER.warn("Dropping attribute {} : {}", attributeMetadata.getId(), e.getMessage());
       return Optional.empty();
     }
   }
 
+  @SuppressWarnings("unused")
   public AttributeKind convertType(AttributeModelType type) {
     return Optional.ofNullable(TYPE_MAPPING.inverse().get(type))
         .orElseThrow(
diff --git a/hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/DefaultAttributeModel.java b/hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/DefaultAttributeModel.java
@@ -1,13 +1,17 @@
 package org.hypertrace.core.graphql.attributes;
 
+import static lombok.AccessLevel.PRIVATE;
+
 import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Value;
 import lombok.experimental.Accessors;
 
 @Value
 @Builder(toBuilder = true)
 @Accessors(fluent = true)
+@AllArgsConstructor(access = PRIVATE)
 class DefaultAttributeModel implements AttributeModel {
   String id;
   String scope;
@@ -19,4 +23,5 @@ class DefaultAttributeModel implements AttributeModel {
   boolean onlySupportsAggregation;
   List<AttributeModelMetricAggregationType> supportedMetricAggregationTypes;
   boolean groupable;
+  boolean isCustom;
 }
diff --git a/hypertrace-core-graphql-attribute-store/src/test/java/org/hypertrace/core/graphql/attributes/AttributeModelTranslatorTest.java b/hypertrace-core-graphql-attribute-store/src/test/java/org/hypertrace/core/graphql/attributes/AttributeModelTranslatorTest.java
@@ -32,6 +32,7 @@ void beforeEach() {
             .setOnlyAggregationsAllowed(true)
             .addAllSupportedAggregations(List.of(AggregateFunction.SUM, AggregateFunction.AVG))
             .setGroupable(true)
+            .setCustom(true)
             .build();
 
     this.expectedModel =
@@ -49,6 +50,7 @@ void beforeEach() {
                     AttributeModelMetricAggregationType.SUM,
                     AttributeModelMetricAggregationType.AVG))
             .groupable(true)
+            .isCustom(true)
             .build();
   }
 
@@ -90,6 +92,7 @@ void testStringArrayAttributeKindTranslation() {
             .addAllSupportedAggregations(
                 List.of(AggregateFunction.DISTINCT_COUNT, AggregateFunction.AVGRATE))
             .setGroupable(false)
+            .setCustom(false)
             .build();
 
     this.expectedModel =
@@ -106,6 +109,7 @@ void testStringArrayAttributeKindTranslation() {
                     AttributeModelMetricAggregationType.DISTINCT_COUNT,
                     AttributeModelMetricAggregationType.AVGRATE))
             .groupable(false)
+            .isCustom(false)
             .build();
 
     assertEquals(Optional.of(this.expectedModel), this.translator.translate(this.metadata));
diff --git a/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/BaseDaoTest.java b/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/BaseDaoTest.java
@@ -53,6 +53,7 @@ static class DefaultAttributeModel implements AttributeModel {
     boolean onlySupportsAggregation;
     List<AttributeModelMetricAggregationType> supportedMetricAggregationTypes;
     boolean groupable;
+    boolean isCustom;
   }
 
   @Value
diff --git a/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/GatewayServiceLogEventsRequestBuilderTest.java b/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/GatewayServiceLogEventsRequestBuilderTest.java
@@ -89,6 +89,7 @@ void testBuildRequest() {
                         false,
                         false,
                         Collections.emptyList(),
+                        false,
                         false),
                     AttributeExpression.forAttributeKey("traceId"))),
             new DefaultAttributeRequest(
@@ -103,6 +104,7 @@ void testBuildRequest() {
                         false,
                         false,
                         Collections.emptyList(),
+                        false,
                         false),
                     AttributeExpression.forAttributeKey("timestamp"))));
     DefaultLogEventRequest defaultLogEventRequest =
diff --git a/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/GatewayServiceLogEventsResponseConverterTest.java b/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/GatewayServiceLogEventsResponseConverterTest.java
@@ -95,6 +95,7 @@ void testConvert() {
                         false,
                         false,
                         Collections.emptyList(),
+                        false,
                         false),
                     AttributeExpression.forAttributeKey("traceId"))),
             new DefaultAttributeRequest(
@@ -109,6 +110,7 @@ void testConvert() {
                         false,
                         false,
                         Collections.emptyList(),
+                        false,
                         false),
                     AttributeExpression.forAttributeKey("timestamp"))));
     DefaultLogEventRequest defaultLogEventRequest =
diff --git a/hypertrace-core-graphql-metadata-schema/src/main/java/org/hypertrace/core/graphql/metadata/response/DefaultAttributeMetadata.java b/hypertrace-core-graphql-metadata-schema/src/main/java/org/hypertrace/core/graphql/metadata/response/DefaultAttributeMetadata.java
@@ -1,6 +1,9 @@
 package org.hypertrace.core.graphql.metadata.response;
 
+import static lombok.AccessLevel.PRIVATE;
+
 import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -11,6 +14,7 @@
 @Value
 @Builder
 @Accessors(fluent = true)
+@AllArgsConstructor(access = PRIVATE)
 class DefaultAttributeMetadata implements AttributeMetadata {
   String scope;
   String name;
@@ -21,4 +25,5 @@ class DefaultAttributeMetadata implements AttributeMetadata {
   boolean onlySupportsAggregation;
   List<MetricAggregationType> supportedAggregations;
   boolean groupable;
+  boolean isCustom;
 }
diff --git a/hypertrace-core-graphql-metadata-schema/src/main/java/org/hypertrace/core/graphql/metadata/response/MetadataResponseBuilder.java b/hypertrace-core-graphql-metadata-schema/src/main/java/org/hypertrace/core/graphql/metadata/response/MetadataResponseBuilder.java
@@ -46,16 +46,18 @@ public Maybe<AttributeMetadata> build(AttributeModel model) {
             this.convertMetricAggregationTypes(model.supportedMetricAggregationTypes()),
             this.typeConverter.convert(model.type()),
             (aggregations, type) ->
-                new DefaultAttributeMetadata(
-                    this.scopeStringTranslator.toExternal(model.scope()),
-                    model.key(),
-                    model.displayName(),
-                    type,
-                    model.units(),
-                    model.onlySupportsGrouping(),
-                    model.onlySupportsAggregation(),
-                    aggregations,
-                    model.groupable()))
+                DefaultAttributeMetadata.builder()
+                    .scope(this.scopeStringTranslator.toExternal(model.scope()))
+                    .name(model.key())
+                    .displayName(model.displayName())
+                    .type(type)
+                    .units(model.units())
+                    .onlySupportsGrouping(model.onlySupportsGrouping())
+                    .onlySupportsAggregation(model.onlySupportsAggregation())
+                    .supportedAggregations(aggregations)
+                    .groupable(model.groupable())
+                    .isCustom(model.isCustom())
+                    .build())
         .cast(AttributeMetadata.class)
         .onErrorComplete();
   }
diff --git a/hypertrace-core-graphql-metadata-schema/src/main/java/org/hypertrace/core/graphql/metadata/schema/AttributeMetadata.java b/hypertrace-core-graphql-metadata-schema/src/main/java/org/hypertrace/core/graphql/metadata/schema/AttributeMetadata.java
@@ -20,6 +20,7 @@ public interface AttributeMetadata {
   String ATTRIBUTE_METADATA_ONLY_SUPPORTS_GROUPING_NAME = "onlySupportsGrouping";
   String ATTRIBUTE_METADATA_SUPPORTED_AGGREGATIONS_NAME = "supportedAggregations";
   String ATTRIBUTE_METADATA_GROUPABLE_NAME = "groupable";
+  String ATTRIBUTE_METADATA_IS_CUSTOM = "isCustom";
 
   @GraphQLField
   @GraphQLNonNull
@@ -67,4 +68,9 @@ public interface AttributeMetadata {
   @GraphQLNonNull
   @GraphQLName(ATTRIBUTE_METADATA_GROUPABLE_NAME)
   boolean groupable();
+
+  @GraphQLField
+  @GraphQLNonNull
+  @GraphQLName(ATTRIBUTE_METADATA_IS_CUSTOM)
+  boolean isCustom();
 }
diff --git a/hypertrace-core-graphql-metadata-schema/src/test/java/org/hypertrace/core/graphql/metadata/response/MetadataResponseBuilderTest.java b/hypertrace-core-graphql-metadata-schema/src/test/java/org/hypertrace/core/graphql/metadata/response/MetadataResponseBuilderTest.java
@@ -46,6 +46,7 @@ void beforeEach() {
     when(mockModel.type()).thenReturn(AttributeModelType.STRING);
     when(mockModel.units()).thenReturn("unit");
     when(mockModel.groupable()).thenReturn(true);
+    when(mockModel.isCustom()).thenReturn(true);
     when(mockModel.onlySupportsGrouping()).thenReturn(false);
     when(mockModel.onlySupportsAggregation()).thenReturn(true);
     when(mockModel.supportedMetricAggregationTypes())
@@ -77,6 +78,7 @@ void canBuildResponse() {
                 .supportedAggregations(
                     List.of(MetricAggregationType.SUM, MetricAggregationType.AVG))
                 .groupable(true)
+                .isCustom(true)
                 .build()),
         this.builder.build(this.models).blockingGet());
   }
@@ -103,6 +105,7 @@ void filtersAnyAggregationConversionErrors() {
                 .onlySupportsAggregation(true)
                 .supportedAggregations(List.of(MetricAggregationType.AVG))
                 .groupable(true)
+                .isCustom(true)
                 .build()),
         this.builder.build(this.models).blockingGet());
   }
diff --git a/hypertrace-core-graphql-platform/build.gradle.kts b/hypertrace-core-graphql-platform/build.gradle.kts
@@ -6,7 +6,7 @@ javaPlatform {
   allowDependencies()
 }
 
-val attributeServiceVersion: String = "0.14.11"
+val attributeServiceVersion: String = "0.14.12"
 
 dependencies {
   api(platform("io.grpc:grpc-bom:1.47.0"))
diff --git a/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/DaoTestUtil.java b/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/DaoTestUtil.java
@@ -51,6 +51,7 @@ static class DefaultAttributeModel implements AttributeModel {
     boolean onlySupportsAggregation;
     List<AttributeModelMetricAggregationType> supportedMetricAggregationTypes;
     boolean groupable;
+    boolean isCustom;
   }
 
   @Value
@@ -111,6 +112,7 @@ static class DefaultTimeRange implements TimeRangeArgument {
                   false,
                   false,
                   Collections.emptyList(),
+                  false,
                   false),
               AttributeExpression.forAttributeKey("traceId")));
 
@@ -127,6 +129,7 @@ static class DefaultTimeRange implements TimeRangeArgument {
                   false,
                   false,
                   Collections.emptyList(),
+                  false,
                   false),
               AttributeExpression.forAttributeKey("spanId")));
 
@@ -143,6 +146,7 @@ static class DefaultTimeRange implements TimeRangeArgument {
                   false,
                   false,
                   Collections.emptyList(),
+                  false,
                   false),
               AttributeExpression.forAttributeKey("attributes")));
 
@@ -159,6 +163,7 @@ static class DefaultTimeRange implements TimeRangeArgument {
                   false,
                   false,
                   Collections.emptyList(),
+                  false,
                   false),
               AttributeExpression.forAttributeKey("id")));
 

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,6 @@ public interface AttributeModel {`
`23`	`23`	`List<AttributeModelMetricAggregationType> supportedMetricAggregationTypes();`
`24`	`24`
`25`	`25`	`boolean groupable();`
	`26`	`+`
	`27`	`+ boolean isCustom();`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ static class DefaultAttributeModel implements AttributeModel {`
`53`	`53`	`boolean onlySupportsAggregation;`
`54`	`54`	`List<AttributeModelMetricAggregationType> supportedMetricAggregationTypes;`
`55`	`55`	`boolean groupable;`
	`56`	`+ boolean isCustom;`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`@Value`