From b8d475306066ec8b7a34958afbe5e82205359445 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 8 Nov 2022 08:27:01 +0100 Subject: [PATCH 1/4] Fix VendorId should be a String --- sentry/api/sentry.api | 4 ++-- sentry/src/main/java/io/sentry/protocol/Gpu.java | 8 ++++---- .../test/java/io/sentry/protocol/GpuSerializationTest.kt | 2 +- sentry/src/test/java/io/sentry/protocol/GpuTest.kt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api index 4d5c9ee87fc..55af4a3b1d5 100644 --- a/sentry/api/sentry.api +++ b/sentry/api/sentry.api @@ -2511,7 +2511,7 @@ public final class io/sentry/protocol/Gpu : io/sentry/JsonSerializable, io/sentr public fun getName ()Ljava/lang/String; public fun getNpotSupport ()Ljava/lang/String; public fun getUnknown ()Ljava/util/Map; - public fun getVendorId ()Ljava/lang/Integer; + public fun getVendorId ()Ljava/lang/String; public fun getVendorName ()Ljava/lang/String; public fun getVersion ()Ljava/lang/String; public fun isMultiThreadedRendering ()Ljava/lang/Boolean; @@ -2523,7 +2523,7 @@ public final class io/sentry/protocol/Gpu : io/sentry/JsonSerializable, io/sentr public fun setName (Ljava/lang/String;)V public fun setNpotSupport (Ljava/lang/String;)V public fun setUnknown (Ljava/util/Map;)V - public fun setVendorId (Ljava/lang/Integer;)V + public fun setVendorId (Ljava/lang/String;)V public fun setVendorName (Ljava/lang/String;)V public fun setVersion (Ljava/lang/String;)V } diff --git a/sentry/src/main/java/io/sentry/protocol/Gpu.java b/sentry/src/main/java/io/sentry/protocol/Gpu.java index bb718c0e8d0..c4a73ff61bc 100644 --- a/sentry/src/main/java/io/sentry/protocol/Gpu.java +++ b/sentry/src/main/java/io/sentry/protocol/Gpu.java @@ -22,7 +22,7 @@ public final class Gpu implements JsonUnknown, JsonSerializable { /** The PCI identifier of the graphics device. */ private @Nullable Integer id; /** The PCI vendor identifier of the graphics device. */ - private @Nullable Integer vendorId; + private @Nullable String vendorId; /** The vendor name as reported by the graphics device. */ private @Nullable String vendorName; /** The total GPU memory available in Megabytes. */ @@ -74,11 +74,11 @@ public void setId(Integer id) { this.id = id; } - public @Nullable Integer getVendorId() { + public @Nullable String getVendorId() { return vendorId; } - public void setVendorId(Integer vendorId) { + public void setVendorId(String vendorId) { this.vendorId = vendorId; } @@ -213,7 +213,7 @@ public static final class Deserializer implements JsonDeserializer { gpu.id = reader.nextIntegerOrNull(); break; case JsonKeys.VENDOR_ID: - gpu.vendorId = reader.nextIntegerOrNull(); + gpu.vendorId = reader.nextStringOrNull(); break; case JsonKeys.VENDOR_NAME: gpu.vendorName = reader.nextStringOrNull(); diff --git a/sentry/src/test/java/io/sentry/protocol/GpuSerializationTest.kt b/sentry/src/test/java/io/sentry/protocol/GpuSerializationTest.kt index 60ec6872afa..675d911f1f9 100644 --- a/sentry/src/test/java/io/sentry/protocol/GpuSerializationTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/GpuSerializationTest.kt @@ -13,7 +13,7 @@ class GpuSerializationTest { fun getSut() = Gpu().apply { name = "d623a6b5-e1ab-4402-931b-c06f5a43a5ae" id = -596576280 - vendorId = 1874778041 + vendorId = "1874778041" vendorName = "d732cf76-07dc-48e2-8920-96d6bfc2439d" memorySize = -1484004451 apiType = "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f" diff --git a/sentry/src/test/java/io/sentry/protocol/GpuTest.kt b/sentry/src/test/java/io/sentry/protocol/GpuTest.kt index f7883fc91f6..28a959a7cbe 100644 --- a/sentry/src/test/java/io/sentry/protocol/GpuTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/GpuTest.kt @@ -26,7 +26,7 @@ class GpuTest { val gpu = Gpu() gpu.name = "name" gpu.id = 10 - gpu.vendorId = 20 + gpu.vendorId = "20" gpu.vendorName = "vendor name" gpu.memorySize = 1024 gpu.apiType = "api type" @@ -40,7 +40,7 @@ class GpuTest { assertEquals("name", clone.name) assertEquals(10, clone.id) - assertEquals(20, clone.vendorId) + assertEquals("20", clone.vendorId) assertEquals("vendor name", clone.vendorName) assertEquals(1024, clone.memorySize) assertEquals("api type", clone.apiType) From 9d9a1912fc26ae6918b33abe4efd49733c524860 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 8 Nov 2022 10:50:27 +0100 Subject: [PATCH 2/4] Update sentry/src/main/java/io/sentry/protocol/Gpu.java Co-authored-by: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com> --- sentry/src/main/java/io/sentry/protocol/Gpu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/src/main/java/io/sentry/protocol/Gpu.java b/sentry/src/main/java/io/sentry/protocol/Gpu.java index c4a73ff61bc..e00462fff6a 100644 --- a/sentry/src/main/java/io/sentry/protocol/Gpu.java +++ b/sentry/src/main/java/io/sentry/protocol/Gpu.java @@ -78,7 +78,7 @@ public void setId(Integer id) { return vendorId; } - public void setVendorId(String vendorId) { + public void setVendorId(@Nullable String vendorId) { this.vendorId = vendorId; } From d522407c13b4929f576f08f5039d2d26d8982a44 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 8 Nov 2022 11:59:50 +0100 Subject: [PATCH 3/4] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6afc58b01c5..61da4daaf29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Fixes + +- Fix `Gpu.vendorId` should be a String ([#2343](https://github.com/getsentry/sentry-java/pull/2343)) + ## 6.7.0 ### Fixes From 9da4645e558bd59b92a2bbf7e5687df6006b1252 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 8 Nov 2022 12:20:47 +0100 Subject: [PATCH 4/4] Fix vendor_id field in json test fixtures --- sentry/src/test/resources/json/contexts.json | 2 +- sentry/src/test/resources/json/gpu.json | 2 +- sentry/src/test/resources/json/sentry_base_event.json | 2 +- sentry/src/test/resources/json/sentry_event.json | 2 +- sentry/src/test/resources/json/sentry_transaction.json | 2 +- .../resources/json/sentry_transaction_legacy_date_format.json | 2 +- .../resources/json/sentry_transaction_no_measurement_unit.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sentry/src/test/resources/json/contexts.json b/sentry/src/test/resources/json/contexts.json index 24c46e4669c..153bd67c665 100644 --- a/sentry/src/test/resources/json/contexts.json +++ b/sentry/src/test/resources/json/contexts.json @@ -64,7 +64,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f", diff --git a/sentry/src/test/resources/json/gpu.json b/sentry/src/test/resources/json/gpu.json index 9286cd52a35..efa4a9e262c 100644 --- a/sentry/src/test/resources/json/gpu.json +++ b/sentry/src/test/resources/json/gpu.json @@ -1,7 +1,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f", diff --git a/sentry/src/test/resources/json/sentry_base_event.json b/sentry/src/test/resources/json/sentry_base_event.json index a97c2d22f54..13d72e5f756 100644 --- a/sentry/src/test/resources/json/sentry_base_event.json +++ b/sentry/src/test/resources/json/sentry_base_event.json @@ -67,7 +67,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f", diff --git a/sentry/src/test/resources/json/sentry_event.json b/sentry/src/test/resources/json/sentry_event.json index becbbcdcd79..027cbd710d5 100644 --- a/sentry/src/test/resources/json/sentry_event.json +++ b/sentry/src/test/resources/json/sentry_event.json @@ -214,7 +214,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f", diff --git a/sentry/src/test/resources/json/sentry_transaction.json b/sentry/src/test/resources/json/sentry_transaction.json index 4efa4fdd44b..4e3b6614578 100644 --- a/sentry/src/test/resources/json/sentry_transaction.json +++ b/sentry/src/test/resources/json/sentry_transaction.json @@ -110,7 +110,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f", diff --git a/sentry/src/test/resources/json/sentry_transaction_legacy_date_format.json b/sentry/src/test/resources/json/sentry_transaction_legacy_date_format.json index 1cc93370c6f..a17d89159a6 100644 --- a/sentry/src/test/resources/json/sentry_transaction_legacy_date_format.json +++ b/sentry/src/test/resources/json/sentry_transaction_legacy_date_format.json @@ -110,7 +110,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f", diff --git a/sentry/src/test/resources/json/sentry_transaction_no_measurement_unit.json b/sentry/src/test/resources/json/sentry_transaction_no_measurement_unit.json index 99db883709a..2afdc991809 100644 --- a/sentry/src/test/resources/json/sentry_transaction_no_measurement_unit.json +++ b/sentry/src/test/resources/json/sentry_transaction_no_measurement_unit.json @@ -102,7 +102,7 @@ { "name": "d623a6b5-e1ab-4402-931b-c06f5a43a5ae", "id": -596576280, - "vendor_id": 1874778041, + "vendor_id": "1874778041", "vendor_name": "d732cf76-07dc-48e2-8920-96d6bfc2439d", "memory_size": -1484004451, "api_type": "95dfc8bc-88ae-4d66-b85f-6c88ad45b80f",