SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267 from spring-cloud/zipkin-0.17.1

Browse Source 
Updates to zipkin 0.17
This commit is contained in:
Adrian Cole
2016-05-05 19:43:29 +08:00
parent fd58cb4db7 2c33895f4a
commit 2e2c8b3e17
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<aspectj.version>1.8.4</aspectj.version>
<zipkin-java.version>0.16.1</zipkin-java.version>
<zipkin-java.version>0.17.1</zipkin-java.version>
<zipkin-ui.version>1.39.8</zipkin-ui.version>
</properties>
<dependencyManagement>
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>storage-jdbc</artifactId>
<artifactId>zipkin-storage-jdbc</artifactId>
<version>${zipkin-java.version}</version>
</dependency>
<dependency>

4
spring-cloud-sleuth-samples/pom.xml
View File

@@ -59,12 +59,12 @@
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<version>0.16.1</version>
<version>0.17.1</version>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>0.16.1</version>
<version>0.17.1</version>
</dependency>
</dependencies>
</dependencyManagement>

2
spring-cloud-sleuth-zipkin-stream/pom.xml
View File

@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>storage-jdbc</artifactId>
<artifactId>zipkin-storage-jdbc</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>

9
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java
View File

@@ -1,5 +1,6 @@
package org.springframework.cloud.sleuth.zipkin;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.Flushable;
import java.io.IOException;
@@ -15,12 +16,12 @@ import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.zip.GZIPOutputStream;
import org.apache.commons.logging.Log;
import org.springframework.cloud.sleuth.metric.SpanMetricReporter;
import zipkin.Codec;
import zipkin.Span;
import zipkin.internal.Util;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -134,7 +135,11 @@ public final class HttpZipkinSpanReporter
connection.addRequestProperty("Content-Type", "application/json");
if (this.compressionEnabled) {
connection.addRequestProperty("Content-Encoding", "gzip");
json = Util.gzip(json);
ByteArrayOutputStream gzipped = new ByteArrayOutputStream();
try (GZIPOutputStream compressor = new GZIPOutputStream(gzipped)) {
compressor.write(json);
}
json = gzipped.toByteArray();
}
connection.setDoOutput(true);
connection.setFixedLengthStreamingMode(json.length);