Skip to content

Commit 1afec1d

Browse files
authored
Merge pull request #156 from bugsnag/next
Release v1.8.0
2 parents 0ea5142 + ce7dd66 commit 1afec1d

39 files changed

+741
-86
lines changed

.buildkite/block.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
agents:
2-
queue: opensource
2+
queue: macos
33

44
steps:
55
- block: 'Trigger a full build'
66
key: 'trigger-full-build'
77

88
- label: 'Upload the full test pipeline'
99
depends_on: 'trigger-full-build'
10+
timeout_in_minutes: 2
1011
command: buildkite-agent pipeline upload .buildkite/pipeline.full.yml

.buildkite/pipeline.full.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
agents:
2-
queue: opensource
2+
queue: macos
33

44
steps:
5-
- name: 'Append Unity 2020 Full Pipeline'
5+
- label: 'Append Unity 2020 Full Pipeline'
6+
timeout_in_minutes: 2
67
commands:
78
- buildkite-agent pipeline upload .buildkite/unity.2020.full.yml
89

9-
- name: 'Append Unity 2021 Full Pipeline'
10+
- label: 'Append Unity 2021 Full Pipeline'
11+
timeout_in_minutes: 2
1012
commands:
1113
- buildkite-agent pipeline upload .buildkite/unity.2021.full.yml
1214

13-
- name: 'Append Unity 2022 Full Pipeline'
15+
- label: 'Append Unity 2022 Full Pipeline'
16+
timeout_in_minutes: 2
1417
commands:
1518
- buildkite-agent pipeline upload .buildkite/unity.2022.full.yml
1619

17-
- name: 'Append Unity 6000 Full Pipeline'
20+
- label: 'Append Unity 6000 Full Pipeline'
21+
timeout_in_minutes: 2
1822
commands:
1923
- buildkite-agent pipeline upload .buildkite/unity.6000.full.yml
2024

.buildkite/pipeline.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
aliases:
2-
- &2021 "2021.3.36f1"
2+
- &2021 "2021.3.45f1"
33
- &2020 "2020.3.48f1"
44

55
agents:
66
queue: macos-14
77

88
steps:
99
- label: Build released library artifact
10-
timeout_in_minutes: 30
10+
timeout_in_minutes: 10
1111
key: build-artifacts
1212
env:
1313
UNITY_PERFORMANCE_VERSION: *2020
@@ -22,8 +22,8 @@ steps:
2222
limit: 1
2323

2424
- label: Build size impact reporting
25-
timeout_in_minutes: 10
2625
depends_on: build-artifacts
26+
timeout_in_minutes: 10
2727
env:
2828
UNITY_PERFORMANCE_VERSION: *2021
2929
plugins:
@@ -33,10 +33,15 @@ steps:
3333
commands:
3434
features/scripts/do_size_test.sh
3535

36-
- name: 'Append Unity 2021 Basic Pipeline'
36+
- label: 'Append Unity 2021 Basic Pipeline'
37+
agents:
38+
queue: macos
39+
timeout_in_minutes: 2
3740
commands:
3841
- buildkite-agent pipeline upload .buildkite/unity.2021.yml
3942

4043
- label: Conditionally trigger full set of tests
41-
timeout_in_minutes: 30
44+
agents:
45+
queue: macos
46+
timeout_in_minutes: 2
4247
command: sh -c .buildkite/pipeline_trigger.sh

.buildkite/unity.2020.full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ steps:
9696
limit: 1
9797

9898
- label: ':ios: Build iOS test fixture for Unity 2020'
99-
timeout_in_minutes: 30
99+
timeout_in_minutes: 10
100100
key: build-ios-fixture-2020
101101
depends_on: generate-fixture-project-2020
102102
env:
@@ -125,7 +125,7 @@ steps:
125125
- group: ":test_tube: E2E Tests Unity 2020"
126126
steps:
127127
- label: Run MacOS e2e tests for Unity 2020
128-
timeout_in_minutes: 60
128+
timeout_in_minutes: 30
129129
depends_on: build-macos-fixture-2020
130130
env:
131131
UNITY_PERFORMANCE_VERSION: *2020

.buildkite/unity.2021.full.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
aliases:
2-
- &2021 "2021.3.36f1"
2+
- &2021 "2021.3.45f1"
33

44
agents:
55
queue: macos-14
@@ -8,7 +8,7 @@ steps:
88
- group: ":hammer: Build Unity 2021 Test Fixtures"
99
steps:
1010
- label: ':webgl: Build webgl DEV test fixture for Unity 2021'
11-
timeout_in_minutes: 30
11+
timeout_in_minutes: 15
1212
key: build-webgl-dev-fixture-2021
1313
depends_on: build-artifacts
1414
env:
@@ -52,7 +52,7 @@ steps:
5252
limit: 1
5353

