From b6414303f1d0689ac4dfee1808d3dd42a7bc4b10 Mon Sep 17 00:00:00 2001 From: Sarthak Singhal Date: Mon, 8 Nov 2021 12:40:32 +0530 Subject: [PATCH 1/6] added span count attribute --- .../src/main/avro/SpanEventView.avdl | 3 +++ .../viewgenerator/generators/SpanEventViewGenerator.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl index 5e5a262fb..17bab9124 100644 --- a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl +++ b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl @@ -70,6 +70,9 @@ protocol SpanEventViewProtocol { // count of api_trace int api_trace_count = 0; + // count of span + int span_count = 0; + // display name for the entity name on api execution details page // for an entry span it will be the same as the span's service_name // for an exit span: diff --git a/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java b/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java index e8d4f322c..270ddf316 100644 --- a/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java +++ b/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java @@ -225,6 +225,9 @@ private SpanEventView.Builder generateViewBuilder( builder.setErrorCount((int) errorMetric.getValue().doubleValue()); } + // span count + builder.setSpanCount(1); + MetricValue exceptionMetric = event.getMetrics().getMetricMap().get(EXCEPTION_COUNT_CONSTANT); if (exceptionMetric != null && exceptionMetric.getValue() > 0.0d) { builder.setExceptionCount((int) exceptionMetric.getValue().doubleValue()); From a373b03b4aebc0765fdfc7aeefa0b2d3a192febe Mon Sep 17 00:00:00 2001 From: Sarthak Singhal Date: Wed, 10 Nov 2021 12:54:31 +0530 Subject: [PATCH 2/6] resolved PR comment --- .../src/main/avro/SpanEventView.avdl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl index 17bab9124..fb15f94d8 100644 --- a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl +++ b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl @@ -70,9 +70,6 @@ protocol SpanEventViewProtocol { // count of api_trace int api_trace_count = 0; - // count of span - int span_count = 0; - // display name for the entity name on api execution details page // for an entry span it will be the same as the span's service_name // for an exit span: @@ -106,5 +103,8 @@ protocol SpanEventViewProtocol { map api_callee_name_count = {}; int api_trace_error_span_count = 0; + + // count of span + int span_count = 0; } } From 8f23617acd7407e5d4757082237bfd7bf86be711 Mon Sep 17 00:00:00 2001 From: sarthak Date: Thu, 11 Nov 2021 17:24:11 +0530 Subject: [PATCH 3/6] Update hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java Co-authored-by: kotharironak <53209990+kotharironak@users.noreply.github.com> --- .../viewgenerator/generators/SpanEventViewGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java b/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java index 53bd9b65d..4d588b450 100644 --- a/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java +++ b/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java @@ -226,7 +226,6 @@ private SpanEventView.Builder generateViewBuilder( builder.setErrorCount((int) errorMetric.getValue().doubleValue()); } - // span count builder.setSpanCount(1); MetricValue exceptionMetric = event.getMetrics().getMetricMap().get(EXCEPTION_COUNT_CONSTANT); From 57bc8f30fb55f6872ed6041815b0fcff89bfc922 Mon Sep 17 00:00:00 2001 From: sarthak Date: Thu, 11 Nov 2021 17:24:20 +0530 Subject: [PATCH 4/6] Update hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl Co-authored-by: kotharironak <53209990+kotharironak@users.noreply.github.com> --- .../src/main/avro/SpanEventView.avdl | 1 - 1 file changed, 1 deletion(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl index fb15f94d8..8725ac4b6 100644 --- a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl +++ b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl @@ -104,7 +104,6 @@ protocol SpanEventViewProtocol { int api_trace_error_span_count = 0; - // count of span int span_count = 0; } } From 59d32c00d65b0bcb1287276b67c4c3843688355c Mon Sep 17 00:00:00 2001 From: sarthak Date: Thu, 11 Nov 2021 17:37:29 +0530 Subject: [PATCH 5/6] Update SpanEventView.avdl --- .../src/main/avro/SpanEventView.avdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl index 8725ac4b6..a082b722c 100644 --- a/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl +++ b/hypertrace-view-generator/hypertrace-view-generator-api/src/main/avro/SpanEventView.avdl @@ -104,6 +104,6 @@ protocol SpanEventViewProtocol { int api_trace_error_span_count = 0; - int span_count = 0; + int spans = 0; } } From 8c191e3c56df9955f599eccffb5e9d1c2fba2348 Mon Sep 17 00:00:00 2001 From: sarthak Date: Thu, 11 Nov 2021 17:37:50 +0530 Subject: [PATCH 6/6] Update SpanEventViewGenerator.java --- .../viewgenerator/generators/SpanEventViewGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java b/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java index 4d588b450..8a3ec7cd0 100644 --- a/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java +++ b/hypertrace-view-generator/hypertrace-view-generator/src/main/java/org/hypertrace/viewgenerator/generators/SpanEventViewGenerator.java @@ -226,7 +226,7 @@ private SpanEventView.Builder generateViewBuilder( builder.setErrorCount((int) errorMetric.getValue().doubleValue()); } - builder.setSpanCount(1); + builder.setSpans(1); MetricValue exceptionMetric = event.getMetrics().getMetricMap().get(EXCEPTION_COUNT_CONSTANT); if (exceptionMetric != null && exceptionMetric.getValue() > 0.0d) {