Merge pull request #53 from ExpediaDotCom/haystack-commons-dependency

removing proto submodule and add haystack-commons dependency

Author: vsen

.gitignore

@@ -39,3 +39,4 @@ hs_err_pid*
 
 # IntelliJ Idea project files
 .idea/
+*.iml

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "idl"]
-	path = idl
-	url = https://github.com/ExpediaDotCom/haystack-idl.git

core/pom.xml

@@ -30,15 +30,20 @@
       <artifactId>opentracing-util</artifactId>
     </dependency>
 
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-netty-shaded</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-stub</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-netty-shaded</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-protobuf</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-stub</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>

core/src/main/java/com/expedia/www/haystack/client/dispatchers/clients/GRPCAgentClient.java

@@ -93,7 +93,7 @@ public GRPCAgentClientStreamObserver(Metrics metrics) {
         @Override
         public void onCompleted() {
             onCompletedCounter.increment();
-            LOGGER.info("Dispatching span completed");
+            LOGGER.debug("Dispatching span completed");
         }
 
         @Override

idl

@@ -34,7 +34,6 @@
   </developers>
 
   <modules>
-    <module>proto</module>
     <module>core</module>
     <module>integrations</module>
     <module>examples</module>
@@ -54,12 +53,12 @@
     <grpc.version>1.9.0</grpc.version>
     <jaxrs.version>2.1</jaxrs.version>
     <micrometer.version>1.0.1</micrometer.version>
+    <haystack-commons.version>1.0.37</haystack-commons.version>
 
     <!--Plugin Properties -->
     <maven-jacoco-plugin.version>0.7.9</maven-jacoco-plugin.version>
     <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
     <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-    <maven-protobuf-plugin.version>3.3.0.1</maven-protobuf-plugin.version>
     <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
     <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
     <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
@@ -128,6 +127,13 @@
         <artifactId>grpc-stub</artifactId>
         <version>${grpc.version}</version>
       </dependency>
+
+      <dependency>
+        <groupId>com.expedia.www</groupId>
+        <artifactId>haystack-commons</artifactId>
+        <version>${haystack-commons.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-testing</artifactId>
@@ -229,39 +235,6 @@
           </configuration>
         </plugin>
 
-        <plugin>
-          <groupId>com.github.os72</groupId>
-          <artifactId>protoc-jar-maven-plugin</artifactId>
-          <version>${maven-protobuf-plugin.version}</version>
-          <executions>
-            <execution>
-              <phase>generate-sources</phase>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <configuration>
-                <protocArtifact>com.google.protobuf:protoc:3.0.0</protocArtifact>
-                <includeDirectories>
-                  <include>${project.parent.basedir}/idl/proto</include>
-                </includeDirectories>
-                <inputDirectories>
-                  <include>${project.parent.basedir}/idl/proto</include>
-                </inputDirectories>
-                <outputDirectory>${project.basedir}/target/generated-sources</outputDirectory>
-                <outputTargets>
-                  <outputTarget>
-                    <type>java</type>
-                  </outputTarget>
-                  <outputTarget>
-                    <type>grpc-java</type>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1</pluginArtifact>
-                  </outputTarget>
-                </outputTargets>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>