Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,44 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>2.7.4</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.60</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxnetty-http</artifactId>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxnetty-spectator-http</artifactId>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxnetty-common</artifactId>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxnetty</artifactId>
<version>0.5.1</version>
<artifactId>rxnetty-tcp</artifactId>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.0.Beta7</version>
<version>4.1.5.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>1.0.14</version>
<version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand All @@ -89,6 +103,11 @@
<version>${jmh.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
21 changes: 12 additions & 9 deletions benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,24 @@
*/
package feign.benchmark;



import feign.Feign;
import feign.Logger;
import feign.Logger.Level;
import feign.Response;
import feign.Retryer;
import io.netty.buffer.ByteBuf;
import io.reactivex.netty.RxNetty;
import io.reactivex.netty.protocol.http.HttpHandlerNames;
import io.reactivex.netty.protocol.http.server.HttpServer;
import io.reactivex.netty.protocol.http.server.HttpServerRequest;
import io.reactivex.netty.protocol.http.server.HttpServerResponse;
import io.reactivex.netty.protocol.http.server.RequestHandler;
import io.reactivex.netty.server.ErrorHandler;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import io.netty.buffer.ByteBuf;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.internal.http.HttpHeaders;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand All @@ -36,10 +42,6 @@
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Warmup;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import feign.Feign;
import feign.Response;
import rx.Observable;

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

@Setup
public void setup() {
server = RxNetty.createHttpServer(SERVER_PORT, (request, response) -> response.flush());
server.start();

server = HttpServer.newServer(SERVER_PORT)
.start((request, response) -> null);
client = new OkHttpClient();
client.retryOnConnectionFailure();
okFeign = Feign.builder()
Expand Down
14 changes: 14 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@

<okhttp3.version>3.6.0</okhttp3.version>
<gson.version>2.5</gson.version>
<slf4j.version>1.7.13</slf4j.version>

<junit.version>4.12</junit.version>
<jackson.version>2.9.8</jackson.version>
Expand Down Expand Up @@ -292,6 +293,19 @@
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j.version}</version>
</dependency>


</dependencies>
</dependencyManagement>

Expand Down