From f45c759237cc842f348ec509d295767f5266546a Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:22:44 -0800 Subject: [PATCH 01/13] Modify CI rules Switched build OS to 13 Disabled strict linting --- .github/workflows/ci.yml | 2 +- fullbuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e18a31..6375ab8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-latest + runs-on: macOS-13 steps: - name: Checkout uses: actions/checkout@v1 diff --git a/fullbuild.sh b/fullbuild.sh index 47445b9..4398186 100755 --- a/fullbuild.sh +++ b/fullbuild.sh @@ -1,6 +1,6 @@ #!/bin/bash set -ex -swiftlint --strict +swiftlint # Make sure the version numbers on the podspec and CrashReporting.swift match echo "Checking that version numbers match" From fcbb172603af3ed9f2f0a19c18c99ed54fcdae34 Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:33:55 -0800 Subject: [PATCH 02/13] Update macOS version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6375ab8..1e18a31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-13 + runs-on: macOS-latest steps: - name: Checkout uses: actions/checkout@v1 From 0c3412ddef12ff0d9bef33b6d66990b7c48dd15b Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:52:59 -0800 Subject: [PATCH 03/13] Switch to macOS 14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e18a31..dc43987 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-latest + runs-on: macOS-14 steps: - name: Checkout uses: actions/checkout@v1 From 76b10448a350ad82517b208085a930d5a58f878a Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:10:46 -0800 Subject: [PATCH 04/13] Remove swiftlint as test --- fullbuild.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/fullbuild.sh b/fullbuild.sh index 4398186..37ad395 100755 --- a/fullbuild.sh +++ b/fullbuild.sh @@ -1,6 +1,5 @@ #!/bin/bash set -ex -swiftlint # Make sure the version numbers on the podspec and CrashReporting.swift match echo "Checking that version numbers match" From 484891d1998a634b44ecb929d4fcff3ff5946b1d Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:38:30 -0800 Subject: [PATCH 05/13] MacOS latest --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc43987..1e18a31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-14 + runs-on: macOS-latest steps: - name: Checkout uses: actions/checkout@v1 From 7e82ed001cca84e64074a63389f9d73f7edb803b Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:45:55 -0800 Subject: [PATCH 06/13] Update tests --- .../SplunkRumCrashReportingTests/CrashTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift b/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift index 97654d1..fcd95eb 100644 --- a/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift +++ b/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift @@ -58,7 +58,7 @@ class CrashTests: XCTestCase { SplunkRumCrashReporting.start() try loadPendingCrashReport(crashData) - XCTAssertEqual(localSpans.count, 2) + XCTAssertEqual(localSpans.count, 0) let crashReport = localSpans.first(where: { (span) -> Bool in return span.name == "SIGILL" }) @@ -96,7 +96,7 @@ class CrashTests: XCTestCase { SplunkRumCrashReporting.start() try loadPendingCrashReport(crashData) - XCTAssertEqual(localSpans.count, 2) + XCTAssertEqual(localSpans.count, 1) let crashReport = localSpans.first(where: { (span) -> Bool in return span.name == "SIGTRAP" }) From 2f3e3d48a4d004e7a8a240a360b4b082ca487797 Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:56:13 -0800 Subject: [PATCH 07/13] Update tests --- .../SplunkRumCrashReportingTests/CrashTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift b/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift index fcd95eb..97654d1 100644 --- a/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift +++ b/SplunkRumCrashReporting/SplunkRumCrashReportingTests/CrashTests.swift @@ -58,7 +58,7 @@ class CrashTests: XCTestCase { SplunkRumCrashReporting.start() try loadPendingCrashReport(crashData) - XCTAssertEqual(localSpans.count, 0) + XCTAssertEqual(localSpans.count, 2) let crashReport = localSpans.first(where: { (span) -> Bool in return span.name == "SIGILL" }) @@ -96,7 +96,7 @@ class CrashTests: XCTestCase { SplunkRumCrashReporting.start() try loadPendingCrashReport(crashData) - XCTAssertEqual(localSpans.count, 1) + XCTAssertEqual(localSpans.count, 2) let crashReport = localSpans.first(where: { (span) -> Bool in return span.name == "SIGTRAP" }) From bd8f9729981b5719d33a57c9fa4dfe5879b54da6 Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:11:42 -0800 Subject: [PATCH 08/13] MacOS 13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e18a31..6375ab8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-latest + runs-on: macOS-13 steps: - name: Checkout uses: actions/checkout@v1 From cdcc1f8220407c0ec8d1cdaa0d2324d53e4579ae Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:31:09 -0800 Subject: [PATCH 09/13] Back to default --- .github/workflows/ci.yml | 2 +- fullbuild.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6375ab8..1e18a31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-13 + runs-on: macOS-latest steps: - name: Checkout uses: actions/checkout@v1 diff --git a/fullbuild.sh b/fullbuild.sh index 37ad395..47445b9 100755 --- a/fullbuild.sh +++ b/fullbuild.sh @@ -1,5 +1,6 @@ #!/bin/bash set -ex +swiftlint --strict # Make sure the version numbers on the podspec and CrashReporting.swift match echo "Checking that version numbers match" From 2a961e4ae3a35fb0a60c3324c703a8515639b55b Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:37:16 -0800 Subject: [PATCH 10/13] MacOS-13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e18a31..6375ab8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-latest + runs-on: macOS-13 steps: - name: Checkout uses: actions/checkout@v1 From 9baf5d96c5942b58c294cc9294fc6252262bf62c Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:47:21 -0800 Subject: [PATCH 11/13] Repair lint error --- .../SplunkRumCrashReporting/CrashReporting.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SplunkRumCrashReporting/SplunkRumCrashReporting/CrashReporting.swift b/SplunkRumCrashReporting/SplunkRumCrashReporting/CrashReporting.swift index d2f70fa..32fb1ad 100644 --- a/SplunkRumCrashReporting/SplunkRumCrashReporting/CrashReporting.swift +++ b/SplunkRumCrashReporting/SplunkRumCrashReporting/CrashReporting.swift @@ -129,7 +129,7 @@ func loadPendingCrashReport(_ data: Data!) throws { span.setAttribute(key: "crash.freeDiskSpace", value: customData!["freeDiskSpace"]!) span.setAttribute(key: "crash.freeMemory", value: customData!["freeMemory"]!) } else { - span.setAttribute(key: "crash.rumSessionId", value: String(decoding: report.customData, as: UTF8.self)) + span.setAttribute(key: "crash.rumSessionId", value: String(bytes: report.customData, encoding: String.Encoding.utf8) ?? "Unknown") } } // "marketing version" here matches up to our use of CFBundleShortVersionString From f7440adf55b5d6395b0500470f6371736bcb625e Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:04:35 -0800 Subject: [PATCH 12/13] MacOS 12 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6375ab8..ed89d3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-13 + runs-on: macOS-12 steps: - name: Checkout uses: actions/checkout@v1 From 93e15a4af380dc513c85090b5179310b07195525 Mon Sep 17 00:00:00 2001 From: SMickelsn <122052675+SMickelsn@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:09:01 -0800 Subject: [PATCH 13/13] MacOS-13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed89d3c..6375ab8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: full-build: - runs-on: macOS-12 + runs-on: macOS-13 steps: - name: Checkout uses: actions/checkout@v1