Skip to content

Commit 8c20770

Browse files
Update dependency org.matrix.rustcomponents:sdk-android to v26.2.16 (#6211)
* Update dependency org.matrix.rustcomponents:sdk-android to v26.2.16 * Fix log rotation breaking changes. The new values match iOS (element-hq/element-x-ios#5108) * Fix `aRustRoomInfo()` test fixture --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io>
1 parent b8865d5 commit 8c20770

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ class DefaultBugReporterTest {
429429
assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs/server.org")
430430
assertThat((param as WriteToFilesConfiguration.Enabled).filenamePrefix).isEqualTo("logs")
431431
assertThat((param as WriteToFilesConfiguration.Enabled).numberOfFiles).isEqualTo(168)
432-
assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo("log")
432+
assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo(".log")
433433
}
434434

435435
@OptIn(ExperimentalCoroutinesApi::class)
@@ -491,7 +491,7 @@ class DefaultBugReporterTest {
491491
assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs")
492492
assertThat((param as WriteToFilesConfiguration.Enabled).filenamePrefix).isEqualTo("logs")
493493
assertThat((param as WriteToFilesConfiguration.Enabled).numberOfFiles).isEqualTo(168)
494-
assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo("log")
494+
assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo(".log")
495495
}
496496

497497
@Test

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
176176
# https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
177177
# All new features should not be implemented in the pull request that upgrades the version, developers should
178178
# only fix API breaks and may add some TODOs.
179-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.2.10"
179+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.2.16"
180180

181181
# Others
182182
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sealed interface WriteToFilesConfiguration {
1515
val filenamePrefix: String,
1616
val numberOfFiles: Int?,
1717
) : WriteToFilesConfiguration {
18-
// DO NOT CHANGE: suffix *MUST* be "log" for the rageshake server to not rename the file to something generic
19-
val filenameSuffix = "log"
18+
// DO NOT CHANGE: suffix *MUST* be ".log" for the rageshake server to not rename the file to something generic
19+
val filenameSuffix = ".log"
2020
}
2121
}

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package io.element.android.libraries.matrix.impl.tracing
1010

1111
import dev.zacsweers.metro.AppScope
1212
import dev.zacsweers.metro.ContributesBinding
13+
import io.element.android.libraries.core.data.ByteUnit
14+
import io.element.android.libraries.core.data.megaBytes
1315
import io.element.android.libraries.core.meta.BuildMeta
1416
import io.element.android.libraries.matrix.api.tracing.LogLevel
1517
import io.element.android.libraries.matrix.api.tracing.TracingConfiguration
@@ -49,7 +51,10 @@ private fun WriteToFilesConfiguration.toTracingFileConfiguration(): TracingFileC
4951
path = directory,
5052
filePrefix = filenamePrefix,
5153
fileSuffix = filenameSuffix,
52-
maxFiles = numberOfFiles?.toULong(),
54+
// Have at max 100MB of logs in disk
55+
maxTotalSizeBytes = 100.megaBytes.into(ByteUnit.BYTES).toULong(),
56+
// Store up to 7 days of logs
57+
maxAgeSeconds = (7 * 24 * 60 * 60).toULong(),
5358
)
5459
}
5560
}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ internal fun aRustRoomInfo(
5858
successorRoom: SuccessorRoom? = null,
5959
roomVersion: String? = "11",
6060
privilegedCreatorsRole: Boolean = false,
61+
serviceMembers: List<String> = emptyList(),
6162
) = RoomInfo(
6263
id = id,
6364
displayName = displayName,
@@ -94,4 +95,5 @@ internal fun aRustRoomInfo(
9495
successorRoom = successorRoom,
9596
roomVersion = roomVersion,
9697
privilegedCreatorsRole = privilegedCreatorsRole,
98+
serviceMembers = serviceMembers,
9799
)

0 commit comments

Comments
 (0)