From 2ee15168789806e6668303298984c75ea0a6f879 Mon Sep 17 00:00:00 2001 From: aman-bansal Date: Tue, 18 Jul 2023 17:27:10 +0530 Subject: [PATCH 1/2] chore | evaluate entity attributes for all spans --- .../enrichers/backend/AbstractBackendEntityEnricher.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java index 386f0cd80..7136b40fa 100644 --- a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java +++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java @@ -42,6 +42,7 @@ import org.hypertrace.traceenricher.util.EntityAvroConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.w3c.dom.Attr; /** * Enricher which gets the backend entities from trace event and store backend entity into @@ -309,6 +310,10 @@ protected Map getIdentifyingAttributes( return Collections.unmodifiableMap(identifyingAttributes); } + protected Map getEnrichedEntityAttributes(StructuredTrace trace,Event event, BackendType type, String backendURI) { + return Collections.emptyMap(); + } + @VisibleForTesting public Optional resolve( Event event, StructuredTrace trace, StructuredTraceGraph structuredTraceGraph) { @@ -337,6 +342,8 @@ public Optional resolve( final Builder entityBuilder = getEntityBuilder(trace, event, type, backendUri); backendProvider.getEntityAttributes(event).forEach(entityBuilder::putAttributes); + Map entityAttributes = getEnrichedEntityAttributes(trace, event, type, backendUri); + entityBuilder.putAllAttributes(entityAttributes); Map enrichedAttributes = new HashMap<>(); Optional backendOperation = backendProvider.getBackendOperation(event); From 333295f9465512b12455e53ce45bddecdf78802d Mon Sep 17 00:00:00 2001 From: aman-bansal Date: Tue, 18 Jul 2023 17:37:05 +0530 Subject: [PATCH 2/2] fix --- .../enrichers/backend/AbstractBackendEntityEnricher.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java index 7136b40fa..be630e10d 100644 --- a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java +++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/backend/AbstractBackendEntityEnricher.java @@ -42,7 +42,6 @@ import org.hypertrace.traceenricher.util.EntityAvroConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.Attr; /** * Enricher which gets the backend entities from trace event and store backend entity into @@ -310,7 +309,8 @@ protected Map getIdentifyingAttributes( return Collections.unmodifiableMap(identifyingAttributes); } - protected Map getEnrichedEntityAttributes(StructuredTrace trace,Event event, BackendType type, String backendURI) { + protected Map getEnrichedEntityAttributes( + StructuredTrace trace, Event event, BackendType type, String backendURI) { return Collections.emptyMap(); } @@ -342,7 +342,8 @@ public Optional resolve( final Builder entityBuilder = getEntityBuilder(trace, event, type, backendUri); backendProvider.getEntityAttributes(event).forEach(entityBuilder::putAttributes); - Map entityAttributes = getEnrichedEntityAttributes(trace, event, type, backendUri); + Map entityAttributes = + getEnrichedEntityAttributes(trace, event, type, backendUri); entityBuilder.putAllAttributes(entityAttributes); Map enrichedAttributes = new HashMap<>();