You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/05/04 00:02:15 UTC
[incubator-zipkin] branch proto-api created (now 9088c62)
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a change to branch proto-api
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git.
at 9088c62 Moves to ASF zipkin-api removing google protobuf dep
This branch includes the following new commits:
new 9088c62 Moves to ASF zipkin-api removing google protobuf dep
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-zipkin] 01/01: Moves to ASF zipkin-api removing google
protobuf dep
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch proto-api
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git
commit 9088c62349a01424732ee6b86b9fe55b7d6004d7
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Sat May 4 08:01:21 2019 +0800
Moves to ASF zipkin-api removing google protobuf dep
Fixes #2550
---
benchmarks/pom.xml | 15 +--------------
pom.xml | 9 +++------
zipkin-server/pom.xml | 15 +--------------
.../zipkin2/server/internal/ITZipkinGrpcCollector.kt | 6 +++---
4 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 1407979..62a630c 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -80,22 +80,9 @@
<version>${wire.version}</version>
</dependency>
<dependency>
- <groupId>io.zipkin.proto3</groupId>
+ <groupId>org.apache.zipkin.proto3</groupId>
<artifactId>zipkin-proto3</artifactId>
</dependency>
- <!-- TODO: This only resolves google empty. Remove this once using org.apache.zipkin.proto3 -->
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>3.7.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index e0a8c4c..1e5e1d1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -382,9 +382,9 @@
</dependency>
<dependency>
- <groupId>io.zipkin.proto3</groupId>
+ <groupId>org.apache.zipkin.proto3</groupId>
<artifactId>zipkin-proto3</artifactId>
- <version>0.2.0</version>
+ <version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.squareup.wire</groupId>
@@ -557,8 +557,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <!-- TODO: Remove protobuf-java once using org.apache.zipkin.proto3 -->
- <includeArtifactIds>protobuf-java,zipkin-proto3</includeArtifactIds>
+ <includeArtifactIds>zipkin-proto3</includeArtifactIds>
<includes>**/*.proto</includes>
<outputDirectory>${unpack-proto.directory}</outputDirectory>
</configuration>
@@ -578,8 +577,6 @@
<configuration>
<protoSourceDirectory>${unpack-proto.directory}</protoSourceDirectory>
<includes>
- <!-- TODO: Remove google.protobuf.Empty once using org.apache.zipkin.proto3 -->
- <include>google.protobuf.Empty</include>
<include>zipkin.proto3.*</include>
</includes>
</configuration>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index 5e22f50..310cbd8 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -133,23 +133,10 @@
<!-- to test the experimental grpc endpoint with the square/wire library -->
<dependency>
- <groupId>io.zipkin.proto3</groupId>
+ <groupId>org.apache.zipkin.proto3</groupId>
<artifactId>zipkin-proto3</artifactId>
<scope>test</scope>
</dependency>
- <!-- TODO: This only resolves google empty. Remove this once using org.apache.zipkin.proto3 -->
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>3.7.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.squareup.wire</groupId>
<artifactId>wire-grpc-client</artifactId>
diff --git a/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt b/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt
index d4dddf7..269f982 100644
--- a/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt
+++ b/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt
@@ -17,7 +17,6 @@
package zipkin2.server.internal
-import com.google.protobuf.Empty
import com.linecorp.armeria.server.Server
import com.squareup.wire.GrpcClient
import com.squareup.wire.Service
@@ -38,6 +37,7 @@ import zipkin2.TestObjects
import zipkin2.codec.SpanBytesDecoder
import zipkin2.codec.SpanBytesEncoder
import zipkin2.proto3.ListOfSpans
+import zipkin2.proto3.ReportResponse
import zipkin2.storage.InMemoryStorage
/** This tests that we accept messages constructed by other clients. */
@@ -58,9 +58,9 @@ class ITZipkinGrpcCollector {
@WireRpc(
path = "/zipkin.proto3.SpanService/Report",
requestAdapter = "zipkin2.proto3.ListOfSpans#ADAPTER",
- responseAdapter = "com.google.protobuf.Empty#ADAPTER"
+ responseAdapter = "zipkin2.proto3.ReportResponse#ADAPTER"
)
- suspend fun Report(request: ListOfSpans): Empty
+ suspend fun Report(request: ListOfSpans): ReportResponse
}
@Before fun sanityCheckCodecCompatible() {