diff --git a/go/sig/BUILD.bazel b/go/sig/BUILD.bazel index a5aca174df..57bb80150f 100644 --- a/go/sig/BUILD.bazel +++ b/go/sig/BUILD.bazel @@ -18,9 +18,9 @@ go_library( "//go/sig/egress:go_default_library", "//go/sig/ingress:go_default_library", "//go/sig/internal/disp:go_default_library", + "//go/sig/internal/metrics:go_default_library", "//go/sig/internal/sigconfig:go_default_library", "//go/sig/internal/xnet:go_default_library", - "//go/sig/metrics:go_default_library", "//go/sig/sigcmn:go_default_library", "@com_github_burntsushi_toml//:go_default_library", "@com_github_syndtr_gocapability//capability:go_default_library", diff --git a/go/sig/egress/dispatcher/BUILD.bazel b/go/sig/egress/dispatcher/BUILD.bazel index 669ffe62fb..56205eb05a 100644 --- a/go/sig/egress/dispatcher/BUILD.bazel +++ b/go/sig/egress/dispatcher/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//go/lib/log:go_default_library", "//go/lib/ringbuf:go_default_library", "//go/sig/egress/iface:go_default_library", - "//go/sig/metrics:go_default_library", + "//go/sig/internal/metrics:go_default_library", "//go/sig/mgmt:go_default_library", ], ) diff --git a/go/sig/egress/dispatcher/dispatcher.go b/go/sig/egress/dispatcher/dispatcher.go index 90f7ca12eb..91e952778b 100644 --- a/go/sig/egress/dispatcher/dispatcher.go +++ b/go/sig/egress/dispatcher/dispatcher.go @@ -23,7 +23,7 @@ import ( "github.com/scionproto/scion/go/lib/log" "github.com/scionproto/scion/go/lib/ringbuf" "github.com/scionproto/scion/go/sig/egress/iface" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/mgmt" ) diff --git a/go/sig/egress/reader/BUILD.bazel b/go/sig/egress/reader/BUILD.bazel index 8664027940..ac9c4b41de 100644 --- a/go/sig/egress/reader/BUILD.bazel +++ b/go/sig/egress/reader/BUILD.bazel @@ -11,6 +11,6 @@ go_library( "//go/lib/ringbuf:go_default_library", "//go/sig/egress/iface:go_default_library", "//go/sig/egress/router:go_default_library", - "//go/sig/metrics:go_default_library", + "//go/sig/internal/metrics:go_default_library", ], ) diff --git a/go/sig/egress/reader/reader.go b/go/sig/egress/reader/reader.go index ea739d2401..a02e6245c5 100644 --- a/go/sig/egress/reader/reader.go +++ b/go/sig/egress/reader/reader.go @@ -28,7 +28,7 @@ import ( "github.com/scionproto/scion/go/lib/ringbuf" "github.com/scionproto/scion/go/sig/egress/iface" "github.com/scionproto/scion/go/sig/egress/router" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" ) const ( diff --git a/go/sig/egress/session/BUILD.bazel b/go/sig/egress/session/BUILD.bazel index d921b7e01a..75197554e4 100644 --- a/go/sig/egress/session/BUILD.bazel +++ b/go/sig/egress/session/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "//go/sig/egress/siginfo:go_default_library", "//go/sig/egress/worker:go_default_library", "//go/sig/internal/disp:go_default_library", - "//go/sig/metrics:go_default_library", + "//go/sig/internal/metrics:go_default_library", "//go/sig/mgmt:go_default_library", "//go/sig/sigcmn:go_default_library", ], diff --git a/go/sig/egress/session/sessmon.go b/go/sig/egress/session/sessmon.go index 2fe1ff65c9..e566a49eab 100644 --- a/go/sig/egress/session/sessmon.go +++ b/go/sig/egress/session/sessmon.go @@ -27,7 +27,7 @@ import ( "github.com/scionproto/scion/go/sig/egress/iface" "github.com/scionproto/scion/go/sig/egress/siginfo" "github.com/scionproto/scion/go/sig/internal/disp" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/mgmt" "github.com/scionproto/scion/go/sig/sigcmn" ) diff --git a/go/sig/egress/worker/BUILD.bazel b/go/sig/egress/worker/BUILD.bazel index b8a4ac8c19..33ef76c960 100644 --- a/go/sig/egress/worker/BUILD.bazel +++ b/go/sig/egress/worker/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "//go/lib/util:go_default_library", "//go/sig/egress/iface:go_default_library", "//go/sig/egress/siginfo:go_default_library", - "//go/sig/metrics:go_default_library", + "//go/sig/internal/metrics:go_default_library", "//go/sig/mgmt:go_default_library", "//go/sig/sigcmn:go_default_library", ], diff --git a/go/sig/egress/worker/worker.go b/go/sig/egress/worker/worker.go index ac910c230d..59cb00eb70 100644 --- a/go/sig/egress/worker/worker.go +++ b/go/sig/egress/worker/worker.go @@ -30,7 +30,7 @@ import ( "github.com/scionproto/scion/go/lib/util" "github.com/scionproto/scion/go/sig/egress/iface" "github.com/scionproto/scion/go/sig/egress/siginfo" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/mgmt" "github.com/scionproto/scion/go/sig/sigcmn" ) diff --git a/go/sig/ingress/BUILD.bazel b/go/sig/ingress/BUILD.bazel index 9c355db982..23a8885c84 100644 --- a/go/sig/ingress/BUILD.bazel +++ b/go/sig/ingress/BUILD.bazel @@ -20,7 +20,7 @@ go_library( "//go/lib/snet:go_default_library", "//go/lib/sock/reliable:go_default_library", "//go/lib/util:go_default_library", - "//go/sig/metrics:go_default_library", + "//go/sig/internal/metrics:go_default_library", "//go/sig/mgmt:go_default_library", "//go/sig/sigcmn:go_default_library", ], diff --git a/go/sig/ingress/dispatcher.go b/go/sig/ingress/dispatcher.go index a91ad20c06..cba7536396 100644 --- a/go/sig/ingress/dispatcher.go +++ b/go/sig/ingress/dispatcher.go @@ -26,7 +26,7 @@ import ( "github.com/scionproto/scion/go/lib/ringbuf" "github.com/scionproto/scion/go/lib/snet" "github.com/scionproto/scion/go/lib/sock/reliable" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/mgmt" "github.com/scionproto/scion/go/sig/sigcmn" ) diff --git a/go/sig/ingress/rlist.go b/go/sig/ingress/rlist.go index a744460c5d..a3760f6028 100644 --- a/go/sig/ingress/rlist.go +++ b/go/sig/ingress/rlist.go @@ -21,7 +21,7 @@ import ( "github.com/scionproto/scion/go/lib/common" "github.com/scionproto/scion/go/lib/log" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/sigcmn" ) diff --git a/go/sig/ingress/worker.go b/go/sig/ingress/worker.go index 36c8e162d4..9c5a1c5c14 100644 --- a/go/sig/ingress/worker.go +++ b/go/sig/ingress/worker.go @@ -24,7 +24,7 @@ import ( "github.com/scionproto/scion/go/lib/log" "github.com/scionproto/scion/go/lib/ringbuf" "github.com/scionproto/scion/go/lib/snet" - "github.com/scionproto/scion/go/sig/metrics" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/mgmt" ) diff --git a/go/sig/metrics/BUILD.bazel b/go/sig/internal/metrics/BUILD.bazel similarity index 84% rename from go/sig/metrics/BUILD.bazel rename to go/sig/internal/metrics/BUILD.bazel index 0fb204511e..a327772c63 100644 --- a/go/sig/metrics/BUILD.bazel +++ b/go/sig/internal/metrics/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["metrics.go"], - importpath = "github.com/scionproto/scion/go/sig/metrics", + importpath = "github.com/scionproto/scion/go/sig/internal/metrics", visibility = ["//visibility:public"], deps = [ "//go/lib/addr:go_default_library", diff --git a/go/sig/metrics/metrics.go b/go/sig/internal/metrics/metrics.go similarity index 100% rename from go/sig/metrics/metrics.go rename to go/sig/internal/metrics/metrics.go diff --git a/go/sig/main.go b/go/sig/main.go index 7b0d686ec0..b5b925df35 100644 --- a/go/sig/main.go +++ b/go/sig/main.go @@ -38,9 +38,9 @@ import ( "github.com/scionproto/scion/go/sig/egress" "github.com/scionproto/scion/go/sig/ingress" "github.com/scionproto/scion/go/sig/internal/disp" + "github.com/scionproto/scion/go/sig/internal/metrics" "github.com/scionproto/scion/go/sig/internal/sigconfig" "github.com/scionproto/scion/go/sig/internal/xnet" - "github.com/scionproto/scion/go/sig/metrics" "github.com/scionproto/scion/go/sig/sigcmn" )