diff --git a/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java b/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java index 5b2145f1a..229b968d0 100644 --- a/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java +++ b/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java @@ -14,10 +14,10 @@ package google.registry.monitoring.whitebox; -import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; import com.google.appengine.api.modules.ModulesService; +import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.base.Supplier; @@ -36,10 +36,11 @@ public class BigQueryMetricsEnqueuer { private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); - public static final String QUEUE = "bigquery-streaming-metrics"; + public static final String QUEUE_BIGQUERY_STREAMING_METRICS = "bigquery-streaming-metrics"; @Inject ModulesService modulesService; @Inject @Named("insertIdGenerator") Supplier idGenerator; + @Inject @Named(QUEUE_BIGQUERY_STREAMING_METRICS) Queue queue; @Inject BigQueryMetricsEnqueuer() {} @@ -54,7 +55,7 @@ public class BigQueryMetricsEnqueuer { opts.param(entry.getKey(), entry.getValue()); } opts.param("tableId", metric.getTableId()); - getQueue(QUEUE).add(opts); + queue.add(opts); } catch (TransientFailureException e) { // Log and swallow. We may drop some metrics here but this should be rare. logger.info(e, e.getMessage()); diff --git a/java/google/registry/monitoring/whitebox/WhiteboxModule.java b/java/google/registry/monitoring/whitebox/WhiteboxModule.java index 81625f196..f94a8a697 100644 --- a/java/google/registry/monitoring/whitebox/WhiteboxModule.java +++ b/java/google/registry/monitoring/whitebox/WhiteboxModule.java @@ -14,9 +14,12 @@ package google.registry.monitoring.whitebox; +import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; +import static google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer.QUEUE_BIGQUERY_STREAMING_METRICS; import static google.registry.request.RequestParameters.extractRequiredParameter; import com.google.api.services.bigquery.model.TableFieldSchema; +import com.google.appengine.api.taskqueue.Queue; import com.google.apphosting.api.ApiProxy; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; @@ -80,4 +83,10 @@ public class WhiteboxModule { @Named("requestLogId") String requestLogId, Clock clock) { return EppMetric.builderForRequest(requestLogId, clock); } + + @Provides + @Named(QUEUE_BIGQUERY_STREAMING_METRICS) + static Queue provideBigQueryStreamingMetricsQueue() { + return getQueue(QUEUE_BIGQUERY_STREAMING_METRICS); + } } diff --git a/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java b/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java index 9893e3d49..1af722fff 100644 --- a/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java +++ b/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java @@ -14,7 +14,9 @@ package google.registry.monitoring.whitebox; +import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static google.registry.bigquery.BigqueryUtils.toBigqueryTimestamp; +import static google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer.QUEUE_BIGQUERY_STREAMING_METRICS; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import static org.mockito.Mockito.when; @@ -59,6 +61,7 @@ public class BigQueryMetricsEnqueuerTest { enqueuer = new BigQueryMetricsEnqueuer(); enqueuer.idGenerator = Suppliers.ofInstance("laffo"); enqueuer.modulesService = modulesService; + enqueuer.queue = getQueue(QUEUE_BIGQUERY_STREAMING_METRICS); when(modulesService.getVersionHostname(Matchers.anyString(), Matchers.anyString())) .thenReturn("1.backend.test.localhost"); }