works and final version

openzipkin · Apr 23, 2019 · f91d9a1 · f91d9a1
1 parent 64f389d
commit f91d9a1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 83 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2015-2019 The OpenZipkin Authors
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
 
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.zipkin.zipkin2</groupId>
+  <groupId>org.apache.zipkin</groupId>
   <artifactId>parent</artifactId>
   <version>2.13.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -49,7 +52,7 @@
 
     <main.basedir>${project.basedir}</main.basedir>
 
-    <armeria.version>0.84.0-SNAPSHOT</armeria.version>
+    <armeria.version>0.84.0</armeria.version>
     <grpc.version>1.19.0</grpc.version>
     <protobuf.version>3.7.0</protobuf.version>
     <unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>
@@ -152,62 +155,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin</artifactId>
-        <type>test-jar</type>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-collector</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-junit</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-collector-kafka08</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-collector-scribe</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-lens</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <!-- TODO: group ID change: https://github.com/openzipkin/zipkin/issues/2132 -->
-        <groupId>io.zipkin.java</groupId>
-        <artifactId>zipkin-ui</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <!-- TODO: group ID change: https://github.com/openzipkin/zipkin/issues/2132 -->
-        <groupId>io.zipkin.java</groupId>
-        <artifactId>zipkin-server</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
@@ -405,6 +352,7 @@
         <artifactId>brave</artifactId>
         <version>${brave.version}</version>
         <exclusions>
+          <!-- TODO: this exclusion will drift when brave switches to apache zipkin -->
           <exclusion>
             <groupId>io.zipkin.zipkin2</groupId>
             <artifactId>zipkin</artifactId>
@@ -414,7 +362,7 @@
       <dependency>
         <groupId>io.zipkin.proto3</groupId>
         <artifactId>zipkin-proto3</artifactId>
-        <version>0.2.0</version>
+        <version>0.1.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
@@ -698,13 +646,6 @@
           </excludes>
           <strictCheck>true</strictCheck>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>com.mycila</groupId>
-            <artifactId>license-maven-plugin-git</artifactId>
-            <version>${license-maven-plugin.version}</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <goals>

diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
@@ -79,14 +79,8 @@
     </dependency>
     <dependency>
       <groupId>com.linecorp.armeria</groupId>
-      <artifactId>armeria-grpc</artifactId>
+      <artifactId>armeria-grpc-protocol</artifactId>
       <version>${armeria.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- zipkin requires exporting /health endpoint -->

diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinGrpcCollector.java b/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinGrpcCollector.java
@@ -28,6 +28,8 @@
 /** Collector for receiving spans on a gRPC endpoint. */
 @ConditionalOnProperty(name = "zipkin.collector.grpc.enabled") // disabled by default
 final class ZipkinGrpcCollector {
+  static final byte[] EMPTY = new byte[0];
+
   @Bean ArmeriaServerConfigurator grpcCollectorConfigurator(StorageComponent storage,
     CollectorSampler sampler, CollectorMetrics metrics) {
     CollectorMetrics grpcMetrics = metrics.forTransport("grpc");
@@ -63,7 +65,7 @@ static final class CompletableFutureCallback extends CompletableFuture<byte[]>
     implements Callback<Void> {
 
     @Override public void onSuccess(Void value) {
-      complete(new byte[0] /* empty result */);
+      complete(EMPTY);
     }
 
     @Override public void onError(Throwable t) {