Exporter/OCAgent: Move TraceProtoUtils to exporter. (#1470)

10 files changed, 7 insertions, 59 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3fa3020..352c2419 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,6 @@
 - Add `createWithSender` to `JaegerTraceExporter` to allow use of `HttpSender`
   with extra configurations.
 - Add an API `Functions.returnToString()`.
-- Add `opencensus-contrib-opencensus-proto-util` that has helper utilities to convert between
-  Java data models and protos.
 - Migrate to new Stackdriver Kubernetes monitored resource. This could be a breaking change
   if you are using `gke_container` resources. For more info,
   https://cloud.google.com/monitoring/kubernetes-engine/migration#incompatible
diff --git a/RELEASING.md b/RELEASING.md
index 2b4aa512..6d896d44 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -210,7 +210,6 @@ $ README_FILES=(
   contrib/log_correlation/log4j2/README.md
   contrib/log_correlation/stackdriver/README.md
   contrib/monitored_resource_util/README.md
-  contrib/opencensus_proto_util/README.md
   contrib/spring/README.md
   contrib/spring_sleuth_v1x/README.md
   contrib/zpages/README.md
diff --git a/all/build.gradle b/all/build.gradle
index 66e6a893..e3a0c4c6 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -15,7 +15,6 @@ def subprojects = [
         project(':opencensus-contrib-log-correlation-log4j2'),
         project(':opencensus-contrib-log-correlation-stackdriver'),
         project(':opencensus-contrib-monitored-resource-util'),
-        project(':opencensus-contrib-opencensus-proto-util'),
         project(':opencensus-contrib-spring'),
         project(':opencensus-contrib-spring-sleuth-v1x'),
         project(':opencensus-contrib-zpages'),
@@ -42,7 +41,6 @@ def subprojects_javadoc = [
         project(':opencensus-contrib-log-correlation-log4j2'),
         project(':opencensus-contrib-log-correlation-stackdriver'),
         project(':opencensus-contrib-monitored-resource-util'),
-        project(':opencensus-contrib-opencensus-proto-util'),
         project(':opencensus-contrib-spring'),
         project(':opencensus-contrib-spring-sleuth-v1x'),
         project(':opencensus-contrib-zpages'),
diff --git a/build.gradle b/build.gradle
index e3bcb688..3c675066 100644
--- a/build.gradle
+++ b/build.gradle
@@ -423,7 +423,6 @@ subprojects {
                  'opencensus-contrib-log-correlation-log4j2',
                  'opencensus-contrib-log-correlation-stackdriver',
                  'opencensus-contrib-monitored-resource-util',
-                 'opencensus-contrib-opencensus-proto-util',
                  'opencensus-contrib-spring',
                  'opencensus-contrib-spring-sleuth-v1x',
                  'opencensus-contrib-zpages',
diff --git a/buildscripts/import-control.xml b/buildscripts/import-control.xml
index 2467e35c..b4c7410b 100644
--- a/buildscripts/import-control.xml
+++ b/buildscripts/import-control.xml
@@ -134,12 +134,6 @@ General guidelines on imports:
     <subpackage name="monitoredresource.util">
       <allow pkg="io.opencensus.contrib.monitoredresource.util"/>
     </subpackage>
-    <subpackage name="opencensus.proto.util">
-      <allow pkg="com.google.protobuf"/>
-      <allow pkg="io.opencensus.contrib.opencensus.proto.util"/>
-      <allow pkg="io.opencensus.proto"/>
-      <allow pkg="io.opencensus.trace"/>
-    </subpackage>
   </subpackage>
   <subpackage name="exporter">
     <allow pkg="com.google.common"/>
@@ -175,8 +169,11 @@ General guidelines on imports:
         <allow pkg="org.apache.thrift"/>
       </subpackage>
       <subpackage name="ocagent">
+        <allow pkg="com.google.protobuf"/>
+        <allow pkg="io.opencensus.contrib.opencensus.proto.util"/>
         <allow pkg="io.opencensus.exporter.trace.ocagent"/>
         <allow pkg="io.opencensus.proto"/>
+        <allow pkg="io.opencensus.trace"/>
       </subpackage>
       <subpackage name="stackdriver">
         <allow pkg="com.google"/>
diff --git a/contrib/opencensus_proto_util/README.md b/contrib/opencensus_proto_util/README.md
deleted file mode 100644
index e495121d..00000000
--- a/contrib/opencensus_proto_util/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# OpenCensus Proto Util
-
-The *OpenCensus Proto Util for Java* is a collection of utilities for converting OpenCensus Java
-data models to OpenCensus proto data models.
-
-## Quickstart
-
-### Add the dependencies to your project
-
-For Maven add to your `pom.xml`:
-```xml
-<dependencies>
-  <dependency>
-    <groupId>io.opencensus</groupId>
-    <artifactId>opencensus-contrib-opencensus-proto-util</artifactId>
-    <version>0.17.0</version>
-  </dependency>
-</dependencies>
-```
-
-For Gradle add to your dependencies:
-```gradle
-compile 'io.opencensus:opencensus-contrib-opencensus-proto-util:0.17.0'
-```
diff --git a/contrib/opencensus_proto_util/build.gradle b/contrib/opencensus_proto_util/build.gradle
deleted file mode 100644
index 8a622246..00000000
--- a/contrib/opencensus_proto_util/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-description = 'OpenCensus Proto Util'
-
-apply plugin: 'java'
-
-[compileJava, compileTestJava].each() {
-    it.sourceCompatibility = 1.7
-    it.targetCompatibility = 1.7
-}
-
-dependencies {
-    compile project(':opencensus-api'),
-            libraries.opencensus_proto
-
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
-}
diff --git a/contrib/opencensus_proto_util/src/main/java/io/opencensus/contrib/opencensus/proto/util/TraceProtoUtils.java b/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/TraceProtoUtils.java
index f2ecd01a..26bae0ac 100644
--- a/contrib/opencensus_proto_util/src/main/java/io/opencensus/contrib/opencensus/proto/util/TraceProtoUtils.java
+++ b/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/TraceProtoUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.opencensus.proto.util;
+package io.opencensus.exporter.trace.ocagent;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.BoolValue;
diff --git a/contrib/opencensus_proto_util/src/test/java/io/opencensus/contrib/opencensus/proto/util/TraceProtoUtilsTest.java b/exporters/trace/ocagent/src/test/java/io/opencensus/exporter/trace/ocagent/TraceProtoUtilsTest.java
index 37908f6b..4271fc79 100644
--- a/contrib/opencensus_proto_util/src/test/java/io/opencensus/contrib/opencensus/proto/util/TraceProtoUtilsTest.java
+++ b/exporters/trace/ocagent/src/test/java/io/opencensus/exporter/trace/ocagent/TraceProtoUtilsTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.opencensus.proto.util;
+package io.opencensus.exporter.trace.ocagent;
 
 import static com.google.common.truth.Truth.assertThat;
-import static io.opencensus.contrib.opencensus.proto.util.TraceProtoUtils.toByteString;
-import static io.opencensus.contrib.opencensus.proto.util.TraceProtoUtils.toTruncatableStringProto;
+import static io.opencensus.exporter.trace.ocagent.TraceProtoUtils.toByteString;
+import static io.opencensus.exporter.trace.ocagent.TraceProtoUtils.toTruncatableStringProto;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/settings.gradle b/settings.gradle
index 409d3147..bdf68bdc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,6 @@ include ":opencensus-contrib-http-util"
 include ":opencensus-contrib-log-correlation-log4j2"
 include ":opencensus-contrib-log-correlation-stackdriver"
 include ":opencensus-contrib-monitored-resource-util"
-include ":opencensus-contrib-opencensus-proto-util"
 include ":opencensus-contrib-spring"
 include ":opencensus-contrib-spring-sleuth-v1x"
 
@@ -45,8 +44,6 @@ project(':opencensus-contrib-log-correlation-stackdriver').projectDir =
         "$rootDir/contrib/log_correlation/stackdriver" as File
 project(':opencensus-contrib-monitored-resource-util').projectDir =
         "$rootDir/contrib/monitored_resource_util" as File
-project(':opencensus-contrib-opencensus-proto-util').projectDir =
-        "$rootDir/contrib/opencensus_proto_util" as File
 project(':opencensus-contrib-spring').projectDir = "$rootDir/contrib/spring" as File
 project(':opencensus-contrib-spring-sleuth-v1x').projectDir =
         "$rootDir/contrib/spring_sleuth_v1x" as File