Skip to content

Commit daed0f0

Browse files
kdavisk6kdavisk6
authored
Update benchmarks (OpenFeign#885)
* updating netty dependencies for benchmarks * Updated Bouncycastle
1 parent 0eb2301 commit daed0f0

3 files changed

Lines changed: 57 additions & 21 deletions

File tree

‎benchmark/pom.xml‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,30 +53,44 @@
5353
<version>${project.version}</version>
5454
</dependency>
5555
<dependency>
56-
<groupId>com.squareup.okhttp</groupId>
56+
<groupId>com.squareup.okhttp3</groupId>
5757
<artifactId>mockwebserver</artifactId>
58-
<version>2.7.4</version>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>org.bouncycastle</groupId>
62-
<artifactId>bcprov-jdk15on</artifactId>
63-
</exclusion>
64-
</exclusions>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.bouncycastle</groupId>
61+
<artifactId>bcprov-jdk15on</artifactId>
62+
<version>1.60</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>io.reactivex</groupId>
66+
<artifactId>rxnetty-http</artifactId>
67+
<version>0.5.2</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>io.reactivex</groupId>
71+
<artifactId>rxnetty-spectator-http</artifactId>
72+
<version>0.5.2</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>io.reactivex</groupId>
76+
<artifactId>rxnetty-common</artifactId>
77+
<version>0.5.2</version>
6578
</dependency>
6679
<dependency>
6780
<groupId>io.reactivex</groupId>
68-
<artifactId>rxnetty</artifactId>
69-
<version>0.5.1</version>
81+
<artifactId>rxnetty-tcp</artifactId>
82+
<version>0.5.2</version>
7083
</dependency>
7184
<dependency>
7285
<groupId>io.netty</groupId>
7386
<artifactId>netty-buffer</artifactId>
74-
<version>4.1.0.Beta7</version>
87+
<version>4.1.5.Final</version>
88+
<scope>compile</scope>
7589
</dependency>
7690
<dependency>
7791
<groupId>io.reactivex</groupId>
7892
<artifactId>rxjava</artifactId>
79-
<version>1.0.14</version>
93+
<version>1.2.6</version>
8094
</dependency>
8195
<dependency>
8296
<groupId>org.openjdk.jmh</groupId>
@@ -89,6 +103,11 @@
89103
<version>${jmh.version}</version>
90104
<scope>provided</scope>
91105
</dependency>
106+
<dependency>
107+
<groupId>org.slf4j</groupId>
108+
<artifactId>slf4j-nop</artifactId>
109+
</dependency>
110+
92111
</dependencies>
93112

94113
<build>

‎benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,24 @@
1313
*/
1414
package feign.benchmark;
1515

16+
17+
18+
import feign.Feign;
1619
import feign.Logger;
1720
import feign.Logger.Level;
21+
import feign.Response;
1822
import feign.Retryer;
19-
import io.netty.buffer.ByteBuf;
20-
import io.reactivex.netty.RxNetty;
23+
import io.reactivex.netty.protocol.http.HttpHandlerNames;
2124
import io.reactivex.netty.protocol.http.server.HttpServer;
2225
import io.reactivex.netty.protocol.http.server.HttpServerRequest;
2326
import io.reactivex.netty.protocol.http.server.HttpServerResponse;
2427
import io.reactivex.netty.protocol.http.server.RequestHandler;
25-
import io.reactivex.netty.server.ErrorHandler;
28+
import java.io.IOException;
29+
import java.util.concurrent.TimeUnit;
30+
import io.netty.buffer.ByteBuf;
2631
import okhttp3.OkHttpClient;
2732
import okhttp3.Request;
33+
import okhttp3.internal.http.HttpHeaders;
2834
import org.openjdk.jmh.annotations.Benchmark;
2935
import org.openjdk.jmh.annotations.BenchmarkMode;
3036
import org.openjdk.jmh.annotations.Fork;
@@ -36,10 +42,6 @@
3642
import org.openjdk.jmh.annotations.State;
3743
import org.openjdk.jmh.annotations.TearDown;
3844
import org.openjdk.jmh.annotations.Warmup;
39-
import java.io.IOException;
40-
import java.util.concurrent.TimeUnit;
41-
import feign.Feign;
42-
import feign.Response;
4345
import rx.Observable;
4446

4547
@Measurement(iterations = 5, time = 1)
@@ -58,8 +60,9 @@ public class RealRequestBenchmarks {
5860

5961
@Setup
6062
public void setup() {
61-
server = RxNetty.createHttpServer(SERVER_PORT, (request, response) -> response.flush());
62-
server.start();
63+
64+
server = HttpServer.newServer(SERVER_PORT)
65+
.start((request, response) -> null);
6366
client = new OkHttpClient();
6467
client.retryOnConnectionFailure();
6568
okFeign = Feign.builder()

‎pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868

6969
<okhttp3.version>3.6.0</okhttp3.version>
7070
<gson.version>2.5</gson.version>
71+
<slf4j.version>1.7.13</slf4j.version>
7172

7273
<junit.version>4.12</junit.version>
7374
<jackson.version>2.9.8</jackson.version>
@@ -292,6 +293,19 @@
292293
<version>${jackson.version}</version>
293294
</dependency>
294295

296+
<dependency>
297+
<groupId>org.slf4j</groupId>
298+
<artifactId>slf4j-simple</artifactId>
299+
<version>${slf4j.version}</version>
300+
</dependency>
301+
302+
<dependency>
303+
<groupId>org.slf4j</groupId>
304+
<artifactId>slf4j-nop</artifactId>
305+
<version>${slf4j.version}</version>
306+
</dependency>
307+
308+
295309
</dependencies>
296310
</dependencyManagement>
297311

0 commit comments

Comments
 (0)