bugfix: Avro perf bug fix

hypertrace-ingester/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.21")
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
   implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
-  implementation("org.hypertrace.core.datamodel:data-model:0.1.19")
+  implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
   implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.1")
   implementation("com.typesafe:config:1.4.1")
   implementation("org.apache.commons:commons-lang3:3.12.0")

hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts

@@ -65,7 +65,7 @@ sourceSets {
 dependencies {
   api("com.google.protobuf:protobuf-java-util:3.15.7")
 
-  implementation("org.hypertrace.core.datamodel:data-model:0.1.19")
+  implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
   implementation(project(":span-normalizer:raw-span-constants"))
   implementation(project(":span-normalizer:span-normalizer-constants"))
   implementation(project(":semantic-convention-utils"))

hypertrace-trace-enricher/hypertrace-trace-enricher-api/build.gradle.kts

@@ -9,7 +9,7 @@ tasks.test {
 
 dependencies {
   implementation(project(":hypertrace-trace-enricher:enriched-span-constants"))
-  implementation("org.hypertrace.core.datamodel:data-model:0.1.19")
+  implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
 
   implementation("org.slf4j:slf4j-api:1.7.30")
   implementation("org.apache.commons:commons-lang3:3.12.0")

hypertrace-trace-enricher/hypertrace-trace-enricher-api/src/main/java/org/hypertrace/traceenricher/trace/util/ApiTraceGraph.java

@@ -1,5 +1,7 @@
 package org.hypertrace.traceenricher.trace.util;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
+
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -389,7 +391,7 @@ private Optional<ApiNodeEventEdge> createEdgeBetweenApiNodes(
             entryBoundaryEventOfDestinationApiNode);
       } else {
         ApiNodeEventEdge apiNodeEventEdge =
-            ApiNodeEventEdge.newBuilder()
+            fastNewBuilder(ApiNodeEventEdge.Builder.class)
                 .setSrcApiNodeIndex(srcIndex)
                 .setTgtApiNodeIndex(targetIndex)
                 .setSrcEventIndex(srcIndexInTrace)

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
   implementation(project(":semantic-convention-utils"))
   implementation(project(":hypertrace-trace-enricher:trace-reader"))
 
-  implementation("org.hypertrace.core.datamodel:data-model:0.1.19")
+  implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
   implementation("org.hypertrace.entity.service:entity-service-client:0.8.5")
   implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.28")
   implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/AbstractTraceEnricher.java

@@ -1,5 +1,7 @@
 package org.hypertrace.traceenricher.enrichment;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
+
 import com.google.common.collect.Lists;
 import com.typesafe.config.Config;
 import java.util.HashSet;
@@ -62,7 +64,7 @@ protected Event getEarliestEvent(StructuredTrace trace) {
   protected void addEnrichedAttribute(Event event, String key, AttributeValue value) {
     Attributes enrichedAttributes = event.getEnrichedAttributes();
     if (enrichedAttributes == null) {
-      enrichedAttributes = Attributes.newBuilder().build();
+      enrichedAttributes = fastNewBuilder(Attributes.Builder.class).build();
       event.setEnrichedAttributes(enrichedAttributes);
     }
 
@@ -76,7 +78,8 @@ protected void addEnrichedAttributes(
 
   protected void addEnrichedAttributeIfNotNull(Event event, String key, String value) {
     if (value != null) {
-      AttributeValue attributeValue = AttributeValue.newBuilder().setValue(value).build();
+      AttributeValue attributeValue =
+          fastNewBuilder(AttributeValue.Builder.class).setValue(value).build();
       addEnrichedAttribute(event, key, attributeValue);
     }
   }

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/ErrorsAndExceptionsEnricher.java

@@ -1,5 +1,7 @@
 package org.hypertrace.traceenricher.enrichment.enrichers;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -54,15 +56,16 @@ private void enrichExceptionDetails(Event event) {
 
     if (hasException) {
       if (event.getMetrics() == null) {
-        event.setMetrics(Metrics.newBuilder().setMetricMap(new HashMap<>()).build());
+        event.setMetrics(
+            fastNewBuilder(Metrics.Builder.class).setMetricMap(new HashMap<>()).build());
       }
 
       event
           .getMetrics()
           .getMetricMap()
           .put(
               EnrichedSpanConstants.getValue(ErrorMetrics.ERROR_METRICS_EXCEPTION_COUNT),
-              MetricValue.newBuilder().setValue(1.0d).build());
+              fastNewBuilder(MetricValue.Builder.class).setValue(1.0d).build());
     }
   }
 
@@ -72,7 +75,8 @@ private void enrichErrorDetails(Event event) {
 
     if (hasError) {
       if (event.getMetrics() == null) {
-        event.setMetrics(Metrics.newBuilder().setMetricMap(new HashMap<>()).build());
+        event.setMetrics(
+            fastNewBuilder(Metrics.Builder.class).setMetricMap(new HashMap<>()).build());
       }
 
       // TODO: Currently we only track the error count but we might want to enrich with additional
@@ -82,7 +86,7 @@ private void enrichErrorDetails(Event event) {
           .getMetricMap()
           .put(
               EnrichedSpanConstants.getValue(ErrorMetrics.ERROR_METRICS_ERROR_COUNT),
-              MetricValue.newBuilder().setValue(1.0d).build());
+              fastNewBuilder(MetricValue.Builder.class).setValue(1.0d).build());
     }
   }
 

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/ExitCallsEnricher.java

@@ -1,5 +1,6 @@
 package org.hypertrace.traceenricher.enrichment.enrichers;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
 import static org.hypertrace.traceenricher.enrichedspan.constants.EnrichedSpanConstants.API_EXIT_CALLS_COUNT;
 
 import com.google.common.collect.Maps;
@@ -39,7 +40,7 @@ public void enrichTrace(StructuredTrace trace) {
               addEnrichedAttribute(
                   event,
                   EnrichedSpanConstants.API_CALLEE_NAME_COUNT_ATTRIBUTE,
-                  AttributeValue.newBuilder()
+                  fastNewBuilder(AttributeValue.Builder.class)
                       .setValueMap(apiExitCallInfo.getCalleeNameToCallCount())
                       .build());
             });

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/HttpAttributeEnricher.java

@@ -3,6 +3,7 @@
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toList;
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
 
 import com.google.common.base.Splitter;
 import java.net.URLDecoder;
@@ -55,7 +56,7 @@ public void enrichEvent(StructuredTrace trace, Event event) {
                 // Getting a single value out of all values(for backward compatibility)
                 String queryParamStringValue = queryParamEntry.getValue().get(0);
                 AttributeValue attributeValue =
-                    AttributeValue.newBuilder()
+                    fastNewBuilder(AttributeValue.Builder.class)
                         .setValue(queryParamStringValue)
                         .setValueList(queryParamEntry.getValue())
                         .build();

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/TraceStatsEnricher.java

@@ -1,5 +1,6 @@
 package org.hypertrace.traceenricher.enrichment.enrichers;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
 import static org.hypertrace.traceenricher.enrichedspan.constants.EnrichedSpanConstants.HEAD_EVENT_ID;
 import static org.hypertrace.traceenricher.enrichedspan.constants.EnrichedSpanConstants.UNIQUE_API_NODES_COUNT;
 
@@ -35,7 +36,7 @@ public void enrichTrace(StructuredTrace trace) {
 
   private void addHeadSpanIdTraceAttribute(StructuredTrace trace, Event headSpan) {
     AttributeValue attribute =
-        AttributeValue.newBuilder().setBinaryValue(headSpan.getEventId()).build();
+        fastNewBuilder(AttributeValue.Builder.class).setBinaryValue(headSpan.getEventId()).build();
     trace.getAttributes().getAttributeMap().put(HEAD_EVENT_ID, attribute);
   }
 

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/util/EnrichedEntityAvroConverter.java

@@ -1,5 +1,7 @@
 package org.hypertrace.traceenricher.util;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
+
 import java.util.HashMap;
 import java.util.Map;
 import org.hypertrace.core.datamodel.AttributeValue;
@@ -17,12 +19,15 @@ public class EnrichedEntityAvroConverter {
   private static final Logger LOG = LoggerFactory.getLogger(EnrichedEntityAvroConverter.class);
 
   public static Entity convertToAvroEntity(EnrichedEntity entity) {
-    return Entity.newBuilder()
+    return fastNewBuilder(Entity.Builder.class)
         .setEntityType(entity.getEntityType())
         .setEntityId(entity.getEntityId())
         .setCustomerId(entity.getTenantId())
         .setEntityName(entity.getEntityName())
-        .setAttributes(Attributes.newBuilder().setAttributeMap(getAvroAttributeMap(entity)).build())
+        .setAttributes(
+            fastNewBuilder(Attributes.Builder.class)
+                .setAttributeMap(getAvroAttributeMap(entity))
+                .build())
         .build();
   }
 
@@ -39,47 +44,50 @@ public static Map<String, AttributeValue> getAvroAttributeMap(EnrichedEntity ent
           == org.hypertrace.entity.data.service.v1.AttributeValue.TypeCase.VALUE) {
         switch (value.getValue().getTypeCase()) {
           case STRING:
-            result = AttributeValue.newBuilder().setValue(value.getValue().getString()).build();
+            result =
+                fastNewBuilder(AttributeValue.Builder.class)
+                    .setValue(value.getValue().getString())
+                    .build();
             break;
           case INT:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setValue(String.valueOf(value.getValue().getInt()))
                     .build();
             break;
           case LONG:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setValue(String.valueOf(value.getValue().getLong()))
                     .build();
             break;
           case BYTES:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setBinaryValue(value.getValue().getBytes().asReadOnlyByteBuffer())
                     .build();
             break;
           case DOUBLE:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setValue(String.valueOf(value.getValue().getDouble()))
                     .build();
             break;
           case FLOAT:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setValue(String.valueOf(value.getValue().getFloat()))
                     .build();
             break;
           case TIMESTAMP:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setValue(String.valueOf(value.getValue().getTimestamp()))
                     .build();
             break;
           case BOOLEAN:
             result =
-                AttributeValue.newBuilder()
+                fastNewBuilder(AttributeValue.Builder.class)
                     .setValue(String.valueOf(value.getValue().getBoolean()))
                     .build();
             break;

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/util/EntityAvroConverter.java

@@ -1,5 +1,7 @@
 package org.hypertrace.traceenricher.util;
 
+import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
+
 import com.google.common.base.Strings;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,15 +34,17 @@ public static Entity convertToAvroEntity(
     }
 
     Entity.Builder builder =
-        Entity.newBuilder()
+        fastNewBuilder(Entity.Builder.class)
             .setEntityType(entity.getEntityType())
             .setEntityId(entity.getEntityId())
             .setCustomerId(entity.getTenantId())
             .setEntityName(entity.getEntityName());
 
     if (includeAttributes) {
       builder.setAttributes(
-          Attributes.newBuilder().setAttributeMap(getAvroAttributeMap(entity)).build());
+          fastNewBuilder(Attributes.Builder.class)
+              .setAttributeMap(getAvroAttributeMap(entity))
+              .build());
     }
     return builder.build();
   }
@@ -58,13 +62,13 @@ private static Map<String, AttributeValue> getAvroAttributeMap(
           == org.hypertrace.entity.data.service.v1.AttributeValue.TypeCase.VALUE) {
         if (value.getValue().getTypeCase() == TypeCase.BYTES) {
           result =
-              AttributeValue.newBuilder()
+              fastNewBuilder(AttributeValue.Builder.class)
                   .setBinaryValue(value.getValue().getBytes().asReadOnlyByteBuffer())
                   .build();
         } else {
           Optional<String> valueStr = convertValueToString(value.getValue());
           if (valueStr.isPresent()) {
-            result = AttributeValue.newBuilder().setValue(valueStr.get()).build();
+            result = fastNewBuilder(AttributeValue.Builder.class).setValue(valueStr.get()).build();
           }
         }
       } else if (value.getTypeCase()
@@ -86,7 +90,10 @@ private static Map<String, AttributeValue> getAvroAttributeMap(
         }
         // Only add the list if it's not empty
         if (!avroValuesStringList.isEmpty()) {
-          result = AttributeValue.newBuilder().setValueList(avroValuesStringList).build();
+          result =
+              fastNewBuilder(AttributeValue.Builder.class)
+                  .setValueList(avroValuesStringList)
+                  .build();
         }
       } else {
         // Currently we don't copy the map types.

hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts

@@ -35,7 +35,7 @@ tasks.test {
 
 dependencies {
   implementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher-impl"))
-  implementation("org.hypertrace.core.datamodel:data-model:0.1.19")
+  implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30")
   implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30")
   implementation("org.hypertrace.entity.service:entity-service-client:0.8.5")

hypertrace-trace-enricher/hypertrace-trace-visualizer/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.hypertrace.core.datamodel:data-model:0.1.19")
+  implementation("org.hypertrace.core.datamodel:data-model:0.1.20")
 
   implementation("org.json:json:20210307")
   implementation("org.apache.commons:commons-lang3:3.12.0")

hypertrace-trace-enricher/trace-reader/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
   api("org.hypertrace.core.attribute.service:caching-attribute-service-client:0.12.3")
   api("org.hypertrace.entity.service:entity-type-service-rx-client:0.8.5")
   api("org.hypertrace.entity.service:entity-data-service-rx-client:0.8.5")
-  api("org.hypertrace.core.datamodel:data-model:0.1.17")
+  api("org.hypertrace.core.datamodel:data-model:0.1.20")
   implementation("org.hypertrace.core.attribute.service:attribute-projection-registry:0.12.3")
   implementation("org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.6.1")
   implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.6.1")