add remaining filters as beans

Signed-off-by: Jordan Hasgul <[email protected]>
transferwise · Aug 8, 2024 · a6467e2 · a6467e2
1 parent 47d0160
commit a6467e2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/...arter/src/main/java/com/transferwise/common/entrypoints/EntryPointsAutoConfiguration.java b/...arter/src/main/java/com/transferwise/common/entrypoints/EntryPointsAutoConfiguration.java
@@ -5,9 +5,11 @@
 import com.transferwise.common.baseutils.meters.cache.IMeterCache;
 import com.transferwise.common.baseutils.meters.cache.MeterCache;
 import com.transferwise.common.context.TwContext;
+import com.transferwise.common.entrypoints.databaseaccessstatistics.DasMeterFilter;
 import com.transferwise.common.entrypoints.databaseaccessstatistics.DasUnknownCallsCollector;
 import com.transferwise.common.entrypoints.databaseaccessstatistics.DatabaseAccessStatisticsBeanPostProcessor;
 import com.transferwise.common.entrypoints.databaseaccessstatistics.DatabaseAccessStatisticsEntryPointInterceptor;
+import com.transferwise.common.entrypoints.executionstatistics.EsMeterFilter;
 import com.transferwise.common.entrypoints.executionstatistics.ExecutionStatisticsEntryPointInterceptor;
 import com.transferwise.common.entrypoints.tableaccessstatistics.DefaultTasParsedQueryRegistry;
 import com.transferwise.common.entrypoints.tableaccessstatistics.DefaultTasQueryParsingInterceptor;
@@ -59,20 +61,27 @@ public DatabaseAccessStatisticsEntryPointInterceptor twEntryPointsDatabaseAccess
   @Bean
   @ConditionalOnProperty(name = "tw-entrypoints.das.enabled", havingValue = "true", matchIfMissing = true)
   @ConditionalOnMissingBean
-  public static DatabaseAccessStatisticsBeanPostProcessor twEntryPointsDatabaseAccessStatisticsBeanPostProcessor() {
+  public DatabaseAccessStatisticsBeanPostProcessor twEntryPointsDatabaseAccessStatisticsBeanPostProcessor() {
     return new DatabaseAccessStatisticsBeanPostProcessor();
   }
 
+
+  @Bean
+  @ConditionalOnProperty(name = "tw-entrypoints.das.enabled", havingValue = "true", matchIfMissing = true)
+  public MeterFilter twEntryPointsDatabaseAccessStatisticsMeterFilter() {
+    return new DasMeterFilter();
+  }
+
   @Bean
   @ConditionalOnProperty(name = "tw-entrypoints.tas.enabled", havingValue = "true", matchIfMissing = true)
   @ConditionalOnMissingBean
-  public static TableAccessStatisticsBeanPostProcessor twEntryPointsTableAccessStatisticsBeanPostProcessor(BeanFactory beanFactory) {
+  public TableAccessStatisticsBeanPostProcessor twEntryPointsTableAccessStatisticsBeanPostProcessor(BeanFactory beanFactory) {
     return new TableAccessStatisticsBeanPostProcessor(beanFactory);
   }
 
   @Bean
   @ConditionalOnProperty(name = "tw-entrypoints.tas.enabled", havingValue = "true", matchIfMissing = true)
-  public static MeterFilter twEntryPointsTableAccessStatisticsMeterFilter() {
+  public MeterFilter twEntryPointsTableAccessStatisticsMeterFilter() {
     return new TasMeterFilter();
   }
 
@@ -115,13 +124,13 @@ public TasFlywayConfigurationCustomizer tasFlywayConfigurationCustomizer() {
   @Bean
   @ConditionalOnProperty(name = "tw-entrypoints.ts.enabled", havingValue = "true", matchIfMissing = true)
   @ConditionalOnMissingBean
-  public static TransactionStatisticsBeanPostProcessor twEntryPointsTransactionStatisticsBeanPostProcessor(BeanFactory beanFactory) {
+  public TransactionStatisticsBeanPostProcessor twEntryPointsTransactionStatisticsBeanPostProcessor(BeanFactory beanFactory) {
     return new TransactionStatisticsBeanPostProcessor(beanFactory);
   }
 
   @Bean
   @ConditionalOnProperty(name = "tw-entrypoints.ts.enabled", havingValue = "true", matchIfMissing = true)
-  public static MeterFilter twEntryPointsTransactionStatisticsMetricsFilter() {
+  public MeterFilter twEntryPointsTransactionStatisticsMetricsFilter() {
     return new TsMeterFilter();
   }
 
@@ -134,6 +143,13 @@ public ExecutionStatisticsEntryPointInterceptor twEntryPointsExecutionStatistics
     return interceptor;
   }
 
+  @Bean
+  @ConditionalOnProperty(name = "tw-entrypoints.es.enabled", havingValue = "true", matchIfMissing = true)
+  public MeterFilter twEntryPointsExecutionStatisticsMetricsFilter() {
+    return new EsMeterFilter();
+  }
+
+
   @Bean
   @ConditionalOnMissingBean(IExecutorServicesProvider.class)
   public DefaultExecutorServicesProvider twDefaultExecutorServicesProvider() {

diff --git a/...n/entrypoints/databaseaccessstatistics/DatabaseAccessStatisticsEntryPointInterceptor.java b/...n/entrypoints/databaseaccessstatistics/DatabaseAccessStatisticsEntryPointInterceptor.java
@@ -35,7 +35,6 @@ public class DatabaseAccessStatisticsEntryPointInterceptor implements TwContextE
 
   public DatabaseAccessStatisticsEntryPointInterceptor(IMeterCache meterCache) {
     this.meterCache = meterCache;
-    meterCache.getMeterRegistry().config().meterFilter(new DasMeterFilter());
   }
 
   @Override

diff --git a/...wise/common/entrypoints/executionstatistics/ExecutionStatisticsEntryPointInterceptor.java b/...wise/common/entrypoints/executionstatistics/ExecutionStatisticsEntryPointInterceptor.java
@@ -18,7 +18,6 @@ public class ExecutionStatisticsEntryPointInterceptor implements TwContextExecut
 
   public ExecutionStatisticsEntryPointInterceptor(IMeterCache meterCache) {
     this.meterCache = meterCache;
-    meterCache.getMeterRegistry().config().meterFilter(new EsMeterFilter());
   }
 
   @Override