You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by co...@apache.org on 2024/11/26 04:31:20 UTC
(polaris) 03/03: fix TimedApplicationEventListener.class
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit dae53cd4ceae38d7fd86c992d7c9f40ae68cde10
Author: Michael Collado <co...@gmail.com>
AuthorDate: Mon Nov 25 20:30:26 2024 -0800
fix TimedApplicationEventListener.class
---
.../apache/polaris/service/PolarisApplication.java | 34 ++++++++++++----------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
index 595565db..3ea2d91e 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
@@ -216,6 +216,8 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
@Override
public void run(PolarisApplicationConfig configuration, Environment environment) {
OpenTelemetry openTelemetry = setupTracing();
+ PolarisMetricRegistry polarisMetricRegistry =
+ new PolarisMetricRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT));
environment
.jersey()
.register(
@@ -256,9 +258,16 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
},
configuration.getGcpCredentialsProvider()))
.to(PolarisStorageIntegrationProvider.class);
- bind(new PolarisMetricRegistry(
- new PrometheusMeterRegistry(PrometheusConfig.DEFAULT)))
- .to(PolarisMetricRegistry.class);
+ bind(polarisMetricRegistry).to(PolarisMetricRegistry.class);
+ polarisMetricRegistry.init(
+ IcebergRestCatalogApi.class,
+ IcebergRestConfigurationApi.class,
+ IcebergRestOAuth2Api.class,
+ PolarisCatalogsApi.class,
+ PolarisPrincipalsApi.class,
+ PolarisPrincipalRolesApi.class);
+ bind((PrometheusMeterRegistry) polarisMetricRegistry.getMeterRegistry())
+ .to(PrometheusMeterRegistry.class);
bind(openTelemetry).to(OpenTelemetry.class);
bindAsContract(RealmEntityManagerFactory.class).in(RealmScope.class);
bind(PolarisCallContextCatalogFactory.class)
@@ -358,17 +367,6 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
CrossOriginFilter.ALLOW_CREDENTIALS_PARAM,
configuration.getCorsConfiguration().getAllowCredentials());
corsRegistration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
- // environment
- // .servlets()
- // .addFilter("tracing", TracingFilter.class)
- // .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
- //
- // if (configuration.getRateLimiter() != null) {
- // environment
- // .servlets()
- // .addFilter("ratelimiter", RateLimiterFilter.class)
- // .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
- // }
environment
.servlets()
@@ -415,11 +413,15 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
Serializers.registerSerializers(objectMapper);
environment.jersey().register(IcebergJsonProcessingExceptionMapper.class);
environment.jersey().register(IcebergJerseyViolationExceptionMapper.class);
- environment.jersey().register(TimedApplicationEventListener.class);
+ environment.jersey().register(new TimedApplicationEventListener(polarisMetricRegistry));
environment
.admin()
- .addServlet("metrics", PrometheusMetricsServlet.class)
+ .addServlet(
+ "metrics",
+ new PrometheusMetricsServlet(
+ ((PrometheusMeterRegistry) polarisMetricRegistry.getMeterRegistry())
+ .getPrometheusRegistry()))
.addMapping("/metrics");
// For in-memory metastore we need to bootstrap Service and Service principal at startup (for