Extract metrics package from gerrit-server top-level directory

Change-Id: I7c21b82de289ebc24b530d6b37abf6c33b4dec2f

gerrit-acceptance-framework/BUILD

@@ -13,11 +13,11 @@ PROVIDED = [
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
     "//java/com/google/gerrit/index",
+    "//java/com/google/gerrit/metrics",
+    "//java/com/google/gerrit/reviewdb:server",
     "//gerrit-httpd:httpd",
     "//gerrit-lucene:lucene",
     "//gerrit-pgm:init",
-    "//java/com/google/gerrit/reviewdb:server",
-    "//gerrit-server:metrics",
     "//gerrit-server:receive",
     "//gerrit-server:server",
     "//lib:gson",

gerrit-acceptance-tests/BUILD

@@ -15,7 +15,6 @@ java_library(
         "//gerrit-pgm:init",
         "//gerrit-pgm:pgm",
         "//gerrit-pgm:util",
-        "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-server:testutil",
@@ -25,6 +24,7 @@ java_library(
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/extensions/common/testing:common-test-util",
         "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
+        "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:args4j",
         "//lib:gson",

gerrit-httpd/BUILD

@@ -17,7 +17,6 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-launcher:launcher",
-        "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-util-http:http",
@@ -26,6 +25,7 @@ java_library(
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/util/cli",

gerrit-pgm/BUILD

@@ -28,8 +28,9 @@ BASE_JETTY_DEPS = [
 ]
 
 DEPS = BASE_JETTY_DEPS + [
+    "//java/com/google/gerrit/metrics",
+    "//java/com/google/gerrit/metrics/dropwizard",
     "//java/com/google/gerrit/reviewdb:server",
-    "//gerrit-server:metrics",
     "//gerrit-server:module",
     "//gerrit-server:receive",
     "//lib:gwtorm",

gerrit-plugin-api/BUILD

@@ -13,10 +13,10 @@ EXPORTS = [
     "//java/com/google/gerrit/index:query_exception",
     "//java/com/google/gerrit/index:query_parser",
     "//java/com/google/gerrit/lifecycle",
-    "//java/com/google/gwtexpui/server",
-    "//gerrit-server:metrics",
+    "//java/com/google/gerrit/metrics",
+    "//java/com/google/gerrit/metrics/dropwizard",
     "//java/com/google/gerrit/reviewdb:server",
-    "//prolog:gerrit-prolog-common",
+    "//java/com/google/gwtexpui/server",
     "//lib/commons:dbcp",
     "//lib/commons:lang",
     "//lib/commons:lang3",
@@ -49,6 +49,7 @@ EXPORTS = [
     "//lib:protobuf",
     "//lib:servlet-api-3_1-without-neverlink",
     "//lib:soy",
+    "//prolog:gerrit-prolog-common",
 ]
 
 java_binary(

gerrit-server/BUILD

@@ -8,14 +8,11 @@ GERRIT_GLOBAL_MODULE_SRC = [
     "src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java",
 ]
 
-# Non-recursive glob; dropwizard implementation is in a subpackage.
-METRICS_SRCS = glob(["src/main/java/com/google/gerrit/metrics/*.java"])
-
 RECEIVE_SRCS = glob(["src/main/java/com/google/gerrit/server/git/receive/**/*.java"])
 
 SRCS = glob(
     ["src/main/java/**/*.java"],
-    exclude = CONSTANTS_SRC + GERRIT_GLOBAL_MODULE_SRC + METRICS_SRCS + RECEIVE_SRCS,
+    exclude = CONSTANTS_SRC + GERRIT_GLOBAL_MODULE_SRC + RECEIVE_SRCS,
 )
 
 RESOURCES = glob(["src/main/resources/**/*"])
@@ -39,13 +36,13 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":constants",
-        ":metrics",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/index",
         "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/util/cli",
@@ -78,7 +75,6 @@ java_library(
         "//lib/commons:lang",
         "//lib/commons:net",
         "//lib/commons:validator",
-        "//lib/dropwizard:dropwizard-core",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",
         "//lib/guice:guice-servlet",
@@ -140,26 +136,14 @@ java_library(
     ],
 )
 
-# TODO(dborowitz): Move to a different top-level directory to avoid inbound
-# dependencies on gerrit-server.
-java_library(
-    name = "metrics",
-    srcs = METRICS_SRCS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/com/google/gerrit/extensions:api",
-        "//lib:guava",
-    ],
-)
-
 TESTUTIL_DEPS = [
-    ":metrics",
     ":module",
     ":server",
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
     "//java/com/google/gerrit/lifecycle",
+    "//java/com/google/gerrit/metrics",
     "//java/com/google/gerrit/reviewdb:server",
     "//java/com/google/gerrit/server/cache/h2",
     "//gerrit-gpg:gpg",
@@ -311,7 +295,6 @@ junit_tests(
         "//lib:truth-java8-extension",
         "//lib/bouncycastle:bcprov",
         "//lib/bouncycastle:bcpkix",
-        "//lib/dropwizard:dropwizard-core",
         "//lib/guice:guice-assistedinject",
         "//lib/prolog:runtime",
         "//lib/commons:codec",

gerrit-sshd/BUILD

@@ -8,13 +8,13 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-lucene:lucene",
-        "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
         "//java/com/google/gerrit/util/cli",

gerrit-war/BUILD

@@ -21,6 +21,7 @@ java_library(
         "//gerrit-sshd:sshd",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/metrics/dropwizard",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
         "//lib:guava",

java/com/google/gerrit/index/BUILD

@@ -34,9 +34,9 @@ java_library(
     deps = [
         ":query_exception",
         ":query_parser",
-        "//gerrit-server:metrics",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/metrics",
         "//lib:guava",
         "//lib:gwtjsonrpc",
         "//lib:gwtorm",

java/com/google/gerrit/metrics/BUILD

@@ -0,0 +1,15 @@
+java_library(
+    name = "metrics",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/lifecycle",
+        "//java/org/eclipse/jgit:server",
+        "//lib:guava",
+        "//lib/guice",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+    ],
+)

java/com/google/gerrit/metrics/dropwizard/BUILD

@@ -0,0 +1,15 @@
+java_library(
+    name = "dropwizard",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-server:server",
+        "//java/com/google/gerrit/common:annotations",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/metrics",
+        "//lib:args4j",
+        "//lib:guava",
+        "//lib/dropwizard:dropwizard-core",
+        "//lib/guice",
+    ],
+)

javatests/com/google/gerrit/metrics/proc/BUILD

@@ -0,0 +1,16 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+    name = "proc_tests",
+    size = "small",
+    srcs = glob(["**/*.java"]),
+    deps = [
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/metrics",
+        "//java/com/google/gerrit/metrics/dropwizard",
+        "//lib:truth",
+        "//lib/dropwizard:dropwizard-core",
+        "//lib/guice",
+    ],
+)