[Subscriptions Release] - pre tag commit: 'rhsm-subscriptions-1.0.77'.

RedHatInsights · Nov 25, 2021 · 0f952c9 · 0f952c9
2 parents 509f7b3 + abdd0e0
commit 0f952c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version = 1.0.76
+version = 1.0.77
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -71,7 +71,7 @@ rhsm-subscriptions:
       seek-override-end: ${KAFKA_SEEK_OVERRIDE_END:false}
       seek-override-timestamp: ${KAFKA_SEEK_OVERRIDE_TIMESTAMP:}
   prometheus-latency-duration: ${PROMETHEUS_LATENCY_DURATION:4h}
-  hourly-tally-offset: ${HOURLY_TALLY_OFFSET:60m}
+  hourly-tally-offset: ${HOURLY_TALLY_OFFSET:120m}
   metric-lookup-range-duration: ${METRIC_LOOKUP_RANGE:1h}
   subscription-sync-enabled: ${SUBSCRIPTION_SYNC_ENABLED:false}
   subscription:

diff --git a/src/test/java/org/candlepin/subscriptions/tally/job/CaptureSnapshotsTaskManagerTest.java b/src/test/java/org/candlepin/subscriptions/tally/job/CaptureSnapshotsTaskManagerTest.java
@@ -72,7 +72,7 @@ void testUpdateForSingleAccount() {
     String account = "12345";
     manager.updateAccountSnapshots(account);
 
-    verify(queue).enqueue(eq(createDescriptor(account)));
+    verify(queue).enqueue(createDescriptor(account));
   }
 
   @Test
@@ -82,7 +82,7 @@ void ensureUpdateIsRunForEachAccount() throws Exception {
 
     manager.updateSnapshotsForAllAccounts();
 
-    verify(queue, times(1)).enqueue(eq(createDescriptor(expectedAccounts)));
+    verify(queue, times(1)).enqueue(createDescriptor(expectedAccounts));
   }
 
   @Test
@@ -93,8 +93,8 @@ void ensureAccountListIsPartitionedWhenSendingTaskMessages() throws Exception {
     manager.updateSnapshotsForAllAccounts();
 
     // NOTE: Partition size is defined in test.properties
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a1", "a2"))));
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a3", "a4"))));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a1", "a2")));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a3", "a4")));
   }
 
   @Test
@@ -105,9 +105,9 @@ void ensureLastAccountListPartitionIsIncludedWhenSendingTaskMessages() throws Ex
     manager.updateSnapshotsForAllAccounts();
 
     // NOTE: Partition size is defined in test.properties
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a1", "a2"))));
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a3", "a4"))));
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a5"))));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a1", "a2")));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a3", "a4")));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a5")));
   }
 
   @Test
@@ -117,14 +117,14 @@ void ensureErrorOnUpdateContinuesWithoutFailure() throws Exception {
 
     doThrow(new RuntimeException("Forced!"))
         .when(queue)
-        .enqueue(eq(createDescriptor(Arrays.asList("a3", "a4"))));
+        .enqueue(createDescriptor(Arrays.asList("a3", "a4")));
 
     manager.updateSnapshotsForAllAccounts();
 
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a1", "a2"))));
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a3", "a4"))));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a1", "a2")));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a3", "a4")));
     // Even though a3,a4 throws exception, a5,a6 should be enqueued.
-    verify(queue, times(1)).enqueue(eq(createDescriptor(Arrays.asList("a5", "a6"))));
+    verify(queue, times(1)).enqueue(createDescriptor(Arrays.asList("a5", "a6")));
   }
 
   @Test
@@ -176,8 +176,8 @@ void testHourlySnapshotTallyOffset() throws Exception {
                       // 2019-05-24T12:35Z truncated to top of the hour - 4 hours prometheus latency
                       // - 1 hour
                       // tally latency - 1 hour metric range
-                      .setSingleValuedArg("startDateTime", "2019-05-24T06:00:00Z")
-                      .setSingleValuedArg("endDateTime", "2019-05-24T07:00:00Z")
+                      .setSingleValuedArg("startDateTime", "2019-05-24T05:00:00Z")
+                      .setSingleValuedArg("endDateTime", "2019-05-24T06:00:00Z")
                       .build());
         });
   }

diff --git a/templates/rhsm-subscriptions-scheduler.yml b/templates/rhsm-subscriptions-scheduler.yml
@@ -56,7 +56,7 @@ parameters:
   - name: SPLUNK_FORWARDER_CPU_LIMIT
     value: 100m
   - name: HOURLY_TALLY_OFFSET
-    value: 60m
+    value: 120m
   - name: TOKEN_REFRESHER_IMAGE
     value: quay.io/observatorium/token-refresher:master-2021-02-05-5da9663
   - name: TOKEN_REFRESHER_CPU_REQUEST
@@ -110,8 +110,6 @@ objects:
                       value: ${KAFKA_BOOTSTRAP_HOST}
                     - name: OPENSHIFT_METERING_RANGE
                       value: ${OPENSHIFT_METERING_RANGE}
-                    - name: HOURLY_TALLY_OFFSET
-                      value: ${HOURLY_TALLY_OFFSET}
                     - name: DATABASE_HOST
                       valueFrom:
                         secretKeyRef:
@@ -392,6 +390,8 @@ objects:
                       value: ${LOGGING_LEVEL}
                     - name: KAFKA_BOOTSTRAP_HOST
                       value: ${KAFKA_BOOTSTRAP_HOST}
+                    - name: HOURLY_TALLY_OFFSET
+                      value: ${HOURLY_TALLY_OFFSET}
                     - name: DATABASE_HOST
                       valueFrom:
                         secretKeyRef: