refactor: attribute association expression rename

hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/request/AttributeRequest.java

@@ -3,9 +3,9 @@
 import org.hypertrace.core.graphql.common.schema.attributes.arguments.AttributeExpression;
 
 public interface AttributeRequest {
-  AttributeAssociation<AttributeExpression> attributeExpression();
+  AttributeAssociation<AttributeExpression> attributeExpressionAssociation();
 
   default String asMapKey() {
-    return attributeExpression().value().asAlias();
+    return attributeExpressionAssociation().value().asAlias();
   }
 }

hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/request/DefaultAttributeRequestBuilder.java

@@ -117,6 +117,6 @@ private Stream<AttributeExpression> resolveAttributeExpression(SelectedField att
   @Value
   @Accessors(fluent = true)
   static class DefaultAttributeRequest implements AttributeRequest {
-    AttributeAssociation<AttributeExpression> attributeExpression;
+    AttributeAssociation<AttributeExpression> attributeExpressionAssociation;
   }
 }

hypertrace-core-graphql-common-schema/src/test/java/org/hypertrace/core/graphql/common/request/DefaultAttributeRequestBuilderTest.java

@@ -70,6 +70,6 @@ void canBuildRequestForSelectionSet() {
             .blockingGet();
 
     assertEquals(1, returned.size());
-    assertEquals(expectedResultExpression, returned.get(0).attributeExpression());
+    assertEquals(expectedResultExpression, returned.get(0).attributeExpressionAssociation());
   }
 }

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

@@ -11,11 +11,12 @@ class AttributeExpressionConverter
     implements Converter<AttributeAssociation<AttributeExpression>, Expression> {
 
   @Override
-  public Single<Expression> convert(AttributeAssociation<AttributeExpression> attributeExpression) {
+  public Single<Expression> convert(
+      AttributeAssociation<AttributeExpression> attributeExpressionAssociation) {
     Builder builder = org.hypertrace.gateway.service.v1.common.AttributeExpression.newBuilder();
-    builder.setAttributeId(attributeExpression.attribute().id());
-    attributeExpression.value().subpath().ifPresent(builder::setSubpath);
-    builder.setAlias(attributeExpression.value().asAlias());
+    builder.setAttributeId(attributeExpressionAssociation.attribute().id());
+    attributeExpressionAssociation.value().subpath().ifPresent(builder::setSubpath);
+    builder.setAlias(attributeExpressionAssociation.value().asAlias());
     return Single.just(Expression.newBuilder().setAttributeExpression(builder).build());
   }
 }

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

@@ -41,9 +41,10 @@ private Single<Entry<AttributeExpression, Object>> buildAttributeMapEntry(
     return this.valueConverter
         .convert(
             response.get(attributeRequest.asMapKey()),
-            attributeRequest.attributeExpression().attribute())
+            attributeRequest.attributeExpressionAssociation().attribute())
         .map(
             value ->
-                new SimpleImmutableEntry<>(attributeRequest.attributeExpression().value(), value));
+                new SimpleImmutableEntry<>(
+                    attributeRequest.attributeExpressionAssociation().value(), value));
   }
 }

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

