Skip to content

Commit d180230

Browse files
antonisantonis
authored
Merge branch 'main' into antonis/feedback-shake
2 parents 8e2dee3 + a415905 commit d180230

File tree

21 files changed

+675
-321
lines changed

21 files changed

+675
-321
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@
88
- Enable via `options.getFeedbackOptions().setUseShakeGesture(true)`
99
- Uses the device's accelerometer — no special permissions required
1010

11+
### Fixes
12+
13+
- Android: Add proguard rules to prevent error about missing Replay classes ([#5153](https://github.com/getsentry/sentry-java/pull/5153))
14+
1115
## 8.34.0
1216

1317
### Features
1418

19+
- Allow configuring shutdown and session flush timeouts externally ([#4641](https://github.com/getsentry/sentry-java/pull/4641))
20+
- `sentry.properties`: `shutdown-timeout-millis`, `session-flush-timeout-millis`
21+
- Environment variables: `SENTRY_SHUTDOWN_TIMEOUT_MILLIS`, `SENTRY_SESSION_FLUSH_TIMEOUT_MILLIS`
22+
- Spring Boot `application.properties`: `sentry.shutdownTimeoutMillis`, `sentry.sessionFlushTimeoutMillis`
1523
- Add scope-level attributes API ([#5118](https://github.com/getsentry/sentry-java/pull/5118)) via ([#5148](https://github.com/getsentry/sentry-java/pull/5148))
1624
- Automatically include scope attributes in logs and metrics ([#5120](https://github.com/getsentry/sentry-java/pull/5120))
1725
- New APIs are `Sentry.setAttribute`, `Sentry.setAttributes`, `Sentry.removeAttribute`

‎sentry-android-core/proguard-rules.pro‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@
8080
##---------------Begin: proguard configuration for sentry-android-replay ----------
8181
-dontwarn io.sentry.android.replay.ReplayIntegration
8282
-dontwarn io.sentry.android.replay.DefaultReplayBreadcrumbConverter
83+
-dontwarn io.sentry.android.replay.util.MaskRenderer
84+
-dontwarn io.sentry.android.replay.util.ViewsKt
85+
-dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode$Companion
86+
-dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode
8387
-keepnames class io.sentry.android.replay.ReplayIntegration
8488
##---------------End: proguard configuration for sentry-android-replay ----------
8589

‎sentry-android-integration-tests/sentry-uitest-android/proguard-rules.pro‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,4 @@
4040
-dontwarn org.mockito.internal.**
4141
-dontwarn org.jetbrains.annotations.**
4242
-dontwarn io.sentry.android.replay.ReplayIntegration
43-
-dontwarn io.sentry.android.replay.util.MaskRenderer
44-
-dontwarn io.sentry.android.replay.util.ViewsKt
45-
-dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode$Companion
46-
-dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode
4743
-keep class curtains.** { *; }

‎sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import io.sentry.SentryLogLevel
77
import io.sentry.SentryOptions
88
import io.sentry.checkEvent
99
import io.sentry.checkLogs
10+
import io.sentry.test.applyTestOptions
1011
import io.sentry.test.initForTest
1112
import io.sentry.transport.ITransport
1213
import java.time.Instant
@@ -44,6 +45,7 @@ class SentryHandlerTest {
4445
val options = SentryOptions()
4546
options.dsn = "http://key@localhost/proj"
4647
options.setTransportFactory { _, _ -> transport }
48+
applyTestOptions(options)
4749
contextTags?.forEach { options.addContextTag(it) }
4850
logger = Logger.getLogger("jul.SentryHandlerTest")
4951
handler = SentryHandler(options, configureWithLogManager, true)
@@ -415,7 +417,7 @@ class SentryHandlerTest {
415417
fixture = Fixture(minimumLevel = Level.FINEST)
416418
fixture.logger.finest("testing trace level")
417419

418-
Sentry.flush(1000)
420+
Sentry.flush(10)
419421

420422
verify(fixture.transport)
421423
.send(
@@ -431,7 +433,7 @@ class SentryHandlerTest {
431433
fixture = Fixture(minimumLevel = Level.FINE)
432434
fixture.logger.fine("testing trace level")
433435

434-
Sentry.flush(1000)
436+
Sentry.flush(10)
435437

436438
verify(fixture.transport)
437439
.send(checkLogs { event -> assertEquals(SentryLogLevel.DEBUG, event.items.first().level) })
@@ -442,7 +444,7 @@ class SentryHandlerTest {
442444
fixture = Fixture(minimumLevel = Level.CONFIG)
443445
fixture.logger.config("testing debug level")
444446

445-
Sentry.flush(1000)
447+
Sentry.flush(10)
446448

447449
verify(fixture.transport)
448450
.send(checkLogs { event -> assertEquals(SentryLogLevel.DEBUG, event.items.first().level) })
@@ -453,7 +455,7 @@ class SentryHandlerTest {
453455
fixture = Fixture(minimumLevel = Level.INFO)
454456
fixture.logger.info("testing info level")
455457

456-
Sentry.flush(1000)
458+
Sentry.flush(10)
457459

458460
verify(fixture.transport)
459461
.send(checkLogs { event -> assertEquals(SentryLogLevel.INFO, event.items.first().level) })
@@ -464,7 +466,7 @@ class SentryHandlerTest {
464466
fixture = Fixture(minimumLevel = Level.WARNING)
465467
fixture.logger.warning("testing warn level")
466468

467-
Sentry.flush(1000)
469+
Sentry.flush(10)
468470

469471
verify(fixture.transport)
470472
.send(checkLogs { event -> assertEquals(SentryLogLevel.WARN, event.items.first().level) })
@@ -475,7 +477,7 @@ class SentryHandlerTest {
475477
fixture = Fixture(minimumLevel = Level.SEVERE)
476478
fixture.logger.severe("testing error level")
477479

478-
Sentry.flush(1000)
480+
Sentry.flush(10)
479481

480482
verify(fixture.transport)
481483
.send(checkLogs { event -> assertEquals(SentryLogLevel.ERROR, event.items.first().level) })

‎sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class SentryAppenderTest {
248248
val logger = fixture.getSut(minimumLevel = Level.TRACE)
249249
logger.trace("testing trace level")
250250

251-
Sentry.flush(1000)
251+
Sentry.flush(10)
252252

253253
verify(fixture.transport)
254254
.send(
@@ -267,7 +267,7 @@ class SentryAppenderTest {
267267
val logger = fixture.getSut(minimumLevel = Level.DEBUG)
268268
logger.debug("testing debug level")
269269

270-
Sentry.flush(1000)
270+
Sentry.flush(10)
271271

272272
verify(fixture.transport)
273273
.send(checkLogs { event -> assertEquals(SentryLogLevel.DEBUG, event.items.first().level) })
@@ -278,7 +278,7 @@ class SentryAppenderTest {
278278
val logger = fixture.getSut(minimumLevel = Level.INFO)
279279
logger.info("testing info level")
280280

281-
Sentry.flush(1000)
281+
Sentry.flush(10)
282282

283283
verify(fixture.transport)
284284
.send(checkLogs { event -> assertEquals(SentryLogLevel.INFO, event.items.first().level) })
@@ -289,7 +289,7 @@ class SentryAppenderTest {
289289
val logger = fixture.getSut(minimumLevel = Level.WARN)
290290
logger.warn("testing warn level")
291291

292-
Sentry.flush(1000)
292+
Sentry.flush(10)
293293

294294
verify(fixture.transport)
295295
.send(checkLogs { event -> assertEquals(SentryLogLevel.WARN, event.items.first().level) })
@@ -300,7 +300,7 @@ class SentryAppenderTest {
300300
val logger = fixture.getSut(minimumLevel = Level.ERROR)
301301
logger.error("testing error level")
302302

303-
Sentry.flush(1000)
303+
Sentry.flush(10)
304304

305305
verify(fixture.transport)
306306
.send(checkLogs { event -> assertEquals(SentryLogLevel.ERROR, event.items.first().level) })
@@ -311,7 +311,7 @@ class SentryAppenderTest {
311311
val logger = fixture.getSut(minimumLevel = Level.FATAL)
312312
logger.fatal("testing fatal level")
313313

314-
Sentry.flush(1000)
314+
Sentry.flush(10)
315315

316316
verify(fixture.transport)
317317
.send(checkLogs { event -> assertEquals(SentryLogLevel.FATAL, event.items.first().level) })

‎sentry-log4j2/src/test/resources/sentry.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
release=release from sentry.properties
22
logs.enabled=true
3+
shutdown-timeout-millis=0
4+
session-flush-timeout-millis=0

‎sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import io.sentry.SentryLogLevel
1818
import io.sentry.SentryOptions
1919
import io.sentry.checkEvent
2020
import io.sentry.checkLogs
21+
import io.sentry.test.applyTestOptions
2122
import io.sentry.test.initForTest
2223
import io.sentry.transport.ITransport
2324
import java.time.Instant
@@ -68,6 +69,7 @@ class SentryAppenderTest {
6869
options.dsn = dsn
6970
options.isSendDefaultPii = sendDefaultPii
7071
options.logs.isEnabled = enableLogs
72+
applyTestOptions(options)
7173
contextTags?.forEach { options.addContextTag(it) }
7274
appender.setOptions(options)
7375
appender.setMinimumBreadcrumbLevel(minimumBreadcrumbLevel)
@@ -317,7 +319,7 @@ class SentryAppenderTest {
317319
fixture = Fixture(minimumLevel = Level.TRACE, enableLogs = true)
318320
fixture.logger.trace("testing trace level")
319321

320-
Sentry.flush(1000)
322+
Sentry.flush(10)
321323

322324
verify(fixture.transport)
323325
.send(checkLogs { logs -> assertEquals(SentryLogLevel.TRACE, logs.items.first().level) })
@@ -328,7 +330,7 @@ class SentryAppenderTest {
328330
fixture = Fixture(minimumLevel = Level.DEBUG, enableLogs = true)
329331
fixture.logger.debug("testing debug level")
330332

331-
Sentry.flush(1000)
333+
Sentry.flush(10)
332334

333335
verify(fixture.transport)
334336
.send(checkLogs { logs -> assertEquals(SentryLogLevel.DEBUG, logs.items.first().level) })
@@ -339,7 +341,7 @@ class SentryAppenderTest {
339341
fixture = Fixture(minimumLevel = Level.INFO, enableLogs = true)
340342
fixture.logger.info("testing info level")
341343

342-
Sentry.flush(1000)
344+
Sentry.flush(10)
343345

344346
verify(fixture.transport)
345347
.send(checkLogs { logs -> assertEquals(SentryLogLevel.INFO, logs.items.first().level) })
@@ -350,7 +352,7 @@ class SentryAppenderTest {
350352
fixture = Fixture(minimumLevel = Level.WARN, enableLogs = true)
351353
fixture.logger.warn("testing warn level")
352354

353-
Sentry.flush(1000)
355+
Sentry.flush(10)
354356

355357
verify(fixture.transport)
356358
.send(checkLogs { logs -> assertEquals(SentryLogLevel.WARN, logs.items.first().level) })
@@ -361,7 +363,7 @@ class SentryAppenderTest {
361363
fixture = Fixture(minimumLevel = Level.ERROR, enableLogs = true)
362364
fixture.logger.error("testing error level")
363365

364-
Sentry.flush(1000)
366+
Sentry.flush(10)
365367

366368
verify(fixture.transport)
367369
.send(checkLogs { logs -> assertEquals(SentryLogLevel.ERROR, logs.items.first().level) })
@@ -372,7 +374,7 @@ class SentryAppenderTest {
372374
fixture = Fixture(minimumLevel = Level.TRACE, enableLogs = true)
373375
fixture.logger.trace("Testing {} level", "TRACE")
374376

375-
Sentry.flush(1000)
377+
Sentry.flush(10)
376378

377379
verify(fixture.transport)
378380
.send(
@@ -394,7 +396,7 @@ class SentryAppenderTest {
394396
fixture = Fixture(minimumLevel = Level.TRACE, enableLogs = true, encoder = encoder)
395397
fixture.logger.trace("Testing {} level", "TRACE")
396398

397-
Sentry.flush(1000)
399+
Sentry.flush(10)
398400

399401
verify(fixture.transport)
400402
.send(
@@ -420,7 +422,7 @@ class SentryAppenderTest {
420422
)
421423
fixture.logger.trace("Testing {} level", "TRACE")
422424

423-
Sentry.flush(1000)
425+
Sentry.flush(10)
424426

425427
verify(fixture.transport)
426428
.send(
@@ -447,7 +449,7 @@ class SentryAppenderTest {
447449
)
448450
fixture.logger.trace("Testing {} level", "TRACE")
449451

450-
Sentry.flush(1000)
452+
Sentry.flush(10)
451453

452454
verify(fixture.transport)
453455
.send(

0 commit comments

Comments
 (0)