diff --git a/CHANGELOG.md b/CHANGELOG.md index f3bb776c95..e4407ac703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ### Fixes +- Fix `Gpu.vendorId` should be a String ([#2343](https://github.com/getsentry/sentry-java/pull/2343)) + +## 6.7.0 + +### Fixes + - Use correct set-cookie for the HTTP Client response object ([#2326](https://github.com/getsentry/sentry-java/pull/2326)) - Fix NoSuchElementException in CircularFifoQueue when cloning a Scope ([#2328](https://github.com/getsentry/sentry-java/pull/2328)) diff --git a/gradle.properties b/gradle.properties index 2e18ff33a7..ca951053ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.parallel=true android.useAndroidX=true # Release information -versionName=6.7.0-alpha.1 +versionName=6.7.0 # Override the SDK name on native crashes on Android sentryAndroidSdkName=sentry.native.android diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api index 4e0eb07b90..46bef17ca4 100644 --- a/sentry/api/sentry.api +++ b/sentry/api/sentry.api @@ -2570,7 +2570,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; @@ -2582,7 +2582,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 bb718c0e8d..e00462fff6 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(@Nullable 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 60ec6872af..675d911f1f 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 f7883fc91f..28a959a7cb 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) diff --git a/sentry/src/test/resources/json/contexts.json b/sentry/src/test/resources/json/contexts.json index 24c46e4669..153bd67c66 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 9286cd52a3..efa4a9e262 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 a97c2d22f5..13d72e5f75 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 becbbcdcd7..027cbd710d 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 4efa4fdd44..4e3b661457 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 1cc93370c6..a17d89159a 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 99db883709..2afdc99180 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",