Fixed Armenia related test cases

openzipkin · Jan 4, 2024 · f7d2001 · f7d2001
1 parent ad7878b
commit f7d2001
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/module/pom.xml b/module/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 The OpenZipkin Authors
+    Copyright 2016-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -96,7 +96,7 @@
 
     <dependency>
       <groupId>${armeria.groupId}</groupId>
-      <artifactId>armeria-junit4</artifactId>
+      <artifactId>armeria-junit5</artifactId>
       <version>${armeria.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/module/src/main/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4.java b/module/src/main/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -17,6 +17,7 @@
 import com.linecorp.armeria.client.HttpClient;
 import com.linecorp.armeria.client.SimpleDecoratingHttpClient;
 import com.linecorp.armeria.common.AggregatedHttpRequest;
+import com.linecorp.armeria.common.AggregationOptions;
 import com.linecorp.armeria.common.HttpData;
 import com.linecorp.armeria.common.HttpHeaderNames;
 import com.linecorp.armeria.common.HttpRequest;
@@ -84,11 +85,13 @@ static Function<HttpClient, HttpClient> newDecorator(String region,
   @Override public HttpResponse execute(ClientRequestContext ctx, HttpRequest req) {
     // We aggregate the request body with pooled objects because signing implies reading it before
     // sending it to Elasticsearch.
-    return HttpResponse.from(
-        req.aggregateWithPooledObjects(ctx.eventLoop(), ctx.alloc()).thenApply(aggReg -> {
+    return HttpResponse.of(
+        req.aggregate(AggregationOptions.usePooledObjects(ctx.alloc())).thenApply(aggReg -> {
           try {
             AggregatedHttpRequest signed = sign(ctx, aggReg);
-            return unwrap().execute(ctx, signed.toHttpRequest());
+            final HttpRequest httpRequest = signed.toHttpRequest();
+            ctx.updateRequest(httpRequest);
+            return unwrap().execute(ctx, httpRequest);
           } catch (Exception e) {
             return HttpResponse.ofFailure(e);
           }

diff --git a/module/src/test/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4Test.java b/module/src/test/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 The OpenZipkin Authors
+ * Copyright 2016-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -27,14 +27,15 @@
 import com.linecorp.armeria.common.RequestHeaders;
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.server.ServerBuilder;
-import com.linecorp.armeria.testing.junit4.server.ServerRule;
+import com.linecorp.armeria.testing.junit5.server.ServerExtension;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.atomic.AtomicReference;
-import org.junit.ClassRule;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -48,9 +49,9 @@ class AWSSignatureVersion4Test {
   static final AtomicReference<AggregatedHttpResponse> MOCK_RESPONSE =
       new AtomicReference<>();
 
-  @ClassRule public static ServerRule server = new ServerRule() {
+  @RegisterExtension static ServerExtension server = new ServerExtension() {
     @Override protected void configure(ServerBuilder sb) {
-      sb.serviceUnder("/", (ctx, req) -> HttpResponse.from(
+      sb.serviceUnder("/", (ctx, req) -> HttpResponse.of(
           req.aggregate().thenApply(agg -> {
             CAPTURED_REQUEST.set(agg);
             return MOCK_RESPONSE.get().toHttpResponse();

diff --git a/module/src/test/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpointTest.java b/module/src/test/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 The OpenZipkin Authors
+ * Copyright 2016-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -21,11 +21,12 @@
 import com.linecorp.armeria.common.HttpStatus;
 import com.linecorp.armeria.common.MediaType;
 import com.linecorp.armeria.server.ServerBuilder;
-import com.linecorp.armeria.testing.junit4.server.ServerRule;
+import com.linecorp.armeria.testing.junit5.server.ServerExtension;
+
 import java.util.concurrent.atomic.AtomicReference;
-import org.junit.ClassRule;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static com.linecorp.armeria.common.SessionProtocol.HTTP;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -38,9 +39,9 @@ class ElasticsearchDomainEndpointTest {
   static final AtomicReference<AggregatedHttpResponse> MOCK_RESPONSE =
       new AtomicReference<>();
 
-  @ClassRule public static ServerRule server = new ServerRule() {
+  @RegisterExtension static ServerExtension server = new ServerExtension() {
     @Override protected void configure(ServerBuilder sb) {
-      sb.serviceUnder("/", (ctx, req) -> HttpResponse.from(
+      sb.serviceUnder("/", (ctx, req) -> HttpResponse.of(
           req.aggregate().thenApply(agg -> {
             CAPTURED_REQUEST.set(agg);
             return MOCK_RESPONSE.get().toHttpResponse();