5454
- label: ':macos: Build macos DEV test fixture for Unity 2021'
55-
timeout_in_minutes: 30
55+
timeout_in_minutes: 10
5656
key: build-macos-dev-fixture-2021
5757
depends_on: build-artifacts
5858
env:
@@ -73,7 +73,7 @@ steps:
7373
limit: 1
7474

7575
- label: ':ios: Generate Xcode DEV project - Unity 2021'
76-
timeout_in_minutes: 30
76+
timeout_in_minutes: 10
7777
key: generate-dev-fixture-project-2021
7878
depends_on: build-artifacts
7979
env:
@@ -95,7 +95,7 @@ steps:
9595
limit: 1
9696

9797
- label: ':ios: Build iOS DEV test fixture for Unity 2021'
98-
timeout_in_minutes: 30
98+
timeout_in_minutes: 10
9999
key: build-ios-dev-fixture-2021
100100
depends_on: generate-dev-fixture-project-2021
101101
env:
@@ -119,7 +119,7 @@ steps:
119119
- group: ":test_tube: E2E Tests Unity 2021"
120120
steps:
121121
- label: Run WebGL DEV e2e tests for Unity 2021
122-
timeout_in_minutes: 60
122+
timeout_in_minutes: 20
123123
depends_on: build-webgl-dev-fixture-2021
124124
env:
125125
UNITY_PERFORMANCE_VERSION: *2021
@@ -159,7 +159,7 @@ steps:
159159
- features/scripts/run-windows-ci-tests.sh dev
160160

161161
- label: ':android: Build Android Dev test fixture for Unity 2021'
162-
timeout_in_minutes: 30
162+
timeout_in_minutes: 10
163163
key: build-android-dev-fixture-2021
164164
depends_on: build-artifacts
165165
env:
@@ -181,7 +181,7 @@ steps:
181181
limit: 1
182182

183183
- label: Run MacOS DEV e2e tests for Unity 2021
184-
timeout_in_minutes: 60
184+
timeout_in_minutes: 30
185185
depends_on: build-macos-dev-fixture-2021
186186
env:
187187
UNITY_PERFORMANCE_VERSION: *2021

.buildkite/unity.2021.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
aliases:
2-
- &2021 "2021.3.36f1"
2+
- &2021 "2021.3.45f1"
33

44
agents:
55
queue: macos-14
@@ -8,7 +8,7 @@ steps:
88
- group: ":hammer: Build Unity 2021 Test Fixtures"
99
steps:
1010
- label: ':webgl: Build webgl test fixture for Unity 2021'
11-
timeout_in_minutes: 30
11+
timeout_in_minutes: 10
1212
key: build-webgl-fixture-2021
1313
depends_on: build-artifacts
1414
env:
@@ -73,7 +73,7 @@ steps:
7373
limit: 1
7474

7575
- label: ':android: Build Android test fixture for Unity 2021'
76-
timeout_in_minutes: 30
76+
timeout_in_minutes: 10
7777
key: build-android-fixture-2021
7878
depends_on: build-artifacts
7979
env:
@@ -95,7 +95,7 @@ steps:
9595
limit: 1
9696

9797
- label: ':ios: Generate Xcode project - Unity 2021'
98-
timeout_in_minutes: 30
98+
timeout_in_minutes: 10
9999
key: generate-fixture-project-2021
100100
depends_on: build-artifacts
101101
env:
@@ -117,7 +117,7 @@ steps:
117117
limit: 1
118118

119119
- label: ':ios: Build iOS test fixture for Unity 2021'
120-
timeout_in_minutes: 30
120+
timeout_in_minutes: 10
121121
key: build-ios-fixture-2021
122122
depends_on: generate-fixture-project-2021
123123
env:
@@ -141,7 +141,7 @@ steps:
141141
- group: ":test_tube: E2E Tests Unity 2021"
142142
steps:
143143
- label: Run WebGL e2e tests for Unity 2021
144-
timeout_in_minutes: 60
144+
timeout_in_minutes: 20
145145
depends_on: build-webgl-fixture-2021
146146
env:
147147
UNITY_PERFORMANCE_VERSION: *2021
@@ -185,7 +185,7 @@ steps:
185185
- features/scripts/run-windows-ci-tests.sh release
186186

187187
- label: Run MacOS e2e tests for Unity 2021
188-
timeout_in_minutes: 60
188+
timeout_in_minutes: 30
189189
depends_on: build-macos-fixture-2021
190190
env:
191191
UNITY_PERFORMANCE_VERSION: *2021

.buildkite/unity.2022.full.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
aliases:
2-
- &2022 "2022.3.22f1"
2+
- &2022 "2022.3.57f1"
33

44
agents:
55
queue: macos-14
@@ -8,7 +8,7 @@ steps:
88
- group: ":hammer: Build Unity 2022 Test Fixtures"
99
steps:
1010
- label: ':macos: Build macos test fixture for Unity 2022'
11-
timeout_in_minutes: 30
11+
timeout_in_minutes: 20
1212
key: build-macos-fixture-2022
1313
depends_on: build-artifacts
1414
env:
@@ -52,7 +52,7 @@ steps:
5252
limit: 1
5353

