Skip to content

Commit fb22692

Browse files
richardelmsrichardelms
authored
Merge pull request #937 from bugsnag/releases/v8.8.0
2 parents e6ab980 + c9e5108 commit fb22692

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+489
-54
lines changed

‎.buildkite/pipeline.full.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ steps:
2020
- label: 'Append Unity 6000 Pipeline'
2121
timeout_in_minutes: 2
2222
commands:
23-
- buildkite-agent pipeline upload .buildkite/unity.6000.yml
23+
- buildkite-agent pipeline upload .buildkite/unity.6000.yml

‎.buildkite/pipeline.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ steps:
1212
UNITY_VERSION: *2021
1313
commands:
1414
- rake code:verify
15-
retry:
16-
automatic:
17-
- exit_status: "*"
18-
limit: 3
1915

2016
- label: Run Unit Tests
2117
timeout_in_minutes: 5

‎.buildkite/unity.2020.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
key: "build-android-fixture-2020"
1515
env:
1616
UNITY_VERSION: *2020
17+
JAVA_VERSION: 17
1718
plugins:
1819
artifacts#v1.9.0:
1920
download:
@@ -40,6 +41,8 @@ steps:
4041
env:
4142
XCODE_VERSION: "15.3.0"
4243
UNITY_VERSION: *2020
44+
JAVA_VERSION: 17
45+
4346
plugins:
4447
artifacts#v1.9.0:
4548
download:
@@ -61,6 +64,8 @@ steps:
6164
env:
6265
UNITY_VERSION: *2020
6366
XCODE_VERSION: "16.3.0"
67+
JAVA_VERSION: 17
68+
6469
# Python2 needed for WebGL to build
6570
EMSDK_PYTHON: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python"
6671
plugins:
@@ -83,6 +88,7 @@ steps:
8388
env:
8489
UNITY_VERSION: *2020
8590
XCODE_VERSION: "16.3.0"
91+
JAVA_VERSION: 17
8692
# Python2 needed for WebGL to build
8793
EMSDK_PYTHON: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python"
8894
plugins:
@@ -106,6 +112,7 @@ steps:
106112
queue: windows-general-wsl
107113
env:
108114
UNITY_VERSION: *2020
115+
JAVA_VERSION: 17
109116
plugins:
110117
artifacts#v1.9.0:
111118
download:

‎.buildkite/unity.2021.full.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ steps:
1212
key: "build-android-dev-fixture-2021"
1313
env:
1414
UNITY_VERSION: *2021
15+
JAVA_VERSION: 17
1516
plugins:
1617
artifacts#v1.9.0:
1718
download:
@@ -32,6 +33,7 @@ steps:
3233
key: "build-android-edm4u-fixture-2021"
3334
env:
3435
UNITY_VERSION: *2021
36+
JAVA_VERSION: 17
3537
plugins:
3638
artifacts#v1.9.0:
3739
download:
@@ -52,6 +54,7 @@ steps:
5254
key: "generate-dev-fixture-project-2021"
5355
env:
5456
UNITY_VERSION: *2021
57+
JAVA_VERSION: 17
5558
plugins:
5659
artifacts#v1.5.0:
5760
download:
@@ -75,6 +78,7 @@ steps:
7578
env:
7679
UNITY_VERSION: *2021
7780
XCODE_VERSION: "16.2.0"
81+
JAVA_VERSION: 17
7882
plugins:
7983
artifacts#v1.5.0:
8084
download:
@@ -98,6 +102,7 @@ steps:
98102
env:
99103
UNITY_VERSION: *2021
100104
XCODE_VERSION: "16.2.0"
105+
JAVA_VERSION: 17
101106
plugins:
102107
artifacts#v1.9.0:
103108
download:
@@ -118,6 +123,7 @@ steps:
118123
env:
119124
UNITY_VERSION: *2021
120125
XCODE_VERSION: "16.2.0"
126+
JAVA_VERSION: 17
121127
plugins:
122128
artifacts#v1.9.0:
123129
download:
@@ -138,6 +144,7 @@ steps:
138144
env:
139145
UNITY_VERSION: *2021
140146
XCODE_VERSION: "16.2.0"
147+
JAVA_VERSION: 17
141148
plugins:
142149
artifacts#v1.9.0:
143150
download:
@@ -158,6 +165,7 @@ steps:
158165
env:
159166
UNITY_VERSION: *2021
160167
XCODE_VERSION: "16.2.0"
168+
JAVA_VERSION: 17
161169
plugins:
162170
artifacts#v1.9.0:
163171
download:
@@ -179,6 +187,7 @@ steps:
179187
queue: windows-general-wsl
180188
env:
181189
UNITY_VERSION: *2021
190+
JAVA_VERSION: 17
182191
commands:
183192
- scripts/ci-build-windows-fixture-wsl.sh release
184193
plugins:
@@ -201,6 +210,7 @@ steps:
201210
queue: windows-general-wsl
202211
env:
203212
UNITY_VERSION: *2021
213+
JAVA_VERSION: 17
204214
commands:
205215
- scripts/ci-build-windows-fixture-wsl.sh dev
206216
plugins:

‎.buildkite/unity.2021.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ steps:
1212
key: "build-android-fixture-2021"
1313
env:
1414
UNITY_VERSION: *2021
15+
JAVA_VERSION: 17
1516
plugins:
1617
artifacts#v1.9.0:
1718
download:
@@ -33,6 +34,7 @@ steps:
3334
env:
3435
UNITY_VERSION: *2021
3536
XCODE_VERSION: "16.2.0"
37+
JAVA_VERSION: 17
3638
plugins:
3739
artifacts#v1.5.0:
3840
download:

