Merge pull request #3283 from SwiftPackageIndex/maintenance-updates

Maintenance updates

Author: finestructure

Tests/AppTests/QueryPerformanceTests.swift

@@ -22,6 +22,9 @@ import XCTest
 class QueryPerformanceTests: XCTestCase {
     var app: Application!
 
+    // Set this to true when running locally to convert warnings to test failures for easier updating of values.
+    static let failOnWarning = false
+
     override func setUp() async throws {
         try await super.setUp()
 
@@ -46,67 +49,67 @@ class QueryPerformanceTests: XCTestCase {
 
     func test_02_Search_keywordMatchQuery() async throws {
         let query = Search.keywordMatchQueryBuilder(on: app.db, terms: ["a"])
-        try await assertQueryPerformance(query, expectedCost: 5800, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 5900, variation: 200)
     }
 
     func test_03_Search_authorMatchQuery() async throws {
         let query = Search.authorMatchQueryBuilder(on: app.db, terms: ["a"])
-        try await assertQueryPerformance(query, expectedCost: 1000, variation: 50)
+        try await assertQueryPerformance(query, expectedCost: 1100, variation: 50)
     }
 
     func test_04_Search_query_noFilter() async throws {
         let query = try Search.query(app.db, ["a"], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 8000, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 8100, variation: 200)
     }
 
     func test_05_Search_query_authorFilter() async throws {
         let filter = try AuthorSearchFilter(expression: .init(operator: .is, value: "apple"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 7600, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 7700, variation: 200)
     }
 
     func test_06_Search_query_keywordFilter() async throws {
         let filter = try KeywordSearchFilter(expression: .init(operator: .is, value: "apple"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 7700, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 7800, variation: 200)
     }
 
     func test_07_Search_query_lastActicityFilter() async throws {
         let filter = try LastActivitySearchFilter(expression: .init(operator: .greaterThan, value: "2000-01-01"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 8000, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 8100, variation: 200)
     }
 
     func test_08_Search_query_licenseFilter() async throws {
         let filter = try LicenseSearchFilter(expression: .init(operator: .is, value: "mit"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 7900, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 8000, variation: 200)
     }
 
     func test_09_Search_query_platformFilter() async throws {
         let filter = try PlatformSearchFilter(expression: .init(operator: .is, value: "macos,ios"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 7800, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 7900, variation: 200)
     }
 
     func test_10_Search_query_productTypeFilter() async throws {
         let filter = try ProductTypeSearchFilter(expression: .init(operator: .is, value: "plugin"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 7600, variation: 200)
+        try await assertQueryPerformance(query, expectedCost: 7700, variation: 200)
     }
 
     func test_11_Search_query_starsFilter() async throws {
         let filter = try StarsSearchFilter(expression: .init(operator: .greaterThan, value: "5"))
         let query = try Search.query(app.db, ["a"], filters: [filter], page: 1)
             .unwrap()
-        try await assertQueryPerformance(query, expectedCost: 7800, variation: 300)
+        try await assertQueryPerformance(query, expectedCost: 7900, variation: 300)
     }
 
     func test_12_Search_refresh() async throws {
@@ -152,7 +155,7 @@ class QueryPerformanceTests: XCTestCase {
               JOIN versions v ON v.package_id = p.id
             WHERE v.reference ->> 'branch' = r.default_branch
             """)
-        try await assertQueryPerformance(query, expectedCost: 87_000, variation: 5000)
+        try await assertQueryPerformance(query, expectedCost: 91_000, variation: 5000)
     }
 
 }
@@ -205,7 +208,15 @@ private extension QueryPerformanceTests {
         if parsedPlan.cost.total <= expectedCost {
             print("ℹ️ COST:        \(parsedPlan.cost.total)")
         } else {
-            print("⚠️ COST:        \(parsedPlan.cost.total)")
+            if Self.failOnWarning {
+                XCTFail("""
+                        Total cost of \(parsedPlan.cost.total) above the expected cost of \(expectedCost)
+                        """,
+                        file: filePath,
+                        line: lineNumber)
+            } else {
+                print("⚠️ COST:        \(parsedPlan.cost.total)")
+            }
         }
         print("ℹ️ EXPECTED:    \(expectedCost) ± \(variation)")
         print("ℹ️ ACTUAL TIME: \(parsedPlan.actualTime.total)ms")

mon.yml

@@ -20,7 +20,7 @@ services:
 
   grafana:
     # https://github.com/grafana/grafana/releases
-    image: grafana/grafana:11.1.0
+    image: grafana/grafana:11.1.3
     environment:
       GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
       GF_USERS_ALLOW_SIGN_UP: 'false'
@@ -42,7 +42,7 @@ services:
 
   loki:
     # https://github.com/grafana/loki/releases
-    image: grafana/loki:3.1.0
+    image: grafana/loki:3.1.1
     command: -config.file=/loki.yml
     configs:
       - source: loki_cfg
@@ -54,7 +54,7 @@ services:
   promtail:
     # https://github.com/grafana/loki/releases
     # (promtail is released in parallel with loki)
-    image: grafana/promtail:3.1.0
+    image: grafana/promtail:3.1.1
     command: -config.file=/promtail.yml
     configs:
       - source: promtail_cfg
@@ -71,7 +71,7 @@ services:
 
   prometheus:
     # https://github.com/prometheus/prometheus/releases
-    image: prom/prometheus:v2.53.1
+    image: prom/prometheus:v2.53.2
     volumes:
       - prometheus_data:/prometheus
     command: --config.file=/prometheus.yml --storage.tsdb.retention.time=30d
@@ -110,7 +110,7 @@ services:
 
   cadvisor:
     # https://github.com/google/cadvisor/releases
-    image: gcr.io/cadvisor/cadvisor:v0.49.1
+    image: gcr.io/cadvisor/cadvisor:v0.50.0
     networks:
       - app_backend
     volumes:

restfiles/doc-test.restfile

@@ -441,6 +441,10 @@ requests:
     url: ${base_url}/pointfreeco/swift-case-paths/documentation
     validation:
       status: .regex((2|3)\d\d)
+  /pointfreeco/swift-clocks/documentation:
+    url: ${base_url}/pointfreeco/swift-clocks/documentation
+    validation:
+      status: .regex((2|3)\d\d)
   /pointfreeco/swift-composable-architecture/documentation:
     url: ${base_url}/pointfreeco/swift-composable-architecture/documentation
     validation:
@@ -457,10 +461,18 @@ requests:
     url: ${base_url}/pointfreeco/swift-identified-collections/documentation
     validation:
       status: .regex((2|3)\d\d)
+  /pointfreeco/swift-issue-reporting/documentation:
+    url: ${base_url}/pointfreeco/swift-issue-reporting/documentation
+    validation:
+      status: .regex((2|3)\d\d)
   /pointfreeco/swift-macro-testing/documentation:
     url: ${base_url}/pointfreeco/swift-macro-testing/documentation
     validation:
       status: .regex((2|3)\d\d)
+  /pointfreeco/swift-navigation/documentation:
+    url: ${base_url}/pointfreeco/swift-navigation/documentation
+    validation:
+      status: .regex((2|3)\d\d)
   /pointfreeco/swift-perception/documentation:
     url: ${base_url}/pointfreeco/swift-perception/documentation
     validation:
@@ -473,10 +485,6 @@ requests:
     url: ${base_url}/pointfreeco/swift-url-routing/documentation
     validation:
       status: .regex((2|3)\d\d)
-  /pointfreeco/swiftui-navigation/documentation:
-    url: ${base_url}/pointfreeco/swiftui-navigation/documentation
-    validation:
-      status: .regex((2|3)\d\d)
   /richardtop/CalendarKit/documentation:
     url: ${base_url}/richardtop/CalendarKit/documentation
     validation:
@@ -586,6 +594,10 @@ requests:
     url: ${base_url}/swiftlang/swift-testing/documentation
     validation:
       status: .regex((2|3)\d\d)
+  /swiftlang/swiftly/documentation:
+    url: ${base_url}/swiftlang/swiftly/documentation
+    validation:
+      status: .regex((2|3)\d\d)
   /swiftwasm/JavaScriptKit/documentation:
     url: ${base_url}/swiftwasm/JavaScriptKit/documentation
     validation: