Skip to content

Commit d2264da

Browse files
richardelmsrichardelms
authored
Merge pull request #144 from bugsnag/next
Release v1.6.1
2 parents d51d4d4 + 912d375 commit d2264da

File tree

10 files changed

+98
-11
lines changed

10 files changed

+98
-11
lines changed

‎.buildkite/pipeline.full.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ steps:
4242
- '*-mazerunner.log'
4343
- 'clear_cache.log'
4444
- maze_output/metrics.csv
45+
test-collector#v1.10.2:
46+
files: "reports/TEST-*.xml"
47+
format: "junit"
48+
branch: "^main|next$$"
4549
commands:
4650
- features/scripts/run-macos-ci-tests.sh release
4751

@@ -80,6 +84,10 @@ steps:
8084
- '*-mazerunner.log'
8185
- 'clear_cache.log'
8286
- maze_output/metrics.csv
87+
test-collector#v1.10.2:
88+
files: "reports/TEST-*.xml"
89+
format: "junit"
90+
branch: "^main|next$$"
8391
commands:
8492
- features/scripts/run-macos-ci-tests.sh release
8593

@@ -122,6 +130,10 @@ steps:
122130
- '*-mazerunner.log'
123131
- 'clear_cache.log'
124132
- maze_output/metrics.csv
133+
test-collector#v1.10.2:
134+
files: "reports/TEST-*.xml"
135+
format: "junit"
136+
branch: "^main|next$$"
125137
commands:
126138
- features/scripts/run-windows-ci-tests.sh release
127139

@@ -164,6 +176,10 @@ steps:
164176
- '*-mazerunner.log'
165177
- 'clear_cache.log'
166178
- maze_output/metrics.csv
179+
test-collector#v1.10.2:
180+
files: "reports/TEST-*.xml"
181+
format: "junit"
182+
branch: "^main|next$$"
167183
commands:
168184
- features/scripts/run-windows-ci-tests.sh release
169185

@@ -212,6 +228,10 @@ steps:
212228
- '--no-tunnel'
213229
- '--aws-public-ip'
214230
- '--fail-fast'
231+
test-collector#v1.10.2:
232+
files: "reports/TEST-*.xml"
233+
format: "junit"
234+
branch: "^main|next$$"
215235
concurrency: 25
216236
concurrency_group: bitbar
217237
concurrency_method: eager
@@ -261,6 +281,10 @@ steps:
261281
- '--no-tunnel'
262282
- '--aws-public-ip'
263283
- '--fail-fast'
284+
test-collector#v1.10.2:
285+
files: "reports/TEST-*.xml"
286+
format: "junit"
287+
branch: "^main|next$$"
264288
concurrency: 25
265289
concurrency_group: bitbar
266290
concurrency_method: eager
@@ -332,6 +356,10 @@ steps:
332356
- '--no-tunnel'
333357
- '--aws-public-ip'
334358
- '--fail-fast'
359+
test-collector#v1.10.2:
360+
files: "reports/TEST-*.xml"
361+
format: "junit"
362+
branch: "^main|next$$"
335363
concurrency: 25
336364
concurrency_group: bitbar
337365
concurrency_method: eager
@@ -403,6 +431,10 @@ steps:
403431
- '--no-tunnel'
404432
- '--aws-public-ip'
405433
- '--fail-fast'
434+
test-collector#v1.10.2:
435+
files: "reports/TEST-*.xml"
436+
format: "junit"
437+
branch: "^main|next$$"
406438
concurrency: 25
407439
concurrency_group: bitbar
408440
concurrency_method: eager
@@ -445,6 +477,10 @@ steps:
445477
- '*-mazerunner.log'
446478
- 'clear_cache.log'
447479
- maze_output/metrics.csv
480+
test-collector#v1.10.2:
481+
files: "reports/TEST-*.xml"
482+
format: "junit"
483+
branch: "^main|next$$"
448484
commands:
449485
- features/scripts/run-webgl-ci-tests.sh dev
450486