5454
- label: ':android: Build Android test fixture for Unity 2022'
55-
timeout_in_minutes: 30
55+
timeout_in_minutes: 10
5656
key: build-android-fixture-2022
5757
depends_on: build-artifacts
5858
env:
@@ -74,7 +74,7 @@ steps:
7474
limit: 1
7575

7676
- label: ':ios: Generate Xcode project - Unity 2022'
77-
timeout_in_minutes: 30
77+
timeout_in_minutes: 10
7878
key: generate-fixture-project-2022
7979
depends_on: build-artifacts
8080
env:
@@ -96,7 +96,7 @@ steps:
9696
limit: 1
9797

9898
- label: ':ios: Build iOS test fixture for Unity 2022'
99-
timeout_in_minutes: 30
99+
timeout_in_minutes: 10
100100
key: build-ios-fixture-2022
101101
depends_on: generate-fixture-project-2022
102102
env:
@@ -121,7 +121,7 @@ steps:
121121
- group: ":test_tube: E2E Tests Unity 2022"
122122
steps:
123123
- label: Run MacOS e2e tests for Unity 2022
124-
timeout_in_minutes: 60
124+
timeout_in_minutes: 30
125125
depends_on: build-macos-fixture-2022
126126
env:
127127
UNITY_PERFORMANCE_VERSION: *2022

.buildkite/unity.6000.full.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
aliases:
2-
- &6000 "6000.0.25f1"
2+
- &6000 "6000.0.36f1"
33

44
agents:
55
queue: macos-14
@@ -52,7 +52,7 @@ steps:
5252
limit: 1
5353

5454
- label: ':android: Build Android test fixture for Unity 6000'
55-
timeout_in_minutes: 30
55+
timeout_in_minutes: 10
5656
key: build-android-fixture-6000
5757
depends_on: build-artifacts
5858
env:
@@ -74,7 +74,7 @@ steps:
7474
limit: 1
7575

7676
- label: ':ios: Generate Xcode project - Unity 6000'
77-
timeout_in_minutes: 30
77+
timeout_in_minutes: 10
7878
key: generate-fixture-project-6000
7979
depends_on: build-artifacts
8080
env:
@@ -96,7 +96,7 @@ steps:
9696
limit: 1
9797

9898
- label: ':ios: Build iOS test fixture for Unity 6000'
99-
timeout_in_minutes: 30
99+
timeout_in_minutes: 10
100100
key: build-ios-fixture-6000
101101
depends_on: generate-fixture-project-6000
102102
env:
@@ -121,7 +121,7 @@ steps:
121121
- group: ":test_tube: E2E Tests Unity 6000"
122122
steps:
123123
- label: Run MacOS e2e tests for Unity 6000
124-
timeout_in_minutes: 60
124+
timeout_in_minutes: 30
125125
depends_on: build-macos-fixture-6000
126126
env:
127127
UNITY_PERFORMANCE_VERSION: *6000

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ features/fixtures/minimalapp/minimal_without_xcode
2929
features/fixtures/mazerunner/mazerunner_macos_BackUpThisFolder_ButDontShipItWithYourGame
3030
BugsnagPerformance/.vscode
3131
features/fixtures/mazerunner/Assets/Bugsnag
32+
features/fixtures/mazerunner/.vscode
33+
.DS_Store
34+
maze_output.zip

BugsnagPerformance/Assets/BugsnagPerformance/Editor/BugsnagPerformanceEditor.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ public class BugsnagPerformanceEditor : EditorWindow
99

1010
public Texture DarkIcon, LightIcon;
1111

12+
bool _showEnabledMetrics;
13+
1214
private void OnEnable()
1315
{
1416
titleContent.text = "BugSnag Performance";
@@ -103,6 +105,7 @@ private void DrawSettingsEditorWindow()
103105
DrawIntPropertyWithDefault(so, "AttributeArrayLengthLimit", "AttributeArrayLengthLimit", PerformanceConfiguration.DEFAULT_ATTRIBUTE_ARRAY_LENGTH_LIMIT);
104106
DrawIntPropertyWithDefault(so, "AttributeCountLimit", "AttributeCountLimit", PerformanceConfiguration.DEFAULT_ATTRIBUTE_COUNT_LIMIT);
105107
DrawIntPropertyWithDefault(so, "AttributeStringValueLimit", "AttributeStringValueLimit", PerformanceConfiguration.DEFAULT_ATTRIBUTE_STRING_VALUE_LIMIT);
108+
EditorGUILayout.PropertyField(so.FindProperty("AutoInstrumentRendering"));
106109
EditorGUILayout.PropertyField(so.FindProperty("AutoInstrumentAppStart"));
107110
EditorGUILayout.PropertyField(so.FindProperty("Endpoint"));
108111
EditorGUILayout.PropertyField(so.FindProperty("ServiceName"));

0 commit comments

Comments
 (0)