Skip to content

Commit 6265ac0

Browse files
bitsandfoxesbitsandfoxes
committed
bump
2 parents 8894c78 + 6013e11 commit 6265ac0

File tree

10 files changed

+33
-72
lines changed

10 files changed

+33
-72
lines changed

‎.github/workflows/android-smoke-test-run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
adb wait-for-device
8181
adb shell input keyevent 82
8282
adb devices -l
83-
pwsh ./scripts/smoke-test-android.ps1 -IsIntegrationTest -WarnIfFlaky
83+
pwsh ./scripts/smoke-test-android.ps1 -WarnIfFlaky
8484
8585
- name: Upload artifacts on failure
8686
if: ${{ failure() }}

‎CHANGELOG.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Features
66

77
- When running on Windows or Linux, the SDK now links errors and events originating on different layers (managed, native errors) via `trace ID` ([#2089](https://github.com/getsentry/sentry-unity/pull/2089))
8+
- When running on Android, the SDK now links errors and events originating on different layers (managed, native errors) via `trace ID` ([#1997](https://github.com/getsentry/sentry-unity/pull/1997))
89
- The SDK now reports the game's name as part of the app context ([2083](https://github.com/getsentry/sentry-unity/pull/2083))
910
- The SDK now reports the active scene's name as part of the `Unity Context` ([2084](https://github.com/getsentry/sentry-unity/pull/2084))
1011

@@ -13,15 +14,15 @@
1314
- Bump Cocoa SDK from v8.45.0 to v8.48.0 ([#2063](https://github.com/getsentry/sentry-unity/pull/2063), [#2071](https://github.com/getsentry/sentry-unity/pull/2071))
1415
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8480)
1516
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.45.0...8.48.0)
16-
- Bump Java SDK from v8.3.0 to v8.6.0 ([#2066](https://github.com/getsentry/sentry-unity/pull/2066), [#2075](https://github.com/getsentry/sentry-unity/pull/2075), [#2092](https://github.com/getsentry/sentry-unity/pull/2092))
17-
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#860)
18-
- [diff](https://github.com/getsentry/sentry-java/compare/8.3.0...8.6.0)
17+
- Bump Java SDK from v8.3.0 to v8.7.0 ([#2066](https://github.com/getsentry/sentry-unity/pull/2066), [#2075](https://github.com/getsentry/sentry-unity/pull/2075), [#2092](https://github.com/getsentry/sentry-unity/pull/2092), [#2103](https://github.com/getsentry/sentry-unity/pull/2103))
18+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#870)
19+
- [diff](https://github.com/getsentry/sentry-java/compare/8.3.0...8.7.0)
1920
- Bump CLI from v2.42.2 to v2.43.0 ([#2065](https://github.com/getsentry/sentry-unity/pull/2065), [#2082](https://github.com/getsentry/sentry-unity/pull/2082), [#2085](https://github.com/getsentry/sentry-unity/pull/2085))
2021
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2430)
2122
- [diff](https://github.com/getsentry/sentry-cli/compare/2.42.2...2.43.0)
22-
- Bump .NET SDK from v5.2.0 to v5.5.0 ([#2067](https://github.com/getsentry/sentry-unity/pull/2067), [#2093](https://github.com/getsentry/sentry-unity/pull/2093))
23-
- [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#550)
24-
- [diff](https://github.com/getsentry/sentry-dotnet/compare/5.2.0...5.5.0)
23+
- Bump .NET SDK from v5.2.0 to v5.5.1 ([#2067](https://github.com/getsentry/sentry-unity/pull/2067), [#2093](https://github.com/getsentry/sentry-unity/pull/2093), [#2102](https://github.com/getsentry/sentry-unity/pull/2102))
24+
- [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#551)
25+
- [diff](https://github.com/getsentry/sentry-dotnet/compare/5.2.0...5.5.1)
2526
- Bump Native SDK from v0.8.1 to v0.8.3 ([#2077](https://github.com/getsentry/sentry-unity/pull/2077), [#2087](https://github.com/getsentry/sentry-unity/pull/2087))
2627
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#083)
2728
- [diff](https://github.com/getsentry/sentry-native/compare/0.8.1...0.8.3)

‎modules/sentry-java

Submodule sentry-java updated 37 files

‎scripts/smoke-test-android.ps1

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,52 +22,14 @@ Write-Host "# |___/_| |_|\___/|_|\_\___| |_| |___|___/ |_| #"
2222
Write-Host "# #"
2323
Write-Host "#####################################################"
2424

25-
if ($IsIntegrationTest)
26-
{
27-
$BuildDir = $(GetNewProjectBuildPath)
28-
$ApkFileName = "test.apk"
29-
$ProcessName = "com.DefaultCompany.$(GetNewProjectName)"
30-
31-
if ($Action -eq "Build")
32-
{
33-
$buildCallback = {
34-
Write-Host "::group::Gradle build $BuildDir"
35-
Push-Location $BuildDir
36-
try
37-
{
38-
MakeExecutable "./gradlew"
39-
& ./gradlew --info --no-daemon assembleRelease | ForEach-Object {
40-
Write-Host " $_"
41-
}
42-
if (-not $?)
43-
{
44-
throw "Gradle execution failed"
45-
}
46-
Copy-Item -Path launcher/build/outputs/apk/release/launcher-release.apk -Destination $ApkFileName
47-
}
48-
finally
49-
{
50-
Pop-Location
51-
Write-Host "::endgroup::"
52-
}
53-
}
54-
55-
$symbolServerOutput = RunWithSymbolServer -Callback $buildCallback
56-
CheckSymbolServerOutput 'Android' $symbolServerOutput $UnityVersion
57-
return;
58-
}
59-
}
60-
else
61-
{
62-
$BuildDir = "samples/artifacts/builds/Android"
63-
$ApkFileName = "IL2CPP_Player.apk"
64-
$ProcessName = "io.sentry.samples.unityofbugs"
65-
}
25+
$BuildDir = $(GetNewProjectBuildPath)
26+
$ApkFileName = "test.apk"
27+
$ProcessName = "com.DefaultCompany.$(GetNewProjectName)"
6628
$TestActivityName = "$ProcessName/com.unity3d.player.UnityPlayerActivity"
6729
$FallBackTestActivityName = "$ProcessName/com.unity3d.player.UnityPlayerGameActivity"
6830

69-
$_ArtifactsPath = ((Test-Path env:ARTIFACTS_PATH) ? $env:ARTIFACTS_PATH : "./$BuildDir/../test-artifacts/") `
70-
+ $(Get-Date -Format "HHmmss")
31+
$_ArtifactsPath = (Test-Path env:ARTIFACTS_PATH) ? $env:ARTIFACTS_PATH : (Join-Path $BuildDir "../test-artifacts/" $(Get-Date -Format "HHmmss"))
32+
7133
function ArtifactsPath
7234
{
7335
if (-not (Test-Path $_ArtifactsPath))
@@ -332,8 +294,8 @@ function RunTest([string] $Name, [string] $SuccessString, [string] $FailureStrin
332294
$logCache = ProcessNewLogs -newLogs $newLogs -lastLogCount ([ref]$lastLogCount) -logCache $logCache
333295

334296
# The SmokeTester logs "SmokeTester is quitting." in OnApplicationQuit() to reliably inform when tests finish running.
335-
# For crash tests, we expect to see a native crash log "terminating with uncaught exception of type char const*".
336-
if (($newLogs | Select-String "SmokeTester is quitting.") -or ($newLogs | Select-String "terminating with uncaught exception of type char const*"))
297+
# For crash tests, we're checking for `sentry-native` logging "crash has been captured" to reliably inform when tests finished running.
298+
if (($newLogs | Select-String "SmokeTester is quitting.") -or ($newLogs | Select-String "crash has been captured"))
337299
{
338300
Write-Host "Process finished marker detected. Finish waiting for tests to run."
339301
$processFinished = $true

‎src/Sentry.Unity.Android/AndroidJavaScopeObserver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ public override void UnsetUserImpl()
9191
});
9292
}
9393

94-
public override void SetTraceImpl(SentryId traceId, SpanId parentSpanId)
94+
public override void SetTraceImpl(SentryId traceId, SpanId spanId)
9595
{
9696
_jniExecutor.Run(() =>
9797
{
9898
using var sentry = GetInternalSentryJava();
9999
// We have to explicitly cast to `(Double?)`
100-
sentry.CallStatic("setTrace", traceId.ToString(), parentSpanId.ToString(), (Double?)null, (Double?)null);
100+
sentry.CallStatic("setTrace", traceId.ToString(), spanId.ToString(), (Double?)null, (Double?)null);
101101
});
102102
}
103103
}

‎src/Sentry.Unity.Native/NativeScopeObserver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public override void SetUserImpl(SentryUser user)
4141

4242
public override void UnsetUserImpl() => C.sentry_remove_user();
4343

44-
public override void SetTraceImpl(SentryId traceId, SpanId parentSpanId) =>
45-
C.sentry_set_trace(traceId.ToString(), parentSpanId.ToString());
44+
public override void SetTraceImpl(SentryId traceId, SpanId spanId) =>
45+
C.sentry_set_trace(traceId.ToString(), spanId.ToString());
4646

4747
private static string GetTimestamp(DateTimeOffset timestamp) =>
4848
// "o": Using ISO 8601 to make sure the timestamp makes it to the bridge correctly.

‎src/Sentry.Unity.iOS/NativeScopeObserver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public override void SetUserImpl(SentryUser user) =>
2626

2727
public override void UnsetUserImpl() => SentryCocoaBridgeProxy.UnsetUser();
2828

29-
public override void SetTraceImpl(SentryId traceId, SpanId parentSpanId)
29+
public override void SetTraceImpl(SentryId traceId, SpanId spanId)
3030
{
3131
// Todo: Needs to be implemented
3232
}

‎src/Sentry.Unity/ScopeObserver.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ public void SetUser(SentryUser? user)
8585

8686
public abstract void UnsetUserImpl();
8787

88-
public void SetTrace(SentryId traceId, SpanId parentSpanId)
88+
public void SetTrace(SentryId traceId, SpanId spanId)
8989
{
9090
_options.DiagnosticLogger?.Log(
91-
SentryLevel.Debug, "{0} Scope Sync - Setting Trace traceId:{1} parentSpanId:{2}", null,
92-
_name, traceId, parentSpanId);
93-
SetTraceImpl(traceId, parentSpanId);
91+
SentryLevel.Debug, "{0} Scope Sync - Setting Trace traceId:{1} spanId:{2}", null,
92+
_name, traceId, spanId);
93+
SetTraceImpl(traceId, spanId);
9494
}
9595

96-
public abstract void SetTraceImpl(SentryId traceId, SpanId parentSpanId);
96+
public abstract void SetTraceImpl(SentryId traceId, SpanId spanId);
9797
}

‎src/sentry-dotnet

‎test/Scripts.Integration.Test/integration-test.ps1

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,16 @@ If (-not(Test-Path -Path "$(GetNewProjectPath)"))
8282
./test/Scripts.Integration.Test/configure-sentry.ps1 "$UnityPath" -Platform $Platform -CheckSymbols
8383
}
8484

85+
# Support rebuilding the integration test project. I.e. if you make changes to the SmokeTester.cs during
8586
If ($Rebuild -or -not(Test-Path -Path $(GetNewProjectBuildPath)))
8687
{
8788
Write-Host "Building Project"
8889

89-
If (("iOS", "Android-Export") -contains $Platform)
90+
If ("iOS" -eq $Platform)
9091
{
91-
# Workaround for having `exportAsGoogleAndroidProject` remain `false` in Unity 6 on first build
92+
# We're exporting an Xcode project and building that in a separate step.
9293
./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$UnityPath" -UnityVersion $UnityVersion -Platform $Platform
93-
Remove-Item -Path $(GetNewProjectBuildPath) -Recurse -Force -Confirm:$false
94-
95-
./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$UnityPath" -UnityVersion $UnityVersion -Platform $Platform
96-
& "./scripts/smoke-test-$($Platform -eq 'iOS' ? 'ios' : 'android').ps1" Build -IsIntegrationTest -UnityVersion $UnityVersion
94+
& "./scripts/smoke-test-ios.ps1" Build -IsIntegrationTest -UnityVersion $UnityVersion
9795
}
9896
Else
9997
{
@@ -109,9 +107,9 @@ Switch -Regex ($Platform)
109107
{
110108
./test/Scripts.Integration.Test/run-smoke-test.ps1 -Smoke -Crash
111109
}
112-
"^(Android|Android-Export)$"
110+
"^(Android)$"
113111
{
114-
./scripts/smoke-test-android.ps1 -IsIntegrationTest
112+
./scripts/smoke-test-android.ps1
115113
}
116114
"^iOS$"
117115
{

0 commit comments

Comments
 (0)