Analyst 0.2.0

.github/workflows/build-and-test.yml

@@ -12,24 +12,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  latest-beta-swift-version:
-    name: Latest (Beta) Swift Version
-    runs-on: macos-11
-    steps:
-    - uses: actions/checkout@v2
-    - uses: maxim-lobanov/[email protected]
-      with:
-        xcode-version: latest
-    - uses: actions/cache@v2
-      with:
-        path: .build
-        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-    - name: Check Xcode version
-      run: xcodebuild -version
-    - name: Check Swift version
-      run: swift --version
-    - name: Debug Build & Test
-      run: swift test
   macos:
     name: macOS ${{ matrix.configuration }}
     runs-on: macos-11

.github/workflows/docs.yml

@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: maxim-lobanov/[email protected]
       with:
-        xcode-version: latest
+        xcode-version: latest-stable
     - uses: actions/cache@v2
       with:
         path: .build

.github/workflows/spm-update.yml

@@ -2,7 +2,7 @@ name: Swift Package Update
 
 on:
   schedule:
-    - cron:  '0 0 * * 1'
+    - cron:  '0 0 1 * *'
   workflow_dispatch:
 
 jobs:

Package.swift

@@ -9,62 +9,61 @@ let package = Package(
     products: [
         .library(
             name: "Analyst",
-            targets: ["Analyst"]
+            targets: ["MetricAnalyst", "TraceAnalyst"]
         ),
         .library(
-            name: "JaegerAnalyst",
-            targets: ["Analyst", "JaegerAnalyst"]
+            name: "MetricAnalyst",
+            targets: ["MetricAnalyst"]
         ),
         .library(
-            name: "AnalystPresenter",
-            targets: ["Analyst", "AnalystPresenter"]
+            name: "PrometheusAnalyst",
+            targets: ["PrometheusAnalyst"]
         ),
         .library(
-            name: "PrometheusAnalyst",
-            targets: ["Analyst", "PrometheusAnalyst"]
-        )
+            name: "TraceAnalyst",
+            targets: ["TraceAnalyst"]
+        ),
+        .library(
+            name: "JaegerAnalyst",
+            targets: ["JaegerAnalyst"]
+        ),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.22.0"),
+        .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0" ..< "3.0.0"),
         .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.1.0"),
-        .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.0.0"),
-        .package(url: "https://github.com/Apodini/Presenter.git", from: "0.1.0")
     ],
     targets: [
         .target(
-            name: "Analyst",
+            name: "MetricAnalyst",
             dependencies: [
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "CoreMetrics", package: "swift-metrics")
             ]
         ),
         .target(
-            name: "JaegerAnalyst",
+            name: "PrometheusAnalyst",
             dependencies: [
-                .target(name: "Analyst"),
-                .product(name: "GRPC", package: "grpc-swift")
+                .target(name: "MetricAnalyst"),
             ]
         ),
         .target(
-            name: "AnalystPresenter",
-            dependencies: [
-                .target(name: "Analyst"),
-                .product(name: "MetricPresenter", package: "Presenter"),
-                .product(name: "TracePresenter", package: "Presenter"),
-            ]
+            name: "TraceAnalyst",
+            dependencies: []
         ),
         .target(
-            name: "PrometheusAnalyst",
+            name: "JaegerAnalyst",
             dependencies: [
-                .target(name: "Analyst"),
-                .product(name: "AsyncHTTPClient", package: "async-http-client"),
-                .product(name: "NIOFoundationCompat", package: "swift-nio")
+                .target(name: "TraceAnalyst"),
+                .product(name: "GRPC", package: "grpc-swift")
             ]
         ),
         .testTarget(
-            name: "AnalystTests",
-            dependencies: [
-                .target(name: "Analyst")
-            ]
+            name: "JaegerAnalystTests",
+            dependencies: ["JaegerAnalyst"]
+        ),
+        .testTarget(
+            name: "PrometheusAnalystTests",
+            dependencies: ["PrometheusAnalyst"],
+            resources: [.copy("prometheus")]
         )
     ]
 )