Move metrics in the top level directory. (#68)

* Move metrics in the top level directory.

* Update maven and gradle.

build.gradle

@@ -25,7 +25,7 @@ sourceSets {
         proto {
             // In addition to the default 'src/main/proto'
             srcDir 'opencensus/proto/stats'
-            srcDir 'opencensus/proto/stats/metrics'
+            srcDir 'opencensus/proto/metrics'
             srcDir 'opencensus/proto/trace'
         }
     }

mkgogen.sh

@@ -12,6 +12,6 @@
 OUTDIR="$(go env GOPATH)/src"
 
 protoc --go_out=plugins=grpc:$OUTDIR opencensus/proto/stats/stats.proto \
-    && protoc --go_out=plugins=grpc:$OUTDIR opencensus/proto/stats/metrics/metrics.proto \
+    && protoc --go_out=plugins=grpc:$OUTDIR opencensus/proto/metrics/metrics.proto \
     && protoc --go_out=plugins=grpc:$OUTDIR opencensus/proto/trace/trace.proto \
     && protoc -I=. --go_out=plugins=grpc:$OUTDIR opencensus/proto/exporter/exporter.proto

opencensus/proto/exporter/BUILD.bazel

@@ -19,7 +19,7 @@ proto_library(
     srcs = ["exporter.proto"],
     deps = [
         "//opencensus/proto/trace:trace_proto",
-        "//opencensus/proto/stats/metrics:metrics_proto"
+        "//opencensus/proto/metrics:metrics_proto"
     ],
 )
 

opencensus/proto/exporter/exporter.proto

@@ -20,7 +20,7 @@ syntax = "proto3";
 package opencensus.proto.exporter;
 
 import "opencensus/proto/trace/trace.proto";
-import "opencensus/proto/stats/metrics/metrics.proto";
+import "opencensus/proto/metrics/metrics.proto";
 
 option java_multiple_files = true;
 option java_package = "io.opencensus.proto.exporter";
@@ -36,7 +36,7 @@ message ExportSpanResponse {
 }
 
 message ExportMetricsRequest {
-  repeated opencensus.proto.stats.metrics.Metric metrics = 1;
+  repeated opencensus.proto.metrics.Metric metrics = 1;
 }
 
 message ExportMetricsResponse {

opencensus/proto/metrics/metrics.proto

@@ -19,11 +19,11 @@
 
 syntax = "proto3";
 
-package opencensus.proto.stats.metrics;
+package opencensus.proto.metrics;
 
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/census-instrumentation/opencensus-proto/gen-go/statsproto/metricsproto";
+option go_package = "github.com/census-instrumentation/opencensus-proto/gen-go/metricsproto";
 
 option java_multiple_files = true;
 option java_package = "io.opencensus.proto.metrics";

pom.xml

@@ -53,7 +53,7 @@
           <protoSourceRoot>.</protoSourceRoot>
 	        <includes>
             <include>opencensus/proto/stats/*.proto</include>
-            <include>opencensus/proto/stats/metrics/*.proto</include>
+            <include>opencensus/proto/metrics/*.proto</include>
             <include>opencensus/proto/trace/*.proto</include>
 	        </includes>
         </configuration>