feat: Integrate with Gateway log api (#56)

Author: Rishabh

build.gradle.kts

@@ -21,6 +21,7 @@ subprojects {
     dependencies {
       "api"(platform(project(":hypertrace-core-graphql-platform")))
       "annotationProcessor"(platform(project(":hypertrace-core-graphql-platform")))
+      "testAnnotationProcessor"(platform(project(":hypertrace-core-graphql-platform")))
       "testImplementation"(platform(project(":hypertrace-core-graphql-test-platform")))
       "compileOnly"(platform(project(":hypertrace-core-graphql-platform")))
     }

hypertrace-core-graphql-attribute-scope-constants/src/main/java/org/hypertrace/core/graphql/atttributes/scopes/HypertraceCoreAttributeScopeString.java

@@ -3,4 +3,5 @@
 public interface HypertraceCoreAttributeScopeString {
   String SPAN = "EVENT";
   String TRACE = "TRACE";
+  String LOG_EVENT = "LOG_EVENT";
 }

hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/schema/typefunctions/UnknownScalar.java

@@ -15,6 +15,7 @@
 import graphql.schema.CoercingSerializeException;
 import graphql.schema.GraphQLScalarType;
 import java.lang.reflect.AnnotatedType;
+import java.time.Instant;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -28,6 +29,10 @@ public class UnknownScalar implements TypeFunction {
               new Coercing<>() {
                 @Override
                 public Object serialize(Object fetcherResult) throws CoercingSerializeException {
+                  if (fetcherResult instanceof Instant) {
+                    // todo handle for other direction as well
+                    return fetcherResult.toString();
+                  }
                   // Use default serializer
                   return fetcherResult;
                 }

hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/AttributeMapConverter.java

@@ -7,19 +7,19 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import javax.inject.Inject;
+import org.hypertrace.core.graphql.attributes.AttributeModel;
 import org.hypertrace.core.graphql.common.request.AttributeRequest;
 import org.hypertrace.core.graphql.common.utils.BiConverter;
 import org.hypertrace.core.graphql.common.utils.CollectorUtils;
-import org.hypertrace.core.graphql.common.utils.Converter;
 import org.hypertrace.gateway.service.v1.common.Value;
 
 class AttributeMapConverter
     implements BiConverter<Collection<AttributeRequest>, Map<String, Value>, Map<String, Object>> {
 
-  private final Converter<Value, Object> valueConverter;
+  private final BiConverter<Value, AttributeModel, Object> valueConverter;
 
   @Inject
-  AttributeMapConverter(Converter<Value, Object> valueConverter) {
+  AttributeMapConverter(BiConverter<Value, AttributeModel, Object> valueConverter) {
     this.valueConverter = valueConverter;
   }
 
@@ -37,7 +37,7 @@ private Single<Entry<String, Object>> buildAttributeMapEntry(
       AttributeRequest attributeRequest, Map<String, Value> response) {
     // Uses SimpleImmutableEntry to support null values
     return this.valueConverter
-        .convert(response.get(attributeRequest.alias()))
+        .convert(response.get(attributeRequest.alias()), attributeRequest.attribute())
         .map(value -> new SimpleImmutableEntry<>(attributeRequest.attribute().key(), value));
   }
 }

hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/GatewayUtilsModule.java

@@ -34,6 +34,8 @@ protected void configure() {
         .to(AttributeMapConverter.class);
 
     bind(Key.get(new TypeLiteral<Converter<Value, Object>>() {})).to(UnwrappedValueConverter.class);
+    bind(Key.get(new TypeLiteral<BiConverter<Value, AttributeModel, Object>>() {}))
+        .to(UnwrappedValueConverter.class);
     bind(Key.get(new TypeLiteral<Converter<Collection<AttributeRequest>, Set<Expression>>>() {}))
         .to(SelectionExpressionSetConverter.class);
 

hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/LiteralConstantConverter.java

@@ -46,6 +46,7 @@ private Value convertValue(Optional<Object> optionalObject) {
     if (this.assignableToAnyOfClasses(object.getClass(), Boolean.class)) {
       return Value.newBuilder().setValueType(ValueType.BOOL).setBoolean((Boolean) object).build();
     }
+    // todo handle Instant type object
     if (this.assignableToAnyOfClasses(object.getClass(), TemporalAccessor.class)) {
       return Value.newBuilder()
           .setValueType(ValueType.TIMESTAMP)

hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/UnwrappedValueConverter.java

@@ -3,10 +3,14 @@
 import io.reactivex.rxjava3.core.Single;
 import java.time.Instant;
 import java.util.Optional;
+import org.hypertrace.core.graphql.attributes.AttributeModel;
+import org.hypertrace.core.graphql.common.utils.BiConverter;
 import org.hypertrace.core.graphql.common.utils.Converter;
 import org.hypertrace.gateway.service.v1.common.Value;
+import org.hypertrace.gateway.service.v1.common.ValueType;
 
-class UnwrappedValueConverter implements Converter<Value, Object> {
+class UnwrappedValueConverter
+    implements Converter<Value, Object>, BiConverter<Value, AttributeModel, Object> {
 
   @Override
   public Single<Object> convert(Value from) {
@@ -43,4 +47,24 @@ public Single<Object> convert(Value from) {
                     value.getValueType().name())));
     }
   }
+
+  @Override
+  public Single<Object> convert(Value from, AttributeModel attributeModel) {
+    Value value = Optional.ofNullable(from).orElse(Value.getDefaultInstance());
+    if (ValueType.TIMESTAMP.equals(value.getValueType())) {
+      return handleTimestamp(value, attributeModel);
+    }
+    return convert(from);
+  }
+
+  private Single<Object> handleTimestamp(Value value, AttributeModel attributeModel) {
+    try {
+      if ("ns".equals(attributeModel.units())) {
+        return Single.just(Instant.ofEpochSecond(0, value.getTimestamp()));
+      }
+      return Single.just((Instant.ofEpochMilli(value.getTimestamp())));
+    } catch (Throwable t) {
+      return Single.error(t);
+    }
+  }
 }

hypertrace-core-graphql-gateway-service-utils/src/test/java/org/hypertrace/core/graphql/utils/gateway/UnwrappedValueConverterTest.java

@@ -0,0 +1,35 @@
+package org.hypertrace.core.graphql.utils.gateway;
+
+import java.time.Duration;
+import java.time.Instant;
+import org.hypertrace.core.graphql.attributes.AttributeModel;
+import org.hypertrace.gateway.service.v1.common.Value;
+import org.hypertrace.gateway.service.v1.common.ValueType;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class UnwrappedValueConverterTest {
+
+  @Mock AttributeModel attributeModel;
+
+  @Test
+  void testTimestampConversion() {
+    UnwrappedValueConverter unwrappedValueConverter = new UnwrappedValueConverter();
+    long millis = System.currentTimeMillis();
+    Value value =
+        Value.newBuilder()
+            .setValueType(ValueType.TIMESTAMP)
+            .setTimestamp(Duration.ofMillis(millis).toNanos())
+            .build();
+    Mockito.when(attributeModel.units()).thenReturn("ns");
+
+    Instant instant =
+        (Instant) unwrappedValueConverter.convert(value, attributeModel).blockingGet();
+    Assertions.assertEquals(Instant.ofEpochMilli(millis), instant);
+  }
+}

hypertrace-core-graphql-log-event-schema/build.gradle.kts

@@ -23,4 +23,15 @@ dependencies {
     implementation(project(":hypertrace-core-graphql-common-schema"))
     implementation(project(":hypertrace-core-graphql-attribute-store"))
     implementation(project(":hypertrace-core-graphql-deserialization"))
+    implementation(project(":hypertrace-core-graphql-schema-utils"))
+
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation("com.fasterxml.jackson.core:jackson-databind")
+    testImplementation(project(":hypertrace-core-graphql-gateway-service-utils"))
+    testAnnotationProcessor("org.projectlombok:lombok")
+    testCompileOnly("org.projectlombok:lombok")
+}
+
+tasks.test {
+    useJUnitPlatform()
 }

hypertrace-core-graphql-log-event-schema/src/main/java/org/hypertrace/core/graphql/log/event/LogEventSchemaModule.java

@@ -2,7 +2,6 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.multibindings.Multibinder;
-import org.hypertrace.core.graphql.common.request.ResultSetRequestBuilder;
 import org.hypertrace.core.graphql.log.event.dao.LogEventDaoModule;
 import org.hypertrace.core.graphql.log.event.request.LogEventRequestModule;
 import org.hypertrace.core.graphql.spi.schema.GraphQlSchemaFragment;
@@ -14,8 +13,7 @@ protected void configure() {
         .addBinding()
         .to(LogEventSchemaFragment.class);
 
-    requireBinding(ResultSetRequestBuilder.class);
-    install(new LogEventDaoModule());
     install(new LogEventRequestModule());
+    install(new LogEventDaoModule());
   }
 }