From 092f6439ba6fe35c963538c7a396a160ea802530 Mon Sep 17 00:00:00 2001 From: Sarthak Singhal Date: Fri, 21 May 2021 17:17:30 +0530 Subject: [PATCH 1/3] test_commit --- .../generators/RawTraceViewGeneratorTest.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java diff --git a/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java b/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java new file mode 100644 index 000000000..0577eeb39 --- /dev/null +++ b/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java @@ -0,0 +1,69 @@ +package org.hypertrace.viewgenerator.generators; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import com.google.common.collect.Maps; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.avro.file.DataFileReader; +import org.apache.avro.specific.SpecificDatumReader; +import org.hypertrace.core.datamodel.AttributeValue; +import org.hypertrace.core.datamodel.Attributes; +import org.hypertrace.core.datamodel.Entity; +import org.hypertrace.core.datamodel.Event; +import org.hypertrace.core.datamodel.Metrics; +import org.hypertrace.core.datamodel.StructuredTrace; +import org.hypertrace.core.datamodel.eventfields.http.Http; +import org.hypertrace.core.datamodel.eventfields.http.Request; +import org.hypertrace.core.datamodel.shared.trace.AttributeValueCreator; +import org.hypertrace.traceenricher.enrichedspan.constants.EnrichedSpanConstants; +import org.hypertrace.traceenricher.enrichedspan.constants.utils.EnrichedSpanUtils; +import org.hypertrace.traceenricher.enrichedspan.constants.v1.Api; +import org.hypertrace.traceenricher.enrichedspan.constants.v1.BoundaryTypeValue; +import org.hypertrace.traceenricher.enrichedspan.constants.v1.Protocol; +import org.hypertrace.viewgenerator.api.RawTraceView; +import org.hypertrace.viewgenerator.api.SpanEventView; +import org.hypertrace.viewgenerator.generators.ViewGeneratorState.TraceState; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import java.nio.CharBuffer; +import java.nio.charset.StandardCharsets; +public class RawTraceViewGeneratorTest { + private RawTraceViewGenerator rawTraceViewGenerator; + @BeforeEach + public void setup() { + rawTraceViewGenerator = new RawTraceViewGenerator(); + } + @Test + public void testGenerateView_HotrodTrace() throws IOException { + URL resource = + Thread.currentThread().getContextClassLoader().getResource("StructuredTrace-Hotrod.avro"); + SpecificDatumReader datumReader = + new SpecificDatumReader<>(StructuredTrace.getClassSchema()); + DataFileReader dfrStructuredTrace = + new DataFileReader<>(new File(resource.getPath()), datumReader); + StructuredTrace trace = dfrStructuredTrace.next(); + dfrStructuredTrace.close(); + RawTraceViewGenerator rawTraceViewGenerator = new RawTraceViewGenerator(); + List rawTraceViews = rawTraceViewGenerator.process(trace); + assertEquals(1,rawTraceViews.size()); + assertEquals(4,rawTraceViews.get(0).getNumServices()); + assertEquals(50,rawTraceViews.get(0).getNumSpans()); +// assertEquals(ByteBuffer.wrap("java.nio.HeapByteBuffer[pos=0 lim=44 cap=44]".getBytes("UTF-8")),rawTraceViews.get(0).getTraceId()); +// +// ByteBuffer bf = rawTraceViews.get(0).getTraceId(); +// bf.flip(); +// CharBuffer charBuffer = StandardCharsets.UTF_8.decode(bf); +// String text = charBuffer.toString(); +// System.out.println("UTF-8" + text); +// assertEquals(text,"123"); + } +} From 207722331222f74f3fdcefc94f00480f872fed59 Mon Sep 17 00:00:00 2001 From: Sarthak Singhal Date: Sun, 23 May 2021 07:13:58 +0530 Subject: [PATCH 2/3] removed comments and corrected the build --- .../generators/RawTraceViewGeneratorTest.java | 81 ++++++------------- 1 file changed, 26 insertions(+), 55 deletions(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java b/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java index 0577eeb39..093c7efc9 100644 --- a/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java +++ b/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java @@ -1,69 +1,40 @@ package org.hypertrace.viewgenerator.generators; + import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import com.google.common.collect.Maps; + import java.io.File; import java.io.IOException; import java.net.URL; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.avro.file.DataFileReader; import org.apache.avro.specific.SpecificDatumReader; -import org.hypertrace.core.datamodel.AttributeValue; -import org.hypertrace.core.datamodel.Attributes; -import org.hypertrace.core.datamodel.Entity; -import org.hypertrace.core.datamodel.Event; -import org.hypertrace.core.datamodel.Metrics; import org.hypertrace.core.datamodel.StructuredTrace; -import org.hypertrace.core.datamodel.eventfields.http.Http; -import org.hypertrace.core.datamodel.eventfields.http.Request; -import org.hypertrace.core.datamodel.shared.trace.AttributeValueCreator; -import org.hypertrace.traceenricher.enrichedspan.constants.EnrichedSpanConstants; -import org.hypertrace.traceenricher.enrichedspan.constants.utils.EnrichedSpanUtils; -import org.hypertrace.traceenricher.enrichedspan.constants.v1.Api; -import org.hypertrace.traceenricher.enrichedspan.constants.v1.BoundaryTypeValue; -import org.hypertrace.traceenricher.enrichedspan.constants.v1.Protocol; import org.hypertrace.viewgenerator.api.RawTraceView; -import org.hypertrace.viewgenerator.api.SpanEventView; -import org.hypertrace.viewgenerator.generators.ViewGeneratorState.TraceState; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.nio.CharBuffer; -import java.nio.charset.StandardCharsets; + public class RawTraceViewGeneratorTest { - private RawTraceViewGenerator rawTraceViewGenerator; - @BeforeEach - public void setup() { - rawTraceViewGenerator = new RawTraceViewGenerator(); - } - @Test - public void testGenerateView_HotrodTrace() throws IOException { - URL resource = - Thread.currentThread().getContextClassLoader().getResource("StructuredTrace-Hotrod.avro"); - SpecificDatumReader datumReader = - new SpecificDatumReader<>(StructuredTrace.getClassSchema()); - DataFileReader dfrStructuredTrace = - new DataFileReader<>(new File(resource.getPath()), datumReader); - StructuredTrace trace = dfrStructuredTrace.next(); - dfrStructuredTrace.close(); - RawTraceViewGenerator rawTraceViewGenerator = new RawTraceViewGenerator(); - List rawTraceViews = rawTraceViewGenerator.process(trace); - assertEquals(1,rawTraceViews.size()); - assertEquals(4,rawTraceViews.get(0).getNumServices()); - assertEquals(50,rawTraceViews.get(0).getNumSpans()); -// assertEquals(ByteBuffer.wrap("java.nio.HeapByteBuffer[pos=0 lim=44 cap=44]".getBytes("UTF-8")),rawTraceViews.get(0).getTraceId()); -// -// ByteBuffer bf = rawTraceViews.get(0).getTraceId(); -// bf.flip(); -// CharBuffer charBuffer = StandardCharsets.UTF_8.decode(bf); -// String text = charBuffer.toString(); -// System.out.println("UTF-8" + text); -// assertEquals(text,"123"); - } + private RawTraceViewGenerator rawTraceViewGenerator; + + @BeforeEach + public void setup() { + rawTraceViewGenerator = new RawTraceViewGenerator(); + } + + @Test + public void testGenerateView_HotrodTrace() throws IOException { + URL resource = + Thread.currentThread().getContextClassLoader().getResource("StructuredTrace-Hotrod.avro"); + SpecificDatumReader datumReader = + new SpecificDatumReader<>(StructuredTrace.getClassSchema()); + DataFileReader dfrStructuredTrace = + new DataFileReader<>(new File(resource.getPath()), datumReader); + StructuredTrace trace = dfrStructuredTrace.next(); + dfrStructuredTrace.close(); + RawTraceViewGenerator rawTraceViewGenerator = new RawTraceViewGenerator(); + List rawTraceViews = rawTraceViewGenerator.process(trace); + assertEquals(1, rawTraceViews.size()); + assertEquals(4, rawTraceViews.get(0).getNumServices()); + assertEquals(50, rawTraceViews.get(0).getNumSpans()); + } } From ea2078837ba89c0cca71097a1f1a1586c6a1410a Mon Sep 17 00:00:00 2001 From: Sarthak Singhal Date: Mon, 24 May 2021 19:41:32 +0530 Subject: [PATCH 3/3] structured the unit test code --- .../generators/RawTraceViewGeneratorTest.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java b/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java index 093c7efc9..50698ea7f 100644 --- a/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java +++ b/hypertrace-view-generator/hypertrace-view-generator/src/test/java/org/hypertrace/viewgenerator/generators/RawTraceViewGeneratorTest.java @@ -22,7 +22,15 @@ public void setup() { } @Test - public void testGenerateView_HotrodTrace() throws IOException { + public void testGenerateView_SampleHotrodTrace() throws IOException { + RawTraceViewGenerator rawTraceViewGenerator = new RawTraceViewGenerator(); + List rawTraceViews = rawTraceViewGenerator.process(createSampleTrace()); + assertEquals(1, rawTraceViews.size()); + assertEquals(4, rawTraceViews.get(0).getNumServices()); + assertEquals(50, rawTraceViews.get(0).getNumSpans()); + } + + private static StructuredTrace createSampleTrace() throws IOException { URL resource = Thread.currentThread().getContextClassLoader().getResource("StructuredTrace-Hotrod.avro"); SpecificDatumReader datumReader = @@ -31,10 +39,6 @@ public void testGenerateView_HotrodTrace() throws IOException { new DataFileReader<>(new File(resource.getPath()), datumReader); StructuredTrace trace = dfrStructuredTrace.next(); dfrStructuredTrace.close(); - RawTraceViewGenerator rawTraceViewGenerator = new RawTraceViewGenerator(); - List rawTraceViews = rawTraceViewGenerator.process(trace); - assertEquals(1, rawTraceViews.size()); - assertEquals(4, rawTraceViews.get(0).getNumServices()); - assertEquals(50, rawTraceViews.get(0).getNumSpans()); + return trace; } }