From 709621a1f8a11b08450eb1e91de568c8e732a5d1 Mon Sep 17 00:00:00 2001 From: aman-bansal Date: Tue, 22 Nov 2022 15:48:43 +0530 Subject: [PATCH 1/3] chore | adding should resolve backend uri function --- .../AbstractBackendEntityEnricher.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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 c911f70e8..645d8ee95 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 @@ -122,6 +122,21 @@ protected boolean canResolveBackend(StructuredTraceGraph structuredTraceGraph, E return true; } + /** + * Method to check if backend uri should be processed or not. This will enable any custom logic to + * be inserted in the implementing classes. + * + * @param structuredTraceGraph structured trace graph + * @param event leaf exit span + * @param backendURI backend URI information + * @return true if backend uri resolution is allowed + */ + protected boolean shouldResolveBackendUri( + StructuredTraceGraph structuredTraceGraph, Event event, String backendURI) { + // by default allow the backend uri to proceed + return true; + } + /** Checks if the candidateEntity is indeed a backend Entity */ private boolean isValidBackendEntity( StructuredTrace trace, Event backendSpan, BackendInfo candidateInfo) { @@ -311,8 +326,11 @@ public Optional resolve( } String backendUri = maybeBackendUri.get(); - final Builder entityBuilder = getEntityBuilder(trace, event, type, backendUri); + if (!shouldResolveBackendUri(structuredTraceGraph, event, backendUri)) { + return Optional.empty(); + } + final Builder entityBuilder = getEntityBuilder(trace, event, type, backendUri); backendProvider.getEntityAttributes(event).forEach(entityBuilder::putAttributes); Map enrichedAttributes = new HashMap<>(); From 5a028e6ce531e6f5dfa33ba54e5b859ee4cc24b0 Mon Sep 17 00:00:00 2001 From: aman-bansal Date: Tue, 22 Nov 2022 16:29:11 +0530 Subject: [PATCH 2/3] fixing the url --- .../enrichers/backend/AbstractBackendEntityEnricher.java | 9 +++------ 1 file changed, 3 insertions(+), 6 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 645d8ee95..2b24eff6f 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 @@ -123,16 +123,13 @@ protected boolean canResolveBackend(StructuredTraceGraph structuredTraceGraph, E } /** - * Method to check if backend uri should be processed or not. This will enable any custom logic to + * Method to check if backend uri is valid or not. This will enable any custom logic to * be inserted in the implementing classes. * - * @param structuredTraceGraph structured trace graph - * @param event leaf exit span * @param backendURI backend URI information * @return true if backend uri resolution is allowed */ - protected boolean shouldResolveBackendUri( - StructuredTraceGraph structuredTraceGraph, Event event, String backendURI) { + protected boolean isValidBackendUri(String backendURI) { // by default allow the backend uri to proceed return true; } @@ -326,7 +323,7 @@ public Optional resolve( } String backendUri = maybeBackendUri.get(); - if (!shouldResolveBackendUri(structuredTraceGraph, event, backendUri)) { + if (!isValidBackendUri(backendUri)) { return Optional.empty(); } From 041aa1dffb66ca51666b60b6f85414d8e9bda159 Mon Sep 17 00:00:00 2001 From: aman-bansal Date: Tue, 22 Nov 2022 17:24:55 +0530 Subject: [PATCH 3/3] making it pretty --- .../enrichers/backend/AbstractBackendEntityEnricher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 2b24eff6f..d35814bea 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 @@ -123,8 +123,8 @@ protected boolean canResolveBackend(StructuredTraceGraph structuredTraceGraph, E } /** - * Method to check if backend uri is valid or not. This will enable any custom logic to - * be inserted in the implementing classes. + * Method to check if backend uri is valid or not. This will enable any custom logic to be + * inserted in the implementing classes. * * @param backendURI backend URI information * @return true if backend uri resolution is allowed