From b442302b6a34cfccdab173a8550273381636dc30 Mon Sep 17 00:00:00 2001 From: Guillaume Polaert Date: Wed, 16 Aug 2017 10:36:45 +0200 Subject: [PATCH] Fix codenarc --- .../trace/writer/WriterQueueTest.groovy | 48 +++++++------- .../trace/writer/impl/DDAgentWriterTest.java | 65 ------------------- 2 files changed, 24 insertions(+), 89 deletions(-) delete mode 100644 dd-trace/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy b/dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy index b5fd656863..629e18e42a 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy +++ b/dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy @@ -84,30 +84,30 @@ class WriterQueueTest extends Specification { def "check concurrency on writes"() { setup: - def phaser_1 = new Phaser() - def phaser_2 = new Phaser() + def phaser1 = new Phaser() + def phaser2 = new Phaser() def queue = new WriterQueue(capacity) def insertionCount = new AtomicInteger(0) - phaser_1.register() // global start - phaser_2.register() // global stop + phaser1.register() // global start + phaser2.register() // global stop numberThreads.times { - phaser_1.register() + phaser1.register() Thread.start { - phaser_2.register() - phaser_1.arriveAndAwaitAdvance() + phaser2.register() + phaser1.arriveAndAwaitAdvance() numberInsertionsPerThread.times { queue.add(1) insertionCount.getAndIncrement() } - phaser_2.arriveAndAwaitAdvance() + phaser2.arriveAndAwaitAdvance() } } when: - phaser_1.arriveAndAwaitAdvance() // allow threads to start - phaser_2.arriveAndAwaitAdvance() // wait till the job is not finished + phaser1.arriveAndAwaitAdvance() // allow threads to start + phaser2.arriveAndAwaitAdvance() // wait till the job is not finished then: queue.size() == capacity @@ -123,48 +123,48 @@ class WriterQueueTest extends Specification { def "check concurrency on writes and reads"() { setup: - def phaser_1 = new Phaser() - def phaser_2 = new Phaser() + def phaser1 = new Phaser() + def phaser2 = new Phaser() def queue = new WriterQueue(capacity) def insertionCount = new AtomicInteger(0) def droppedCount = new AtomicInteger(0) def getCount = new AtomicInteger(0) def numberElements = new AtomicInteger(0) - phaser_1.register() // global start - phaser_2.register() // global stop + phaser1.register() // global start + phaser2.register() // global stop // writes numberThreadsWrites.times { - phaser_1.register() + phaser1.register() Thread.start { - phaser_2.register() - phaser_1.arriveAndAwaitAdvance() + phaser2.register() + phaser1.arriveAndAwaitAdvance() numberInsertionsPerThread.times { queue.add(1) != null ? droppedCount.getAndIncrement() : null insertionCount.getAndIncrement() } - phaser_2.arriveAndAwaitAdvance() + phaser2.arriveAndAwaitAdvance() } } // reads numberThreadsReads.times { - phaser_1.register() + phaser1.register() Thread.start { - phaser_2.register() - phaser_1.arriveAndAwaitAdvance() + phaser2.register() + phaser1.arriveAndAwaitAdvance() numberGetsPerThread.times { numberElements.getAndAdd(queue.getAll().size()) getCount.getAndIncrement() } - phaser_2.arriveAndAwaitAdvance() + phaser2.arriveAndAwaitAdvance() } } when: - phaser_1.arriveAndAwaitAdvance() // allow threads to start - phaser_2.arriveAndAwaitAdvance() // wait till the job is not finished + phaser1.arriveAndAwaitAdvance() // allow threads to start + phaser2.arriveAndAwaitAdvance() // wait till the job is not finished then: insertionCount.get() == numberInsertionsPerThread * numberThreadsWrites diff --git a/dd-trace/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java b/dd-trace/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java deleted file mode 100644 index 80abb64868..0000000000 --- a/dd-trace/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.datadoghq.trace.writer.impl; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; - -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDSpan; -import com.datadoghq.trace.DDTracer; -import com.datadoghq.trace.writer.DDAgentWriter; -import com.datadoghq.trace.writer.DDApi; -import java.util.ArrayList; -import java.util.List; -import org.junit.Before; -import org.junit.Test; - -public class DDAgentWriterTest { - - DDSpan parent = null; - DDApi mockedAPI = null; - List>> traces = new ArrayList<>(); - DDAgentWriter ddAgentWriter = null; - - @Before - public void setUp() throws Exception { - //Setup - final DDTracer tracer = new DDTracer(); - - parent = tracer.buildSpan("hello-world").withServiceName("service-name").startManual(); - parent.setBaggageItem("a-baggage", "value"); - - Thread.sleep(100); - - final DDSpan child = tracer.buildSpan("hello-world").asChildOf(parent).startManual(); - Thread.sleep(100); - - child.finish(); - Thread.sleep(100); - parent.finish(); - - //Create DDWriter - traces.add(new ArrayList<>(parent.context().getTrace())); - mockedAPI = mock(DDApi.class); - when(mockedAPI.sendTraces(traces)).thenReturn(true); - ddAgentWriter = new DDAgentWriter(mockedAPI); - ddAgentWriter.start(); - } - - @Test - public void testWrite() throws Exception { - ddAgentWriter.write(new ArrayList<>(parent.context().getTrace())); - Thread.sleep(500); - verify(mockedAPI).sendTraces(traces); - } - - @Test - public void testClose() throws Exception { - ddAgentWriter.close(); - - ddAgentWriter.write(new ArrayList<>(parent.context().getTrace())); - Thread.sleep(500); - verifyNoMoreInteractions(mockedAPI); - } -}