Change field and method name

grafana · Aug 22, 2023 · 13bf83f · 13bf83f
1 parent fce9503
commit 13bf83f
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 32 deletions.
diff --git a/src/main/java/ai/asserts/aws/TaskExecutorUtil.java b/src/main/java/ai/asserts/aws/TaskExecutorUtil.java
@@ -22,24 +22,24 @@ public class TaskExecutorUtil {
     private final TaskThreadPool taskThreadPool;
 
     private final AWSApiCallRateLimiter rateLimiter;
-    private static final ThreadLocal<AWSAccount> tenantName = new ThreadLocal<>();
+    private static final ThreadLocal<AWSAccount> accountDetails = new ThreadLocal<>();
 
 
     public TaskExecutorUtil(@Qualifier("aws-api-calls-thread-pool") TaskThreadPool taskThreadPool, AWSApiCallRateLimiter rateLimiter) {
         this.taskThreadPool = taskThreadPool;
         this.rateLimiter = rateLimiter;
     }
 
-    public <T> Future<T> executeTenantTask(AWSAccount tenant, TenantTask<T> task) {
+    public <T> Future<T> executeAccountTask(AWSAccount accountDetails, TenantTask<T> task) {
         return taskThreadPool.getExecutorService().submit(() -> {
-            tenantName.set(tenant);
+            TaskExecutorUtil.accountDetails.set(accountDetails);
             try {
                 return rateLimiter.call(task);
             } catch (Exception e) {
-                log.error("Failed to execute tenant task for tenant:" + tenant, e);
+                log.error("Failed to execute tenant task for tenant:" + accountDetails, e);
                 return task.getReturnValueWhenError();
             } finally {
-                tenantName.remove();
+                TaskExecutorUtil.accountDetails.remove();
             }
         });
     }
@@ -55,6 +55,6 @@ public <K> void awaitAll(List<Future<K>> futures, Consumer<K> consumer) {
     }
 
     public AWSAccount getAccountDetails() {
-        return tenantName.get();
+        return accountDetails.get();
     }
 }
diff --git a/src/main/java/ai/asserts/aws/cloudwatch/alarms/AlarmFetcher.java b/src/main/java/ai/asserts/aws/cloudwatch/alarms/AlarmFetcher.java
@@ -103,7 +103,7 @@ public void update() {
                 continue;
             }
             accountRegion.getRegions().forEach(region ->
-                    futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new CollectionBuilderTask<Sample>() {
                                 @Override
                                 public List<Sample> call() {

diff --git a/src/main/java/ai/asserts/aws/cloudwatch/query/MetricQueryProvider.java b/src/main/java/ai/asserts/aws/cloudwatch/query/MetricQueryProvider.java
@@ -102,7 +102,7 @@ Map<String, Map<String, Map<Integer, List<MetricQuery>>>> getQueriesInternal() {
             log.info("Will discover metrics and build metric queries for tenant {}, account {}",
                     accountRegion.getTenant(), accountRegion.getAccountId());
             accountRegion.getRegions().forEach(region -> futures.add(
-                    taskExecutorUtil.executeTenantTask(accountRegion, new SimpleTenantTask<Void>() {
+                    taskExecutorUtil.executeAccountTask(accountRegion, new SimpleTenantTask<Void>() {
                         @Override
                         public Void call() {
                             buildQueries(scrapeConfig, region, accountRegion, account, queriesByAccount);

diff --git a/src/main/java/ai/asserts/aws/exporter/ApiGatewayToLambdaBuilder.java b/src/main/java/ai/asserts/aws/exporter/ApiGatewayToLambdaBuilder.java
@@ -96,7 +96,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         for (AWSAccount accountRegion : accountProvider.getAccounts()) {
             accountRegion.getRegions().forEach(region ->
-                    futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new CollectionBuilderTask<Sample>() {
                                 @Override
                                 public List<Sample> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/DynamoDBExporter.java b/src/main/java/ai/asserts/aws/exporter/DynamoDBExporter.java
@@ -83,7 +83,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildSamples(region, account, allSamples);

diff --git a/src/main/java/ai/asserts/aws/exporter/EC2ToEBSVolumeExporter.java b/src/main/java/ai/asserts/aws/exporter/EC2ToEBSVolumeExporter.java
@@ -103,14 +103,14 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         List<Future<List<ResourceRelation>>> volumeFutures = new ArrayList<>();
         accountProvider.getAccounts().forEach(awsAccount -> awsAccount.getRegions().forEach(region -> {
-            futures.add(taskExecutorUtil.executeTenantTask(awsAccount, new CollectionBuilderTask<Sample>() {
+            futures.add(taskExecutorUtil.executeAccountTask(awsAccount, new CollectionBuilderTask<Sample>() {
                 @Override
                 public List<Sample> call() {
                     return buildEC2InstanceMetrics(region, awsAccount);
                 }
             }));
             volumeFutures.add(
-                    taskExecutorUtil.executeTenantTask(awsAccount,
+                    taskExecutorUtil.executeAccountTask(awsAccount,
                             new CollectionBuilderTask<ResourceRelation>() {
                                 @Override
                                 public List<ResourceRelation> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/ECSTaskProvider.java b/src/main/java/ai/asserts/aws/exporter/ECSTaskProvider.java
@@ -147,7 +147,7 @@ public void run() {
         for (AWSAccount account : accountProvider.getAccounts()) {
             ScrapeConfig scrapeConfig = scrapeConfigProvider.getScrapeConfig(account.getTenant());
             for (String region : account.getRegions()) {
-                taskExecutorUtil.executeTenantTask(account, new SimpleTenantTask<Void>() {
+                taskExecutorUtil.executeAccountTask(account, new SimpleTenantTask<Void>() {
                     @Override
                     public Void call() {
                         Map<Resource, List<Resource>> clusterWiseNewTasks = new HashMap<>();

diff --git a/src/main/java/ai/asserts/aws/exporter/EMRExporter.java b/src/main/java/ai/asserts/aws/exporter/EMRExporter.java
@@ -71,7 +71,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/KinesisAnalyticsExporter.java b/src/main/java/ai/asserts/aws/exporter/KinesisAnalyticsExporter.java
@@ -77,7 +77,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/KinesisFirehoseExporter.java b/src/main/java/ai/asserts/aws/exporter/KinesisFirehoseExporter.java
@@ -90,7 +90,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildMetricSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/KinesisStreamExporter.java b/src/main/java/ai/asserts/aws/exporter/KinesisStreamExporter.java
@@ -82,7 +82,7 @@ public void update() {
         List<Sample> allSamples = new ArrayList<>();
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
-                futures.add(taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                futures.add(taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                     @Override
                     public List<Sample> call()  {
                         return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/LBToASGRelationBuilder.java b/src/main/java/ai/asserts/aws/exporter/LBToASGRelationBuilder.java
@@ -97,7 +97,7 @@ public void updateRouting() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         for (AWSAccount accountRegion : accountProvider.getAccounts()) {
             accountRegion.getRegions().forEach(region ->
-                    futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new CollectionBuilderTask<Sample>() {
                                 @Override
                                 public List<Sample> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/LBToECSRoutingBuilder.java b/src/main/java/ai/asserts/aws/exporter/LBToECSRoutingBuilder.java
@@ -69,7 +69,7 @@ public void run() {
         Set<ResourceRelation> newRouting = new HashSet<>();
         List<Future<Set<ResourceRelation>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(awsAccount -> awsAccount.getRegions().forEach(region ->
-                futures.add(taskExecutorUtil.executeTenantTask(awsAccount,
+                futures.add(taskExecutorUtil.executeAccountTask(awsAccount,
                         new SimpleTenantTask<Set<ResourceRelation>>() {
                             @Override
                             public Set<ResourceRelation> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/LBToLambdaRoutingBuilder.java b/src/main/java/ai/asserts/aws/exporter/LBToLambdaRoutingBuilder.java
@@ -55,7 +55,7 @@ public Set<ResourceRelation> getRoutings() {
         List<Future<Pair<Set<ResourceRelation>, Set<Resource>>>> futures = new ArrayList<>();
         for (AWSAccount accountRegion : accountProvider.getAccounts()) {
             accountRegion.getRegions().forEach(region ->
-                    futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new SimpleTenantTask<Pair<Set<ResourceRelation>, Set<Resource>>>() {
                                 @Override
                                 public Pair<Set<ResourceRelation>, Set<Resource>> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/LambdaCapacityExporter.java b/src/main/java/ai/asserts/aws/exporter/LambdaCapacityExporter.java
@@ -114,7 +114,7 @@ private List<MetricFamilySamples> getMetrics() {
                 String account = accountRegion.getAccountId();
                 Map<String, Map<String, LambdaFunction>> byRegion = byAccountByRegion.getOrDefault(account,
                         Collections.emptyMap());
-                byRegion.forEach((region, functions) -> futures.add(taskExecutorUtil.executeTenantTask(
+                byRegion.forEach((region, functions) -> futures.add(taskExecutorUtil.executeAccountTask(
                         accountRegion, new SimpleTenantTask<Map<String, List<Sample>>>() {
                             @Override
                             public Map<String, List<Sample>> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/LambdaEventSourceExporter.java b/src/main/java/ai/asserts/aws/exporter/LambdaEventSourceExporter.java
@@ -95,7 +95,7 @@ private List<MetricFamilySamples> getMappings() {
             ScrapeConfig scrapeConfig = scrapeConfigProvider.getScrapeConfig(accountRegion.getTenant());
             Optional<NamespaceConfig> lambdaConfig = scrapeConfig.getLambdaConfig();
             lambdaConfig.ifPresent(namespaceConfig -> accountRegion.getRegions().forEach(region ->
-                    futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new SimpleTenantTask<Map<String, List<Sample>>>() {
                                 @Override
                                 public Map<String, List<Sample>> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/LambdaInvokeConfigExporter.java b/src/main/java/ai/asserts/aws/exporter/LambdaInvokeConfigExporter.java
@@ -108,7 +108,7 @@ List<MetricFamilySamples> getInvokeConfigs() {
                 Map<String, Map<String, LambdaFunction>> byRegion =
                         new ConcurrentHashMap<>(byAccountByRegion.get(account));
                 byRegion.forEach((region, byARN) ->
-                        futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                        futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                                 new CollectionBuilderTask<Sample>() {
                                     @Override
                                     public List<Sample> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/LoadBalancerExporter.java b/src/main/java/ai/asserts/aws/exporter/LoadBalancerExporter.java
@@ -84,7 +84,7 @@ public void update() {
         List<Future<Pair<List<Sample>, List<Sample>>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(awsAccount -> awsAccount.getRegions().forEach(region -> {
             ScrapeConfig scrapeConfig = scrapeConfigProvider.getScrapeConfig(awsAccount.getTenant());
-            futures.add(taskExecutorUtil.executeTenantTask(awsAccount,
+            futures.add(taskExecutorUtil.executeAccountTask(awsAccount,
                     new SimpleTenantTask<Pair<List<Sample>, List<Sample>>>() {
                         @Override
                         public Pair<List<Sample>, List<Sample>> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/MetricScrapeTask.java b/src/main/java/ai/asserts/aws/exporter/MetricScrapeTask.java
@@ -101,7 +101,7 @@ public void update() {
         if (intervalSeconds <= 60 || System.currentTimeMillis() - lastRunTime > intervalSeconds * 1000L) {
             lastRunTime = System.currentTimeMillis();
             try {
-                cache = taskExecutorUtil.executeTenantTask(account,
+                cache = taskExecutorUtil.executeAccountTask(account,
                         new SimpleTenantTask<List<MetricFamilySamples>>() {
                             @Override
                             public List<MetricFamilySamples> call() {

diff --git a/src/main/java/ai/asserts/aws/exporter/RDSExporter.java b/src/main/java/ai/asserts/aws/exporter/RDSExporter.java
@@ -88,7 +88,7 @@ public void update() {
         List<Sample> allSamples = new ArrayList<>();
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
-                futures.add(taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                futures.add(taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                     @Override
                     public List<Sample> call() {
                         return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/RedshiftExporter.java b/src/main/java/ai/asserts/aws/exporter/RedshiftExporter.java
@@ -79,7 +79,7 @@ public void update() {
         List<Sample> allSamples = new ArrayList<>();
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
-                futures.add(taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                futures.add(taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                     @Override
                     public List<Sample> call() {
                         return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/S3BucketExporter.java b/src/main/java/ai/asserts/aws/exporter/S3BucketExporter.java
@@ -84,7 +84,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/SNSTopicExporter.java b/src/main/java/ai/asserts/aws/exporter/SNSTopicExporter.java
@@ -88,7 +88,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/SQSQueueExporter.java b/src/main/java/ai/asserts/aws/exporter/SQSQueueExporter.java
@@ -91,7 +91,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         accountProvider.getAccounts().forEach(account -> account.getRegions().forEach(region ->
                 futures.add(
-                        taskExecutorUtil.executeTenantTask(account, new CollectionBuilderTask<Sample>() {
+                        taskExecutorUtil.executeAccountTask(account, new CollectionBuilderTask<Sample>() {
                             @Override
                             public List<Sample> call() {
                                 return buildSamples(region, account);

diff --git a/src/main/java/ai/asserts/aws/exporter/TargetGroupLBMapProvider.java b/src/main/java/ai/asserts/aws/exporter/TargetGroupLBMapProvider.java
@@ -110,7 +110,7 @@ public void update() {
         List<Future<List<Sample>>> futures = new ArrayList<>();
         for (AWSAccount accountRegion : accountProvider.getAccounts()) {
             accountRegion.getRegions()
-                    .forEach(region -> futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    .forEach(region -> futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new CollectionBuilderTask<Sample>() {
                                 @Override
                                 public List<Sample> call() {

diff --git a/src/main/java/ai/asserts/aws/lambda/LambdaFunctionScraper.java b/src/main/java/ai/asserts/aws/lambda/LambdaFunctionScraper.java
@@ -147,7 +147,7 @@ private Map<String, Map<String, Map<String, LambdaFunction>>> discoverFunctions(
                     .filter(ns -> lambda.getNamespace().equals(ns.getName()))
                     .findFirst();
             lambdaNSOpt.ifPresent(lambdaNS -> accountRegion.getRegions().forEach(region ->
-                    futures.add(taskExecutorUtil.executeTenantTask(accountRegion,
+                    futures.add(taskExecutorUtil.executeAccountTask(accountRegion,
                             new SimpleTenantTask<Map<String, Map<String, Map<String, LambdaFunction>>>>() {
                                 @Override
                                 public Map<String, Map<String, Map<String, LambdaFunction>>> call() {