@@ -525,6 +561,10 @@ steps:
525561
- '*-mazerunner.log'
526562
- 'clear_cache.log'
527563
- maze_output/metrics.csv
564+
test-collector#v1.10.2:
565+
files: "reports/TEST-*.xml"
566+
format: "junit"
567+
branch: "^main|next$$"
528568
commands:
529569
- features/scripts/run-macos-ci-tests.sh dev
530570

@@ -573,6 +613,10 @@ steps:
573613
- '--no-tunnel'
574614
- '--aws-public-ip'
575615
- '--fail-fast'
616+
test-collector#v1.10.2:
617+
files: "reports/TEST-*.xml"
618+
format: "junit"
619+
branch: "^main|next$$"
576620
concurrency: 25
577621
concurrency_group: bitbar
578622
concurrency_method: eager
@@ -643,6 +687,10 @@ steps:
643687
- '--no-tunnel'
644688
- '--aws-public-ip'
645689
- '--fail-fast'
690+
test-collector#v1.10.2:
691+
files: "reports/TEST-*.xml"
692+
format: "junit"
693+
branch: "^main|next$$"
646694
concurrency: 25
647695
concurrency_group: bitbar
648696
concurrency_method: eager

‎.buildkite/pipeline.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ steps:
7070
- '*-mazerunner.log'
7171
- 'clear_cache.log'
7272
- maze_output/metrics.csv
73+
test-collector#v1.10.2:
74+
files: "reports/TEST-*.xml"
75+
format: "junit"
76+
branch: "^main|next$$"
7377
commands:
7478
- features/scripts/run-webgl-ci-tests.sh release
7579

@@ -112,6 +116,10 @@ steps:
112116
- '*-mazerunner.log'
113117
- 'clear_cache.log'
114118
- maze_output/metrics.csv
119+
test-collector#v1.10.2:
120+
files: "reports/TEST-*.xml"
121+
format: "junit"
122+
branch: "^main|next$$"
115123
commands:
116124
- features/scripts/run-windows-ci-tests.sh release
117125

@@ -150,6 +158,10 @@ steps:
150158
- '*-mazerunner.log'
151159
- 'clear_cache.log'
152160
- maze_output/metrics.csv
161+
test-collector#v1.10.2:
162+
files: "reports/TEST-*.xml"
163+
format: "junit"
164+
branch: "^main|next$$"
153165
commands:
154166
- features/scripts/run-macos-ci-tests.sh release
155167

@@ -198,6 +210,10 @@ steps:
198210
- '--no-tunnel'
199211
- '--aws-public-ip'
200212
- '--fail-fast'
213+
test-collector#v1.10.2:
214+
files: "reports/TEST-*.xml"
215+
format: "junit"
216+
branch: "^main|next$$"
201217
concurrency: 25
202218
concurrency_group: bitbar
203219
concurrency_method: eager
@@ -268,6 +284,10 @@ steps:
268284
- '--no-tunnel'
269285
- '--aws-public-ip'
270286
- '--fail-fast'
287+
test-collector#v1.10.2:
288+
files: "reports/TEST-*.xml"
289+
format: "junit"
290+
branch: "^main|next$$"
271291
concurrency: 25
272292
concurrency_group: bitbar
273293
concurrency_method: eager

‎BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Delivery.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private IEnumerator PushToServer(TracePayload payload, OnServerResponse onServer
130130
yield break;
131131
}
132132

133-
using (var req = new UnityWebRequest(_config.Endpoint))
133+
using (var req = new UnityWebRequest(_config.GetEndpoint()))
134134
{
135135
foreach (var header in payload.Headers)
136136
{

‎BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Version.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
internal static class Version
44
{
55
//TODO set this using sed or something in the release automation task
6-
public const string VersionString = "1.6.0";
6+
public const string VersionString = "1.6.1";
77
}
88
}

‎BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Models/SpanModel.cs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System;
3+
using UnityEngine.Scripting;
34

45
namespace BugsnagUnityPerformance
56
{
@@ -14,6 +15,7 @@ internal class SpanModel
1415
public string startTimeUnixNano;
1516
public string endTimeUnixNano;
1617
public string parentSpanId;
18+
public int droppedAttributesCount;
1719
public List<AttributeModel> attributes = new List<AttributeModel>();
1820

1921
public SpanModel(Span span, int attributeArrayLengthLimit, int attributeStringValueLimit)
@@ -81,11 +83,7 @@ public SpanModel(Span span, int attributeArrayLengthLimit, int attributeStringVa
8183
attributes.Add(new AttributeModel(attr.Key, new AttributeDoubleValueModel(doubleValue)));
8284
}
8385
}
84-
85-
if (span.DroppedAttributesCount > 0)
86-
{
87-
attributes.Add(new AttributeModel("dropped_attributes_count", new AttributeIntValueModel(span.DroppedAttributesCount)));
88-
}
86+
droppedAttributesCount = span.DroppedAttributesCount;
8987
}
9088

