diff --git a/build.gradle b/build.gradle index d05ba48..a2c8522 100644 --- a/build.gradle +++ b/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' } } diff --git a/mkgogen.sh b/mkgogen.sh index d712265..7005692 100755 --- a/mkgogen.sh +++ b/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 diff --git a/opencensus/proto/exporter/BUILD.bazel b/opencensus/proto/exporter/BUILD.bazel index b5d703a..b9f9448 100644 --- a/opencensus/proto/exporter/BUILD.bazel +++ b/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" ], ) diff --git a/opencensus/proto/exporter/exporter.proto b/opencensus/proto/exporter/exporter.proto index 65c2647..14a6f35 100644 --- a/opencensus/proto/exporter/exporter.proto +++ b/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 { diff --git a/opencensus/proto/stats/metrics/BUILD.bazel b/opencensus/proto/metrics/BUILD.bazel similarity index 100% rename from opencensus/proto/stats/metrics/BUILD.bazel rename to opencensus/proto/metrics/BUILD.bazel diff --git a/opencensus/proto/stats/metrics/metrics.proto b/opencensus/proto/metrics/metrics.proto similarity index 99% rename from opencensus/proto/stats/metrics/metrics.proto rename to opencensus/proto/metrics/metrics.proto index 948a717..aef16a7 100644 --- a/opencensus/proto/stats/metrics/metrics.proto +++ b/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"; diff --git a/pom.xml b/pom.xml index c4c2185..2728e6e 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ . opencensus/proto/stats/*.proto - opencensus/proto/stats/metrics/*.proto + opencensus/proto/metrics/*.proto opencensus/proto/trace/*.proto