diff options
author | gjoranv <gv@yahooinc.com> | 2023-05-08 12:44:34 +0200 |
---|---|---|
committer | gjoranv <gv@yahooinc.com> | 2023-05-08 12:44:34 +0200 |
commit | be2ad5ff2b54bb8fdf145682005052fe26e1547d (patch) | |
tree | e86933d7cc037d11fdfedc3fb5a325f4d99357f1 | |
parent | 0c97250ee7c1bab4d3af448c8fea5e5ccdb9638a (diff) |
Move metrics definitions to metrics:ai.vespa.metrics
44 files changed, 115 insertions, 112 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index a8b836d5846..7f7624b1b2f 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -134,9 +134,10 @@ <include>com.yahoo.vespa:jdisc_core:*:provided</include> <include>com.yahoo.vespa:jrt:*:provided</include> <include>com.yahoo.vespa:linguistics:*:provided</include> - <include>com.yahoo.vespa:opennlp-linguistics:*:provided</include> <include>com.yahoo.vespa:messagebus:*:provided</include> + <include>com.yahoo.vespa:metrics:*:provided</include> <include>com.yahoo.vespa:model-evaluation:*:provided</include> + <include>com.yahoo.vespa:opennlp-linguistics:*:provided</include> <include>com.yahoo.vespa:predicate-search-core:*:provided</include> <include>com.yahoo.vespa:provided-dependencies:*:provided</include> <include>com.yahoo.vespa:searchcore:*:provided</include> @@ -162,7 +163,6 @@ <include>com.yahoo.vespa:indexinglanguage:*:test</include> <include>com.yahoo.vespa:logd:*:test</include> <include>com.yahoo.vespa:metrics-proxy:*:test</include> - <include>com.yahoo.vespa:metrics:*:test</include> <include>com.yahoo.vespa:model-integration:*:test</include> <include>com.yahoo.vespa:searchsummary:*:test</include> <include>com.yahoo.vespa:standalone-container:*:test</include> diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java index 8bb6be16e4a..685ca377e70 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java @@ -1,9 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import com.yahoo.metrics.ContainerMetrics; -import com.yahoo.metrics.SearchNodeMetrics; -import com.yahoo.metrics.StorageMetrics; -import com.yahoo.metrics.HostedNodeAdminMetrics; + +import ai.vespa.metrics.ContainerMetrics; +import ai.vespa.metrics.HostedNodeAdminMetrics; +import ai.vespa.metrics.SearchNodeMetrics; +import ai.vespa.metrics.StorageMetrics; + import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java index 1977a584713..8652acbd546 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java @@ -2,22 +2,22 @@ package com.yahoo.vespa.model.admin.monitoring; -import com.yahoo.metrics.ContainerMetrics; -import com.yahoo.metrics.SearchNodeMetrics; -import com.yahoo.metrics.Suffix; -import com.yahoo.metrics.VespaMetrics; +import ai.vespa.metrics.ContainerMetrics; +import ai.vespa.metrics.SearchNodeMetrics; +import ai.vespa.metrics.Suffix; +import ai.vespa.metrics.VespaMetrics; import java.util.Collections; import java.util.EnumSet; import java.util.LinkedHashSet; import java.util.Set; -import static com.yahoo.metrics.Suffix.average; -import static com.yahoo.metrics.Suffix.count; -import static com.yahoo.metrics.Suffix.max; -import static com.yahoo.metrics.Suffix.ninety_five_percentile; -import static com.yahoo.metrics.Suffix.ninety_nine_percentile; -import static com.yahoo.metrics.Suffix.sum; +import static ai.vespa.metrics.Suffix.average; +import static ai.vespa.metrics.Suffix.count; +import static ai.vespa.metrics.Suffix.max; +import static ai.vespa.metrics.Suffix.ninety_five_percentile; +import static ai.vespa.metrics.Suffix.ninety_nine_percentile; +import static ai.vespa.metrics.Suffix.sum; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java index d4c3f908eeb..ac03fcf56cb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java @@ -1,9 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import com.yahoo.metrics.ContainerMetrics; -import com.yahoo.metrics.SearchNodeMetrics; - +import ai.vespa.metrics.ContainerMetrics; +import ai.vespa.metrics.SearchNodeMetrics; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java index 839dcad64ee..21e7d35fc7c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java @@ -1,8 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import com.yahoo.metrics.HostedNodeAdminMetrics; - +import ai.vespa.metrics.HostedNodeAdminMetrics; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java index eee6be9af93..64f2a72d1b4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java @@ -1,8 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import com.yahoo.metrics.HostedNodeAdminMetrics; - +import ai.vespa.metrics.HostedNodeAdminMetrics; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index f933325b8ae..362bc7b0964 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -1,34 +1,34 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import com.yahoo.metrics.ClusterControllerMetrics; -import com.yahoo.metrics.ConfigServerMetrics; -import com.yahoo.metrics.ContainerMetrics; -import com.yahoo.metrics.DistributorMetrics; -import com.yahoo.metrics.LogdMetrics; -import com.yahoo.metrics.NodeAdminMetrics; -import com.yahoo.metrics.RoutingLayerMetrics; -import com.yahoo.metrics.SearchNodeMetrics; -import com.yahoo.metrics.SentinelMetrics; -import com.yahoo.metrics.SlobrokMetrics; -import com.yahoo.metrics.StorageMetrics; -import com.yahoo.metrics.Suffix; -import com.yahoo.metrics.VespaMetrics; +import ai.vespa.metrics.ClusterControllerMetrics; +import ai.vespa.metrics.ConfigServerMetrics; +import ai.vespa.metrics.ContainerMetrics; +import ai.vespa.metrics.DistributorMetrics; +import ai.vespa.metrics.LogdMetrics; +import ai.vespa.metrics.NodeAdminMetrics; +import ai.vespa.metrics.RoutingLayerMetrics; +import ai.vespa.metrics.SearchNodeMetrics; +import ai.vespa.metrics.SentinelMetrics; +import ai.vespa.metrics.SlobrokMetrics; +import ai.vespa.metrics.StorageMetrics; +import ai.vespa.metrics.Suffix; +import ai.vespa.metrics.VespaMetrics; import java.util.Collections; import java.util.EnumSet; import java.util.LinkedHashSet; import java.util.Set; -import static com.yahoo.metrics.Suffix.average; -import static com.yahoo.metrics.Suffix.count; -import static com.yahoo.metrics.Suffix.last; -import static com.yahoo.metrics.Suffix.max; -import static com.yahoo.metrics.Suffix.min; -import static com.yahoo.metrics.Suffix.ninety_five_percentile; -import static com.yahoo.metrics.Suffix.ninety_nine_percentile; -import static com.yahoo.metrics.Suffix.rate; -import static com.yahoo.metrics.Suffix.sum; +import static ai.vespa.metrics.Suffix.average; +import static ai.vespa.metrics.Suffix.count; +import static ai.vespa.metrics.Suffix.last; +import static ai.vespa.metrics.Suffix.max; +import static ai.vespa.metrics.Suffix.min; +import static ai.vespa.metrics.Suffix.ninety_five_percentile; +import static ai.vespa.metrics.Suffix.ninety_nine_percentile; +import static ai.vespa.metrics.Suffix.rate; +import static ai.vespa.metrics.Suffix.sum; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; import static java.util.Collections.singleton; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java index 7920bbed763..938f0908abc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java @@ -1,10 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.metrics; +import ai.vespa.metrics.ClusterControllerMetrics; import ai.vespa.util.http.hc5.VespaHttpClientBuilder; import com.yahoo.concurrent.DaemonThreadFactory; -import com.yahoo.metrics.ClusterControllerMetrics; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; diff --git a/container-core/pom.xml b/container-core/pom.xml index 2b1d2253534..5fed4f02912 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -85,6 +85,11 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>metrics</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>opennlp-linguistics</artifactId> <version>${project.version}</version> <exclusions> diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java index b9a6d8d9462..f0db9c35f12 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.annotation.Inject; import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.core.VipStatusConfig; import com.yahoo.container.jdisc.state.StateMonitor; import com.yahoo.jdisc.Metric; -import com.yahoo.metrics.ContainerMetrics; import java.util.Map; import java.util.stream.Collectors; diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java index ed2d044c38c..e3b3b37414e 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java @@ -1,6 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; +import ai.vespa.metrics.ContainerMetrics; +import com.yahoo.component.annotation.Inject; +import com.yahoo.container.core.VipStatusConfig; +import com.yahoo.container.jdisc.HttpRequest; +import com.yahoo.container.jdisc.HttpResponse; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; +import com.yahoo.jdisc.Metric; +import com.yahoo.text.Utf8; +import com.yahoo.vespa.defaults.Defaults; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -10,19 +20,6 @@ import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; - -import com.yahoo.component.annotation.Inject; -import com.yahoo.container.core.VipStatusConfig; -import com.yahoo.container.jdisc.HttpRequest; -import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; -import com.yahoo.jdisc.Metric; -import java.util.logging.Level; - -import com.yahoo.metrics.ContainerMetrics; -import com.yahoo.text.Utf8; -import com.yahoo.vespa.defaults.Defaults; /** * Transmit status to VIP from file or memory. Bind this to diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ThreadPoolMetric.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ThreadPoolMetric.java index 15b29ad0e6a..24bc7ebc2d0 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ThreadPoolMetric.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ThreadPoolMetric.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler.threadpool; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.jdisc.Metric; -import com.yahoo.metrics.ContainerMetrics; import java.util.Map; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index 2d51ffd11e6..17a2c99a760 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.annotation.Inject; import com.yahoo.container.logging.AccessLogEntry; import com.yahoo.jdisc.Metric; @@ -11,7 +12,6 @@ import com.yahoo.jdisc.handler.ContentChannel; import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.handler.UnsafeContentInputStream; import com.yahoo.jdisc.http.server.jetty.AccessLoggingRequestHandler; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.yolean.Exceptions; import java.io.IOException; diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java index a4eaab2e8f8..327640cb7ed 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.server.jetty; -import com.yahoo.metrics.ContainerMetrics; +import ai.vespa.metrics.ContainerMetrics; /** * Name and dimensions for jdisc/container metrics diff --git a/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java index 606f8052670..4e4456da57e 100644 --- a/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java +++ b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler.threadpool; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.collections.Tuple2; import com.yahoo.concurrent.Receiver; import com.yahoo.container.protect.ProcessTerminator; import com.yahoo.container.test.MetricMock; import com.yahoo.jdisc.Metric; -import com.yahoo.metrics.ContainerMetrics; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index f3f1374762d..570f868c669 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -63,11 +63,11 @@ import java.util.concurrent.Phaser; import java.util.logging.Level; import java.util.logging.Logger; +import static ai.vespa.metrics.ContainerMetrics.APPLICATION_GENERATION; +import static ai.vespa.metrics.ContainerMetrics.JDISC_APPLICATION_COMPONENT_GRAPH_CREATION_TIME_MILLIS; +import static ai.vespa.metrics.ContainerMetrics.JDISC_APPLICATION_COMPONENT_GRAPH_RECONFIGURATIONS; +import static ai.vespa.metrics.ContainerMetrics.JDISC_APPLICATION_FAILED_COMPONENT_GRAPHS; import static com.yahoo.collections.CollectionUtil.first; -import static com.yahoo.metrics.ContainerMetrics.APPLICATION_GENERATION; -import static com.yahoo.metrics.ContainerMetrics.JDISC_APPLICATION_COMPONENT_GRAPH_CREATION_TIME_MILLIS; -import static com.yahoo.metrics.ContainerMetrics.JDISC_APPLICATION_COMPONENT_GRAPH_RECONFIGURATIONS; -import static com.yahoo.metrics.ContainerMetrics.JDISC_APPLICATION_FAILED_COMPONENT_GRAPHS; /** * @author Tony Vaagenes diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java index 06f61d18d10..43fd7960526 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc.metric; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.jdisc.Metric; -import com.yahoo.metrics.ContainerMetrics; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java index 24bb862cad5..c1b95cce654 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java @@ -2,9 +2,10 @@ package com.yahoo.container.jdisc.metric; // import com.yahoo.jdisc.Container; + +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.jdisc.Metric; import com.yahoo.jrt.TransportMetrics; -import com.yahoo.metrics.ContainerMetrics; import static com.yahoo.jrt.TransportMetrics.Snapshot; diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index 43925367c1d..3e6ee3a35a2 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc.metric; -import com.yahoo.component.annotation.Inject; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.AbstractComponent; +import com.yahoo.component.annotation.Inject; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.statistics.ContainerWatchdogMetrics; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.nativec.NativeHeap; import com.yahoo.security.tls.TlsMetrics; diff --git a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java index de24196327e..04857e982a9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.statistics; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.chain.dependencies.Before; import com.yahoo.concurrent.CopyOnWriteHashMap; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.jdisc.Metric; import com.yahoo.metrics.simple.MetricReceiver; import com.yahoo.metrics.simple.MetricSettings; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.processing.request.CompoundName; import com.yahoo.search.Query; import com.yahoo.search.Result; diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index 3b4d15f788f..6a0015f9d3a 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -2,6 +2,7 @@ package com.yahoo.search.handler; import ai.vespa.cloud.ZoneInfo; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.collections.Tuple2; import com.yahoo.component.ComponentSpecification; import com.yahoo.component.Vtag; @@ -21,7 +22,6 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Request; import com.yahoo.language.process.Embedder; import com.yahoo.language.provider.DefaultEmbedderProvider; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.net.HostName; import com.yahoo.net.UriTools; import com.yahoo.prelude.query.parser.ParseException; diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java index 8fafa0fd059..3840de63e13 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Call.java +++ b/docproc/src/main/java/com/yahoo/docproc/Call.java @@ -1,7 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.ComponentId; +import com.yahoo.concurrent.SystemTimer; import com.yahoo.docproc.impl.DocumentOperationWrapper; import com.yahoo.docproc.jdisc.metric.NullMetric; import com.yahoo.docproc.proxy.ProxyDocument; @@ -11,8 +13,6 @@ import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentUpdate; import com.yahoo.jdisc.Metric; -import com.yahoo.concurrent.SystemTimer; -import com.yahoo.metrics.ContainerMetrics; import java.util.List; import java.util.Map; diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java index 2eee55e4102..356055f37be 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.filter.security.athenz; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.annotation.Inject; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.http.HttpRequest; import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.jdisc.http.filter.security.athenz.RequestResourceMapper.ResourceNameAndAction; import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.vespa.athenz.api.AthenzAccessToken; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzPrincipal; diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java index f1366ceea72..7ff69ad4ec6 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.filter.security.rule; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.component.annotation.Inject; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase; -import com.yahoo.metrics.ContainerMetrics; +import com.yahoo.restapi.Path; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig.Rule.Action; -import com.yahoo.restapi.Path; import java.net.URI; import java.util.List; diff --git a/metrics/pom.xml b/metrics/pom.xml index f44a2569ace..e8303e5a01f 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -15,6 +15,12 @@ <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>config-lib</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/container-core/src/main/java/com/yahoo/metrics/ClusterControllerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ClusterControllerMetrics.java index fabfd5504f7..545de543663 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ClusterControllerMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/ClusterControllerMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngve diff --git a/container-core/src/main/java/com/yahoo/metrics/ConfigServerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java index e501fa5e832..dba75c08aae 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ConfigServerMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/ConfigServerMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ContainerMetrics.java index 11241e1558d..84de1878b3f 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/ContainerMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author gjoranv diff --git a/container-core/src/main/java/com/yahoo/metrics/DistributorMetrics.java b/metrics/src/main/java/ai/vespa/metrics/DistributorMetrics.java index 82e9aff74a8..b2ebbc4d6aa 100644 --- a/container-core/src/main/java/com/yahoo/metrics/DistributorMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/DistributorMetrics.java @@ -1,6 +1,4 @@ -package com.yahoo.metrics; - -import java.util.List; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java b/metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java index 1dc58090c69..927672a43f7 100644 --- a/container-core/src/main/java/com/yahoo/metrics/HostedNodeAdminMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/LogdMetrics.java b/metrics/src/main/java/ai/vespa/metrics/LogdMetrics.java index 3dae4283b9f..79122e3b922 100644 --- a/container-core/src/main/java/com/yahoo/metrics/LogdMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/LogdMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/NodeAdminMetrics.java b/metrics/src/main/java/ai/vespa/metrics/NodeAdminMetrics.java index 004a226f825..74da68dbcb7 100644 --- a/container-core/src/main/java/com/yahoo/metrics/NodeAdminMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/NodeAdminMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/RoutingLayerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/RoutingLayerMetrics.java index 773afae00ba..cf35cdae90e 100644 --- a/container-core/src/main/java/com/yahoo/metrics/RoutingLayerMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/RoutingLayerMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/SearchNodeMetrics.java b/metrics/src/main/java/ai/vespa/metrics/SearchNodeMetrics.java index b36abbdf211..d6018dc0633 100644 --- a/container-core/src/main/java/com/yahoo/metrics/SearchNodeMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/SearchNodeMetrics.java @@ -1,6 +1,4 @@ -package com.yahoo.metrics; - -import java.util.List; +package ai.vespa.metrics; /** * @author gjoranv diff --git a/container-core/src/main/java/com/yahoo/metrics/SentinelMetrics.java b/metrics/src/main/java/ai/vespa/metrics/SentinelMetrics.java index 7711b7e75f4..35ecbae85d8 100644 --- a/container-core/src/main/java/com/yahoo/metrics/SentinelMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/SentinelMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngve diff --git a/container-core/src/main/java/com/yahoo/metrics/SlobrokMetrics.java b/metrics/src/main/java/ai/vespa/metrics/SlobrokMetrics.java index 8c30bf8e414..1a6735af860 100644 --- a/container-core/src/main/java/com/yahoo/metrics/SlobrokMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/SlobrokMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author yngve diff --git a/container-core/src/main/java/com/yahoo/metrics/StorageMetrics.java b/metrics/src/main/java/ai/vespa/metrics/StorageMetrics.java index 05ae5180d3b..7071fe0ae77 100644 --- a/container-core/src/main/java/com/yahoo/metrics/StorageMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/StorageMetrics.java @@ -1,7 +1,4 @@ -package com.yahoo.metrics; - -import java.util.EnumSet; -import java.util.List; +package ai.vespa.metrics; /** * @author yngveaasheim diff --git a/container-core/src/main/java/com/yahoo/metrics/Suffix.java b/metrics/src/main/java/ai/vespa/metrics/Suffix.java index b9ef3a5ce11..ce5e0aaa602 100644 --- a/container-core/src/main/java/com/yahoo/metrics/Suffix.java +++ b/metrics/src/main/java/ai/vespa/metrics/Suffix.java @@ -1,6 +1,4 @@ -package com.yahoo.metrics; - -import java.util.EnumSet; +package ai.vespa.metrics; public enum Suffix { ninety_five_percentile("95percentile"), diff --git a/container-core/src/main/java/com/yahoo/metrics/Unit.java b/metrics/src/main/java/ai/vespa/metrics/Unit.java index 53c231a2e5e..a2123d72246 100644 --- a/container-core/src/main/java/com/yahoo/metrics/Unit.java +++ b/metrics/src/main/java/ai/vespa/metrics/Unit.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author gjoranv diff --git a/container-core/src/main/java/com/yahoo/metrics/VespaMetrics.java b/metrics/src/main/java/ai/vespa/metrics/VespaMetrics.java index c9d1f058619..3a17d8a3155 100644 --- a/container-core/src/main/java/com/yahoo/metrics/VespaMetrics.java +++ b/metrics/src/main/java/ai/vespa/metrics/VespaMetrics.java @@ -1,4 +1,4 @@ -package com.yahoo.metrics; +package ai.vespa.metrics; /** * @author gjoranv diff --git a/metrics/src/main/java/ai/vespa/metrics/package-info.java b/metrics/src/main/java/ai/vespa/metrics/package-info.java new file mode 100644 index 00000000000..98986f61dc5 --- /dev/null +++ b/metrics/src/main/java/ai/vespa/metrics/package-info.java @@ -0,0 +1,5 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package ai.vespa.metrics; + +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java index fa9cfff0d68..92ec88ed9f4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.autoscale; +import ai.vespa.metrics.ContainerMetrics; +import ai.vespa.metrics.HostedNodeAdminMetrics; +import ai.vespa.metrics.SearchNodeMetrics; +import ai.vespa.metrics.StorageMetrics; import com.yahoo.collections.ListMap; import com.yahoo.collections.Pair; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.metrics.ContainerMetrics; -import com.yahoo.metrics.HostedNodeAdminMetrics; -import com.yahoo.metrics.SearchNodeMetrics; -import com.yahoo.metrics.StorageMetrics; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Inspector; import com.yahoo.slime.ObjectTraverser; @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static com.yahoo.metrics.ContainerMetrics.APPLICATION_GENERATION; -import static com.yahoo.metrics.ContainerMetrics.IN_SERVICE; +import static ai.vespa.metrics.ContainerMetrics.APPLICATION_GENERATION; +import static ai.vespa.metrics.ContainerMetrics.IN_SERVICE; /** * A response containing metrics for a collection of nodes. diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java index 77aaf17419d..2f8ef8cbcc0 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.athenz.identityprovider.client; +import ai.vespa.metrics.ContainerMetrics; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -10,7 +11,6 @@ import com.yahoo.container.core.identity.IdentityConfig; import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider; import com.yahoo.container.jdisc.athenz.AthenzIdentityProviderException; import com.yahoo.jdisc.Metric; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.security.AutoReloadingX509KeyManager; import com.yahoo.security.KeyStoreBuilder; import com.yahoo.security.KeyUtils; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/LegacyAthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/LegacyAthenzIdentityProviderImpl.java index d699564a4ee..a9223c5477f 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/LegacyAthenzIdentityProviderImpl.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/LegacyAthenzIdentityProviderImpl.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.athenz.identityprovider.client; +import ai.vespa.metrics.ContainerMetrics; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -10,7 +11,6 @@ import com.yahoo.container.core.identity.IdentityConfig; import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider; import com.yahoo.container.jdisc.athenz.AthenzIdentityProviderException; import com.yahoo.jdisc.Metric; -import com.yahoo.metrics.ContainerMetrics; import com.yahoo.security.KeyStoreBuilder; import com.yahoo.security.MutableX509KeyManager; import com.yahoo.security.Pkcs10Csr; |