‎.buildkite/unity.2022.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
key: "build-android-fixture-2022"
1515
env:
1616
UNITY_VERSION: *2022
17+
JAVA_VERSION: 17
1718
plugins:
1819
artifacts#v1.9.0:
1920
download:
@@ -35,6 +36,7 @@ steps:
3536
env:
3637
UNITY_VERSION: *2022
3738
XCODE_VERSION: "16.3.0"
39+
JAVA_VERSION: 17
3840
plugins:
3941
artifacts#v1.9.0:
4042
download:
@@ -56,6 +58,7 @@ steps:
5658
env:
5759
UNITY_VERSION: *2022
5860
XCODE_VERSION: "16.3.0"
61+
JAVA_VERSION: 17
5962
plugins:
6063
artifacts#v1.9.0:
6164
download:
@@ -76,6 +79,7 @@ steps:
7679
env:
7780
UNITY_VERSION: *2022
7881
XCODE_VERSION: "16.3.0"
82+
JAVA_VERSION: 17
7983
plugins:
8084
artifacts#v1.9.0:
8185
download:
@@ -97,6 +101,7 @@ steps:
97101
queue: windows-general-wsl
98102
env:
99103
UNITY_VERSION: *2022
104+
JAVA_VERSION: 17
100105
commands:
101106
- scripts/ci-build-windows-fixture-wsl.sh release
102107
plugins:

‎.buildkite/unity.6000.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
aliases:
2-
- &6000 "6000.0.49f1"
2+
- &6000 "6000.2.2f1"
33

44
agents:
55
queue: macos-15
@@ -14,6 +14,7 @@ steps:
1414
key: "build-android-fixture-6000"
1515
env:
1616
UNITY_VERSION: *6000
17+
JAVA_VERSION: 17
1718
plugins:
1819
artifacts#v1.9.0:
1920
download:
@@ -35,6 +36,7 @@ steps:
3536
env:
3637
UNITY_VERSION: *6000
3738
XCODE_VERSION: "16.3.0"
39+
JAVA_VERSION: 17
3840
plugins:
3941
artifacts#v1.9.0:
4042
download:
@@ -58,6 +60,7 @@ steps:
5860
env:
5961
UNITY_VERSION: *6000
6062
XCODE_VERSION: "16.3.0"
63+
JAVA_VERSION: 17
6164
plugins:
6265
artifacts#v1.9.0:
6366
download:
@@ -78,6 +81,7 @@ steps:
7881
env:
7982
UNITY_VERSION: *6000
8083
XCODE_VERSION: "16.3.0"
84+
JAVA_VERSION: 17
8185
plugins:
8286
artifacts#v1.9.0:
8387
download:
@@ -100,6 +104,7 @@ steps:
100104
queue: windows-general-wsl
101105
env:
102106
UNITY_VERSION: *6000
107+
JAVA_VERSION: 17
103108
commands:
104109
- scripts/ci-build-windows-fixture-wsl.sh release
105110
plugins:

‎Bugsnag/Assets/Bugsnag/Runtime/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
using System.Reflection;
2-
[assembly: AssemblyVersion("8.7.1.0")]
2+
[assembly: AssemblyVersion("8.8.0.0")]

‎Bugsnag/Assets/Bugsnag/Runtime/Bugsnag.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,21 @@ public static string Context
101101
}
102102
}
103103

104+
/// <summary>
105+
/// Gets or sets the grouping discriminator for the Bugsnag client.
106+
/// </summary>
107+
public static string GroupingDiscriminator
108+
{
109+
get
110+
{
111+
return Client.GetGroupingDiscriminator();
112+
}
113+
set
114+
{
115+
Client.SetGroupingDiscriminator(value);
116+
}
117+
}
118+
104119
/// <summary>
105120
/// Setting Configuration.LaunchDurationMillis to 0 will cause Bugsnag to consider the app to be launching until Bugsnag.MarkLaunchCompleted() has been called.
106121
/// </summary>

‎Bugsnag/Assets/Bugsnag/Runtime/Client.cs‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ internal class Client : IClient
6060

6161
private ErrorBuilder _errorBuilder;
6262

63+
private string _groupingDiscriminator;
64+
65+
private readonly object _groupingDiscriminatorLock = new object();
66+
6367
private class BugsnagLogHandler : ILogHandler
6468
{
6569

@@ -426,7 +430,8 @@ private void NotifyOnMainThread(Error[] exceptions, HandledState handledState, F
426430
SessionTracking.CurrentSession,
427431
Configuration.ApiKey,
428432
featureFlags,
429-
correlation);
433+
correlation,
434+
GetGroupingDiscriminator());
430435

431436
//Check for adding project packages to an android java error event
432437
if (ShouldAddProjectPackagesToEvent(@event))
@@ -606,6 +611,25 @@ public void SetUser(string id, string email, string name)
606611
NativeClient.SetUser(_cachedUser);
607612
}
608613

614+
public string SetGroupingDiscriminator(string groupingDiscriminator)
615+
{
616+
lock (_groupingDiscriminatorLock)
617+
{
618+
var previousValue = _groupingDiscriminator;
619+
_groupingDiscriminator = groupingDiscriminator;
620+
NativeClient.SetGroupingDiscriminator(groupingDiscriminator);
621+
return previousValue;
622+
}
623+
}
624+
625+
public string GetGroupingDiscriminator()
626+
{
627+
lock (_groupingDiscriminatorLock)
628+
{
629+
return _groupingDiscriminator;
630+
}
631+
}
632+
609633
public void AddFeatureFlag(string name, string variant = null)
610634
{
611635
NativeClient.AddFeatureFlag(name, variant);

0 commit comments

Comments
 (0)