9189
private T[] TruncateArrayIfNeeded<T>(T[] array, int limit, string key, string spanName)
@@ -114,6 +112,13 @@ private string GetNanoSeconds(DateTimeOffset time)
114112
var duration = time - _unixStart;
115113
return (duration.Ticks * 100).ToString();
116114
}
115+
116+
// This method tells Json.NET whether to serialize the droppedAttributesCount or not.
117+
[Preserve]
118+
public bool ShouldSerializedroppedAttributesCount()
119+
{
120+
return droppedAttributesCount > 0;
121+
}
117122
}
118123

119124
}

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## v1.6.1 (2024-10-09)
4+
5+
### Bug Fixes
6+
7+
- Fix an issue where config.Endpoiunt was incorrectly used in the delivery class [#143](https://github.com/bugsnag/bugsnag-unity-performance/pull/143)
8+
9+
- Fix an issue where Span.droppedAttributeCount was incorrectly implemented. [#140](https://github.com/bugsnag/bugsnag-unity-performance/pull/140)
10+
311
## v1.6.0 (2024-09-24)
412

513
### Additions

‎docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ services:
2323
MAZE_ASPECTO_REPEATER_API_KEY:
2424
MAZE_REPEATER_API_KEY:
2525
UNITY_VERSION:
26+
MAZE_NO_FAIL_FAST:
2627
ports:
2728
- "9000-9499:9339"
2829
volumes:
2930
- ./test:/app/test
3031
- ./features/:/app/features
3132
- ./maze_output:/app/maze_output
3233
- /var/run/docker.sock:/var/run/docker.sock
34+
- ./reports/:/app/reports/

‎features/custom_attributes.feature‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Feature: Custom Attributes
5757
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes.5.value.arrayValue.values" is an array with 1000 elements
5858
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes.5.value.arrayValue.values.0.stringValue" equals "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa*** 1 CHARS TRUNCATED"
5959
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0" integer attribute "int1" equals 999
60-
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0" integer attribute "dropped_attributes_count" equals 77
61-
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes" is an array with 132 elements
60+
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.droppedAttributesCount" equals 77
61+
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes" is an array with 131 elements
6262

6363

6464
Scenario: Custom AttributeLimits
@@ -75,8 +75,8 @@ Feature: Custom Attributes
7575
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes.5.value.arrayValue.values" is an array with 2 elements
7676
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes.5.value.arrayValue.values.0.stringValue" equals "aaaaaaaaaa*** 1015 CHARS TRUNCATED"
7777
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0" integer attribute "int1" equals 999
78-
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0" integer attribute "dropped_attributes_count" equals 197
79-
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes" is an array with 12 elements
78+
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.droppedAttributesCount" equals 197
79+
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.attributes" is an array with 11 elements
8080

8181

8282

‎features/manual_spans.feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Feature: Manual creation of spans
1818
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.endTimeUnixNano" matches the regex "^[0-9]+$"
1919
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0" string attribute "net.host.connection.type" equals "wifi"
2020
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0" string attribute "bugsnag.span.category" equals "custom"
21+
* the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.droppedAttributesCount" is null
2122

2223
#Resource attributes
2324
* the trace payload field "resourceSpans.0.resource" string attribute "deployment.environment" is one of:

‎features/support/maze.buildkite.cfg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--format=junit
2+
--out=reports
3+
--format=pretty

0 commit comments

Comments
 (0)