Skip to content

Commit 7dfb225

Browse files
committed
Merge remote valkeydependency branch and resolve conflicts
Resolved conflicts in: - docs/valkey-configuration.md: Kept local comprehensive documentation - HaGatewayProviderModule.java: Merged both changes - kept cluster stats observers and monitor configuration providers along with Valkey providers
2 parents b132c33 + db5df0c commit 7dfb225

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

gateway-ha/src/main/java/io/trino/gateway/ha/module/HaGatewayProviderModule.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
package io.trino.gateway.ha.module;
1515

16+
import com.google.common.collect.ImmutableList;
1617
import com.google.inject.AbstractModule;
1718
import com.google.inject.Provides;
1819
import com.google.inject.Scopes;
@@ -37,6 +38,7 @@
3738
import io.trino.gateway.ha.config.DataStoreConfiguration;
3839
import io.trino.gateway.ha.config.GatewayCookieConfigurationPropertiesProvider;
3940
import io.trino.gateway.ha.config.HaGatewayConfiguration;
41+
import io.trino.gateway.ha.config.MonitorConfiguration;
4042
import io.trino.gateway.ha.config.OAuth2GatewayCookieConfigurationPropertiesProvider;
4143
import io.trino.gateway.ha.config.RoutingRulesConfiguration;
4244
import io.trino.gateway.ha.config.RulesExternalConfiguration;
@@ -54,6 +56,7 @@
5456
import io.trino.gateway.ha.router.QueryHistoryManager;
5557
import io.trino.gateway.ha.router.ResourceGroupsManager;
5658
import io.trino.gateway.ha.router.RoutingGroupSelector;
59+
import io.trino.gateway.ha.router.RoutingManager;
5760
import io.trino.gateway.ha.router.ValkeyDistributedCache;
5861
import io.trino.gateway.ha.security.AuthorizationManager;
5962
import io.trino.gateway.ha.security.LbAuthorizer;
@@ -68,6 +71,8 @@
6871
import org.jdbi.v3.core.Jdbi;
6972
import org.jdbi.v3.sqlobject.SqlObjectPlugin;
7073

74+
import java.util.List;
75+
7176
import static com.google.inject.multibindings.Multibinder.newSetBinder;
7277
import static io.airlift.jaxrs.JaxrsBinder.jaxrsBinder;
7378
import static io.trino.gateway.ha.config.ClusterStatsMonitorType.INFO_API;
@@ -202,6 +207,25 @@ public static ClusterStatsMonitor getClusterStatsMonitor(@ForMonitor HttpClient
202207
};
203208
}
204209

210+
@Provides
211+
@Singleton
212+
public List<TrinoClusterStatsObserver> getClusterStatsObservers(
213+
RoutingManager mgr,
214+
BackendStateManager backendStateManager)
215+
{
216+
return ImmutableList.<TrinoClusterStatsObserver>builder()
217+
.add(new HealthCheckObserver(mgr))
218+
.add(new ClusterStatsObserver(backendStateManager))
219+
.build();
220+
}
221+
222+
@Provides
223+
@Singleton
224+
public MonitorConfiguration getMonitorConfiguration()
225+
{
226+
return configuration.getMonitor();
227+
}
228+
205229
@Provides
206230
@Singleton
207231
public ValkeyConfiguration getValkeyConfiguration()

0 commit comments

Comments
 (0)