@@ -31,7 +31,7 @@ public Single<Set<Expression>> convert(Collection<AttributeRequest> attributeReq
 
   private Single<Expression> buildAliasedSelectionExpression(AttributeRequest attributeRequest) {
     return this.attributeExpressionConverter
-        .convert(attributeRequest.attributeExpression())
+        .convert(attributeRequest.attributeExpressionAssociation())
         .map(Expression::toBuilder)
         .map(Builder::build);
   }

hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/BaseDaoTest.java

@@ -36,7 +36,7 @@ static class DefaultLogEventRequest implements LogEventRequest {
   @Value
   @Accessors(fluent = true)
   static class DefaultAttributeRequest implements AttributeRequest {
-    AttributeAssociation<AttributeExpression> attributeExpression;
+    AttributeAssociation<AttributeExpression> attributeExpressionAssociation;
   }
 
   @Value

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

@@ -16,7 +16,10 @@ dependencies {
     api("io.github.graphql-java:graphql-java-annotations:8.3")
     api("org.slf4j:slf4j-api:1.7.30")
     api("io.reactivex.rxjava3:rxjava:3.0.9")
-    api("com.google.protobuf:protobuf-java-util:3.14.0")
+    api("com.google.protobuf:protobuf-java-util:3.19.2")
+    api("com.google.protobuf:protobuf-java:3.19.2") {
+      because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEPROTOBUF-2331703")
+    }
 
     api("org.projectlombok:lombok:1.18.18")
     api("com.google.code.findbugs:jsr305:3.0.2")

hypertrace-core-graphql-span-schema/src/main/java/org/hypertrace/core/graphql/span/dao/GatewayServiceSpanConverter.java

@@ -51,7 +51,11 @@ private Single<Span> convert(
                 new ConvertedSpan(
                     attrMap
                         .get(
-                            request.spanEventsRequest().idAttribute().attributeExpression().value())
+                            request
+                                .spanEventsRequest()
+                                .idAttribute()
+                                .attributeExpressionAssociation()
+                                .value())
                         .toString(),
                     attrMap,
                     spanIdToLogEvents));

hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/DaoTestUtil.java

@@ -35,7 +35,7 @@ class DaoTestUtil {
   @Value
   @Accessors(fluent = true)
   static class DefaultAttributeRequest implements AttributeRequest {
-    AttributeAssociation<AttributeExpression> attributeExpression;
+    AttributeAssociation<AttributeExpression> attributeExpressionAssociation;
   }
 
   @Value

hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/SpanLogEventRequestBuilderTest.java

@@ -109,18 +109,18 @@ protected void configure() {
               return Single.just(
                   List.of(
                       AttributeAssociation.of(
-                          spanIdAttribute.attributeExpression().attribute(),
+                          spanIdAttribute.attributeExpressionAssociation().attribute(),
                           new NormalizedFilter(
                               AttributeExpression.forAttributeKey(
-                                  spanIdAttribute.attributeExpression().value().key()),
+                                  spanIdAttribute.attributeExpressionAssociation().value().key()),
                               filterArgument.operator(),
                               filterArgument.value()))));
             })
         .when(filterRequestBuilder)
         .build(any(), any(), anyCollection());
 
     when(attributeStore.getForeignIdAttribute(any(), anyString(), anyString()))
-        .thenReturn(Single.just(spanIdAttribute.attributeExpression().attribute()));
+        .thenReturn(Single.just(spanIdAttribute.attributeExpressionAssociation().attribute()));
 
     doAnswer(
             invocation -> {

hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/SpanLogEventResponseConverterTest.java

@@ -58,9 +58,9 @@ void testBuildResponse() {
         List.of(spanIdAttribute, traceIdAttribute, attributesAttribute);
 
     when(attributeStore.getForeignIdAttribute(any(), anyString(), anyString()))
-        .thenReturn(Single.just(spanIdAttribute.attributeExpression().attribute()));
+        .thenReturn(Single.just(spanIdAttribute.attributeExpressionAssociation().attribute()));
     when(attributeRequestBuilder.buildForAttribute(
-            spanIdAttribute.attributeExpression().attribute()))
+            spanIdAttribute.attributeExpressionAssociation().attribute()))
         .thenReturn(spanIdAttribute);
 
     doAnswer(
@@ -91,9 +91,9 @@ void testBuildResponse_spanIdNotRequested() {
     Collection<AttributeRequest> attributeRequests = List.of(traceIdAttribute, attributesAttribute);
 
     when(attributeStore.getForeignIdAttribute(any(), anyString(), anyString()))
-        .thenReturn(Single.just(spanIdAttribute.attributeExpression().attribute()));
+        .thenReturn(Single.just(spanIdAttribute.attributeExpressionAssociation().attribute()));
     when(attributeRequestBuilder.buildForAttribute(
-            spanIdAttribute.attributeExpression().attribute()))
+            spanIdAttribute.attributeExpressionAssociation().attribute()))
         .thenReturn(spanIdAttribute);
 
     doAnswer(

hypertrace-core-graphql-trace-schema/src/main/java/org/hypertrace/core/graphql/trace/dao/GatewayServiceTraceConverter.java

@@ -45,7 +45,9 @@ private Single<Trace> convert(
         .map(
             attrMap ->
                 new ConvertedTrace(
-                    attrMap.get(request.idAttribute().attributeExpression().value()).toString(),
+                    attrMap
+                        .get(request.idAttribute().attributeExpressionAssociation().value())
+                        .toString(),
                     attrMap));
   }