From 7d1f9efb51626a24cb427d56a1f359f7eb98a13a Mon Sep 17 00:00:00 2001
From: Jorge Quilcate Otoya <quilcate.jorge@gmail.com>
Date: Tue, 29 Oct 2019 12:33:47 +0100
Subject: [PATCH] Update dependencies (#2892)

---
 pom.xml                                               | 11 ++++-------
 .../zipkin2/server/internal/ZipkinQueryApiV2.java     | 10 ++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 14ebcc2dccf..c1dde0b7da3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
     <!-- This allows you to test feature branches with jitpack -->
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
-    <armeria.version>0.94.0</armeria.version>
+    <armeria.version>0.95.0</armeria.version>
     <!-- This should only be used in tests, and be careful to avoid >= v20 apis -->
     <guava.version>28.1-jre</guava.version>
 
@@ -73,15 +73,12 @@
 
     <junit.version>4.12</junit.version>
     <junit.jupiter.version>5.5.2</junit.jupiter.version>
-    <powermock.version>2.0.2</powermock.version>
-    <!-- Up to v2.27.0 of mockito has a conflict https://github.com/mockito/mockito/issues/1606
-    java.lang.NoSuchMethodError: net.bytebuddy.dynamic.loading.MultipleParentClassLoader$Builder.appendMostSpecific(Ljava/util/Collection;)Lnet/bytebuddy/dynamic/loading/MultipleParentClassLoader$Builder
-    -->
-    <mockito.version>2.23.4</mockito.version>
+    <powermock.version>2.0.4</powermock.version>
+    <mockito.version>2.28.2</mockito.version>
     <assertj.version>3.13.2</assertj.version>
     <awaitility.version>4.0.1</awaitility.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <testcontainers.version>1.12.2</testcontainers.version>
+    <testcontainers.version>1.12.3</testcontainers.version>
 
     <auto-value.version>1.7</auto-value.version>
     <animal-sniffer-maven-plugin.version>1.18</animal-sniffer-maven-plugin.version>
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinQueryApiV2.java b/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinQueryApiV2.java
index e0bef3c1d43..ab430b9139a 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinQueryApiV2.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinQueryApiV2.java
@@ -19,6 +19,7 @@
 import com.linecorp.armeria.common.MediaType;
 import com.linecorp.armeria.common.ResponseHeaders;
 import com.linecorp.armeria.common.ResponseHeadersBuilder;
+import com.linecorp.armeria.server.annotation.Blocking;
 import com.linecorp.armeria.server.annotation.Default;
 import com.linecorp.armeria.server.annotation.ExceptionHandler;
 import com.linecorp.armeria.server.annotation.Get;
@@ -76,6 +77,7 @@ public class ZipkinQueryApiV2 {
   }
 
   @Get("/api/v2/dependencies")
+  @Blocking
   public AggregatedHttpResponse getDependencies(
     @Param("endTs") long endTs,
     @Param("lookback") Optional<Long> lookback) throws IOException {
@@ -85,6 +87,7 @@ public AggregatedHttpResponse getDependencies(
   }
 
   @Get("/api/v2/services")
+  @Blocking
   public AggregatedHttpResponse getServiceNames() throws IOException {
     List<String> serviceNames = storage.serviceAndSpanNames().getServiceNames().execute();
     serviceCount = serviceNames.size();
@@ -92,6 +95,7 @@ public AggregatedHttpResponse getServiceNames() throws IOException {
   }
 
   @Get("/api/v2/spans")
+  @Blocking
   public AggregatedHttpResponse getSpanNames(@Param("serviceName") String serviceName)
     throws IOException {
     List<String> spanNames = storage.serviceAndSpanNames().getSpanNames(serviceName).execute();
@@ -99,6 +103,7 @@ public AggregatedHttpResponse getSpanNames(@Param("serviceName") String serviceN
   }
 
   @Get("/api/v2/remoteServices")
+  @Blocking
   public AggregatedHttpResponse getRemoteServiceNames(@Param("serviceName") String serviceName)
     throws IOException {
     List<String> remoteServiceNames =
@@ -107,6 +112,7 @@ public AggregatedHttpResponse getRemoteServiceNames(@Param("serviceName") String
   }
 
   @Get("/api/v2/traces")
+  @Blocking
   public AggregatedHttpResponse getTraces(
     @Param("serviceName") Optional<String> serviceName,
     @Param("remoteServiceName") Optional<String> remoteServiceName,
@@ -136,6 +142,7 @@ public AggregatedHttpResponse getTraces(
   }
 
   @Get("/api/v2/trace/{traceId}")
+  @Blocking
   public AggregatedHttpResponse getTrace(@Param("traceId") String traceId) throws IOException {
     traceId = Span.normalizeTraceId(traceId);
     List<Span> trace = storage.traces().getTrace(traceId).execute();
@@ -146,6 +153,7 @@ public AggregatedHttpResponse getTrace(@Param("traceId") String traceId) throws
   }
 
   @Get("/api/v2/traceMany")
+  @Blocking
   public AggregatedHttpResponse getTraces(@Param("traceIds") String traceIds) throws IOException {
     if (traceIds.isEmpty()) {
       return AggregatedHttpResponse.of(BAD_REQUEST, ANY_TEXT_TYPE, "traceIds parameter is empty");
@@ -185,11 +193,13 @@ static AggregatedHttpResponse jsonResponse(byte[] body) {
   };
 
   @Get("/api/v2/autocompleteKeys")
+  @Blocking
   public AggregatedHttpResponse getAutocompleteKeys() {
     return maybeCacheNames(true, autocompleteKeys);
   }
 
   @Get("/api/v2/autocompleteValues")
+  @Blocking
   public AggregatedHttpResponse getAutocompleteValues(@Param("key") String key) throws IOException {
     List<String> values = storage.autocompleteTags().getValues(key).execute();
     return maybeCacheNames(values.size() > 3, values);