diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2017-10-27 20:22:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-27 20:22:14 +0200 |
commit | f61980c5d253dbc00474374153f86674c98e0549 (patch) | |
tree | b79c8ecaf25fbbf007d4364d53b9a21bcdc0651b /service-monitor/src/main | |
parent | 86730de554af723ffd5e4d57b7e3e4d54cb61c0f (diff) |
Revert "Do not export service monitor internals"
Diffstat (limited to 'service-monitor/src/main')
9 files changed, 18 insertions, 75 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java index ea86de2b442..7a76c072076 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ConfigServerApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal; +package com.yahoo.vespa.service.monitor; import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceId; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ModelGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java index 961d5701901..9716846dea4 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ModelGenerator.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal; +package com.yahoo.vespa.service.monitor; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.HostInfo; @@ -19,8 +19,6 @@ import com.yahoo.vespa.applicationmodel.ServiceInstance; import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.applicationmodel.TenantId; -import com.yahoo.vespa.service.monitor.ServiceModel; -import com.yahoo.vespa.service.monitor.SlobrokMonitorManager; import java.util.HashMap; import java.util.HashSet; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java index 2432abcc2d4..46102a366d2 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java @@ -21,15 +21,15 @@ import java.util.stream.Collectors; public class ServiceModel { private final Map<ApplicationInstanceReference, ApplicationInstance> applications; - public ServiceModel(Map<ApplicationInstanceReference, ApplicationInstance> applications) { + ServiceModel(Map<ApplicationInstanceReference, ApplicationInstance> applications) { this.applications = Collections.unmodifiableMap(applications); } - public Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances() { + Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances() { return applications; } - public Optional<ApplicationInstance> getApplicationInstance(ApplicationInstanceReference reference) { + Optional<ApplicationInstance> getApplicationInstance(ApplicationInstanceReference reference) { return Optional.ofNullable(applications.get(reference)); } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitorImpl.java index 0470d37af85..5d2a9f296b4 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitorImpl.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal; +package com.yahoo.vespa.service.monitor; +import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.model.api.SuperModelProvider; import com.yahoo.config.provision.Zone; @@ -8,8 +9,8 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Timer; import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; -import com.yahoo.vespa.service.monitor.ServiceModel; -import com.yahoo.vespa.service.monitor.ServiceMonitor; +import com.yahoo.vespa.service.monitor.internal.ServiceModelCache; +import com.yahoo.vespa.service.monitor.internal.ServiceMonitorMetrics; import java.util.Collections; import java.util.List; @@ -24,6 +25,7 @@ public class ServiceMonitorImpl implements ServiceMonitor { private final List<String> configServerHosts; private final ServiceModelCache serviceModelCache; + @Inject public ServiceMonitorImpl(SuperModelProvider superModelProvider, ConfigserverConfig configserverConfig, SlobrokMonitorManagerImpl slobrokMonitorManager, diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitorProvider.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitorProvider.java deleted file mode 100644 index b1af48f885d..00000000000 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitorProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor; - -import com.google.inject.Inject; -import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.config.model.api.SuperModelProvider; -import com.yahoo.container.di.componentgraph.Provider; -import com.yahoo.jdisc.Metric; -import com.yahoo.jdisc.Timer; -import com.yahoo.vespa.service.monitor.internal.ServiceMonitorImpl; -import com.yahoo.vespa.service.monitor.internal.SlobrokMonitorManagerImpl; - -public class ServiceMonitorProvider implements Provider<ServiceMonitor> { - private final ServiceMonitorImpl serviceMonitor; - - @Inject - public ServiceMonitorProvider(SuperModelProvider superModelProvider, - ConfigserverConfig configserverConfig, - SlobrokMonitorManagerImpl slobrokMonitorManager, - Metric metric, - Timer timer) { - serviceMonitor = new ServiceMonitorImpl( - superModelProvider, - configserverConfig, - slobrokMonitorManager, - metric, - timer); - } - @Override - public ServiceMonitor get() { - return serviceMonitor; - } - - @Override - public void deconstruct() {} -} diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java index e0195e11759..4da7b7c0e68 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitor.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal; +package com.yahoo.vespa.service.monitor; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.HostInfo; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerImpl.java index f816111f2ee..becd7cf7ef6 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerImpl.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal; +package com.yahoo.vespa.service.monitor; +import com.google.inject.Inject; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.SuperModel; import com.yahoo.config.model.api.SuperModelListener; @@ -10,7 +11,6 @@ import com.yahoo.log.LogLevel; import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; -import com.yahoo.vespa.service.monitor.SlobrokMonitorManager; import java.util.HashMap; import java.util.List; @@ -27,8 +27,9 @@ public class SlobrokMonitorManagerImpl implements SuperModelListener, SlobrokMon private final Object monitor = new Object(); private final HashMap<ApplicationId, SlobrokMonitor> slobrokMonitors = new HashMap<>(); + @Inject public SlobrokMonitorManagerImpl() { - this(SlobrokMonitor::new); + this(() -> new SlobrokMonitor()); } SlobrokMonitorManagerImpl(Supplier<SlobrokMonitor> slobrokMonitorFactory) { diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerProvider.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerProvider.java deleted file mode 100644 index ca523ca5fdf..00000000000 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor; - -import com.google.inject.Inject; -import com.yahoo.container.di.componentgraph.Provider; -import com.yahoo.vespa.service.monitor.internal.SlobrokMonitorManagerImpl; - -public class SlobrokMonitorManagerProvider implements Provider<SlobrokMonitorManager> { - private final SlobrokMonitorManager slobrokMonitorManager; - - @Inject - public SlobrokMonitorManagerProvider() { - slobrokMonitorManager = new SlobrokMonitorManagerImpl(); - } - - @Override - public SlobrokMonitorManager get() { - return slobrokMonitorManager; - } - - @Override - public void deconstruct() {} -} diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SuperModelListenerImpl.java index b44d73125bd..506a2f7d649 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SuperModelListenerImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SuperModelListenerImpl.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.monitor.internal; +package com.yahoo.vespa.service.monitor; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.SuperModel; @@ -7,7 +7,8 @@ import com.yahoo.config.model.api.SuperModelListener; import com.yahoo.config.model.api.SuperModelProvider; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.service.monitor.ServiceModel; +import com.yahoo.vespa.service.monitor.internal.LatencyMeasurement; +import com.yahoo.vespa.service.monitor.internal.ServiceMonitorMetrics; import java.util.List; import java.util.function.Supplier; |