-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #741 from commercetools/optimize-okhttp3-client
optimize OkHttp3 client
- Loading branch information
Showing
19 changed files
with
783 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
dependencies { | ||
api "javax.money:money-api:1.1" | ||
api group: 'org.javamoney.moneta', name: 'moneta-core', version: '1.4.4' | ||
api('org.javamoney.moneta:moneta-core:1.4.4') { | ||
exclude group: "com.squareup.okhttp3", module: "okhttp" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
...mercetools-okhttp-client3/src/jmh/java/com/commercetools/http/okhttp3/UnzipBenchmark.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
|
||
package com.commercetools.http.okhttp3; | ||
|
||
import java.io.ByteArrayInputStream; | ||
import java.io.ByteArrayOutputStream; | ||
import java.io.IOException; | ||
import java.nio.charset.StandardCharsets; | ||
import java.util.zip.GZIPOutputStream; | ||
|
||
import io.vrap.rmf.base.client.ApiHttpResponse; | ||
|
||
import org.assertj.core.api.Assertions; | ||
import org.openjdk.jmh.annotations.*; | ||
|
||
import okhttp3.*; | ||
import okio.Okio; | ||
|
||
public class UnzipBenchmark { | ||
|
||
@State(Scope.Benchmark) | ||
public static class InterceptorState { | ||
private CtOkHttp3Client.UnzippingInterceptor interceptor; | ||
|
||
@Setup(Level.Trial) | ||
public void init() { | ||
interceptor = new CtOkHttp3Client.UnzippingInterceptor(); | ||
printUsedMemory(); | ||
|
||
} | ||
|
||
@TearDown(Level.Trial) | ||
public void tearDown() { | ||
printUsedMemory(); | ||
} | ||
} | ||
@Benchmark | ||
public void unzip(InterceptorState state) throws IOException { | ||
|
||
ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
GZIPOutputStream gzipOs = new GZIPOutputStream(os); | ||
byte[] buffer = "Sample Text".getBytes(); | ||
gzipOs.write(buffer, 0, buffer.length); | ||
gzipOs.close(); | ||
ByteArrayInputStream inputStream = new ByteArrayInputStream(os.toByteArray()); | ||
|
||
Response gzipped = new Response.Builder().request(new Request.Builder().url("http://localhost").build()) | ||
.protocol(Protocol.HTTP_1_1) | ||
.addHeader("content-encoding", "gzip") | ||
.addHeader("content-type", "application/json") | ||
.code(200) | ||
.message("Ok") | ||
.body(ResponseBody.create(MediaType.parse("application/json"), -1L, | ||
Okio.buffer(Okio.source(inputStream)))) | ||
.build(); | ||
Assertions.assertThat(gzipped.body().source().isOpen()).isTrue(); | ||
|
||
Response unzipped = state.interceptor.unzip(gzipped); | ||
|
||
Assertions.assertThat(gzipped.body().source().isOpen()).isTrue(); | ||
Assertions.assertThat(unzipped.body().source().isOpen()).isTrue(); | ||
Assertions.assertThat(inputStream.available()).isEqualTo(31); | ||
|
||
ApiHttpResponse<byte[]> response = CtOkHttp3Client.toResponse(unzipped); | ||
|
||
Assertions.assertThat(gzipped.body().source().isOpen()).isFalse(); | ||
Assertions.assertThat(unzipped.body().source().isOpen()).isFalse(); | ||
Assertions.assertThat(inputStream.available()).isEqualTo(0); | ||
|
||
String text = new String(response.getBody(), StandardCharsets.UTF_8); | ||
Assertions.assertThat(text).isEqualTo("Sample Text"); | ||
} | ||
|
||
public static void printUsedMemory() { | ||
long _usedMem; | ||
long _total; | ||
long _total2; | ||
long _count = -1; | ||
System.out.flush(); | ||
// loop to get a stable reading, since memory may be resized between the method calls | ||
do { | ||
_count++; | ||
_total = Runtime.getRuntime().totalMemory(); | ||
try { | ||
Thread.sleep(12); | ||
} | ||
catch (Exception ignore) { | ||
} | ||
long _free = Runtime.getRuntime().freeMemory(); | ||
_total2 = Runtime.getRuntime().totalMemory(); | ||
_usedMem = _total - _free; | ||
} while (_total != _total2); | ||
System.out.println("before GC: used=" + _usedMem + ", loopCount=" + _count + ", total=" + _total); | ||
try { | ||
Runtime.getRuntime().gc(); | ||
Thread.sleep(55); | ||
Runtime.getRuntime().gc(); | ||
Thread.sleep(55); | ||
Runtime.getRuntime().gc(); | ||
Thread.sleep(55); | ||
Runtime.getRuntime().gc(); | ||
Thread.sleep(55); | ||
} | ||
catch (Exception ignore) { | ||
} | ||
// loop to get a stable reading, since memory may be resized between the method calls | ||
do { | ||
_count++; | ||
_total = Runtime.getRuntime().totalMemory(); | ||
try { | ||
Thread.sleep(12); | ||
} | ||
catch (Exception ignore) { | ||
} | ||
long _free = Runtime.getRuntime().freeMemory(); | ||
_total2 = Runtime.getRuntime().totalMemory(); | ||
_usedMem = _total - _free; | ||
} while (_total != _total2); | ||
System.out.println("after GC: used=" + _usedMem + ", loopCount=" + _count + ", total=" + _total); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...mmercetools-okhttp-client3/src/test/java/com/commercetools/http/okhttp3/SupplierTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,63 @@ | ||
|
||
package com.commercetools.http.okhttp3; | ||
|
||
import java.io.ByteArrayInputStream; | ||
import java.io.ByteArrayOutputStream; | ||
import java.io.IOException; | ||
import java.nio.charset.StandardCharsets; | ||
import java.util.zip.GZIPOutputStream; | ||
|
||
import io.vrap.rmf.base.client.ApiHttpResponse; | ||
import io.vrap.rmf.base.client.HttpClientSupplier; | ||
|
||
import org.assertj.core.api.Assertions; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import okhttp3.*; | ||
import okio.Okio; | ||
|
||
public class SupplierTest { | ||
@Test | ||
public void testCreate() { | ||
Assertions.assertThat(HttpClientSupplier.of().get()).isInstanceOf(CtOkHttp3Client.class); | ||
} | ||
|
||
@Test | ||
public void testUnzip() throws IOException { | ||
|
||
ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
GZIPOutputStream gzipOs = new GZIPOutputStream(os); | ||
byte[] buffer = "Sample Text".getBytes(); | ||
gzipOs.write(buffer, 0, buffer.length); | ||
gzipOs.close(); | ||
ByteArrayInputStream inputStream = new ByteArrayInputStream(os.toByteArray()); | ||
|
||
CtOkHttp3Client.UnzippingInterceptor interceptor = new CtOkHttp3Client.UnzippingInterceptor(); | ||
|
||
Response gzipped = new Response.Builder().request(new Request.Builder().url("http://localhost").build()) | ||
.protocol(Protocol.HTTP_1_1) | ||
.addHeader("content-encoding", "gzip") | ||
.addHeader("content-type", "application/json") | ||
.code(200) | ||
.message("Ok") | ||
.body(ResponseBody.create(MediaType.parse("application/json"), -1L, | ||
Okio.buffer(Okio.source(inputStream)))) | ||
.build(); | ||
Assertions.assertThat(gzipped.body().source().isOpen()).isTrue(); | ||
|
||
Response unzipped = interceptor.unzip(gzipped); | ||
|
||
Assertions.assertThat(gzipped.body().source().isOpen()).isTrue(); | ||
Assertions.assertThat(unzipped.body().source().isOpen()).isTrue(); | ||
Assertions.assertThat(inputStream.available()).isEqualTo(31); | ||
|
||
ApiHttpResponse<byte[]> response = CtOkHttp3Client.toResponse(unzipped); | ||
|
||
Assertions.assertThat(gzipped.body().source().isOpen()).isFalse(); | ||
Assertions.assertThat(unzipped.body().source().isOpen()).isFalse(); | ||
Assertions.assertThat(inputStream.available()).isEqualTo(0); | ||
|
||
String text = new String(response.getBody(), StandardCharsets.UTF_8); | ||
Assertions.assertThat(text).isEqualTo("Sample Text"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.