Merge pull request #373 from bugsnag/main

Sync next & main

Author: lemnik

CHANGELOG.md

@@ -1,4 +1,4 @@
-## TDB
+## 1.13.0 (2025-04-24)
 
 ### Changes
 

bugsnag-android-performance/src/main/kotlin/com/bugsnag/android/performance/BugsnagPerformance.kt

@@ -33,7 +33,7 @@ import java.net.URL
  * @see [start]
  */
 public object BugsnagPerformance {
-    public const val VERSION: String = "1.12.0"
+    public const val VERSION: String = "1.13.0"
 
     @get:JvmName("getInstrumentedAppState\$internal")
     internal val instrumentedAppState = InstrumentedAppState()

bugsnag-android-performance/src/test/java/com/bugsnag/android/performance/ContextAwareScheduledThreadPoolExecutorTest.kt

@@ -5,6 +5,7 @@ import com.bugsnag.android.performance.internal.SpanFactory
 import com.bugsnag.android.performance.test.CollectingSpanProcessor
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertSame
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -13,6 +14,7 @@ import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowPausedSystemClock
 import java.lang.Thread.sleep
 import java.util.concurrent.Callable
+import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
 @RunWith(RobolectricTestRunner::class)
@@ -79,12 +81,14 @@ class ContextAwareScheduledThreadPoolExecutorTest {
     fun scheduleWithFixedDelay() {
         val scheduledExecutor = ContextAwareScheduledThreadPoolExecutor(1)
         var startTime = SystemClock.elapsedRealtime()
+        val countDownLatch = CountDownLatch(2)
         spanFactory.createCustomSpan("parent").use {
             scheduledExecutor.scheduleWithFixedDelay(
                 {
                     startTime += 100L
                     SystemClock.setCurrentTimeMillis(startTime)
                     spanFactory.createCustomSpan("child").end()
+                    countDownLatch.countDown()
                 },
                 0L,
                 100L,
@@ -95,8 +99,7 @@ class ContextAwareScheduledThreadPoolExecutorTest {
             sleep(75L)
         }
 
-        // allow task to run once more
-        sleep(75L)
+        assertTrue(countDownLatch.await(500L, TimeUnit.MILLISECONDS))
         scheduledExecutor.shutdownNow()
 
         val collectedSpans = spanProcessor.toList()
@@ -109,12 +112,14 @@ class ContextAwareScheduledThreadPoolExecutorTest {
     fun scheduleAtFixedRate() {
         val scheduledExecutor = ContextAwareScheduledThreadPoolExecutor(1)
         var startTime = SystemClock.elapsedRealtime()
+        val countDownLatch = CountDownLatch(2)
         spanFactory.createCustomSpan("parent").use {
             scheduledExecutor.scheduleAtFixedRate(
                 {
                     startTime += 100L
                     SystemClock.setCurrentTimeMillis(startTime)
                     spanFactory.createCustomSpan("child").end()
+                    countDownLatch.countDown()
                 },
                 0L,
                 100L,
@@ -125,8 +130,7 @@ class ContextAwareScheduledThreadPoolExecutorTest {
             sleep(75L)
         }
 
-        // allow task to run once more
-        sleep(75L)
+        assertTrue(countDownLatch.await(500L, TimeUnit.MILLISECONDS))
         scheduledExecutor.shutdownNow()
 
         val collectedSpans = spanProcessor.toList()

examples/performance-example/app/build.gradle

@@ -53,9 +53,9 @@ android {
 }
 
 dependencies {
-    implementation "com.bugsnag:bugsnag-android-performance:1.12.0"
-    implementation "com.bugsnag:bugsnag-android-performance-okhttp:1.12.0"
-    implementation "com.bugsnag:bugsnag-android-performance-compose:1.12.0"
+    implementation "com.bugsnag:bugsnag-android-performance:1.13.0"
+    implementation "com.bugsnag:bugsnag-android-performance-okhttp:1.13.0"
+    implementation "com.bugsnag:bugsnag-android-performance-compose:1.13.0"
 
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.5.1'

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.bugsnag
-VERSION_NAME=1.12.0
+VERSION_NAME=1.13.0
 
 POM_SCM_URL=https://github.com/bugsnag/bugsnag-android-performance
 POM_SCM_CONNECTION=scm:[email protected]:bugsnag/bugsnag-android-performance.git

gradle/release.gradle

@@ -11,11 +11,8 @@ project.afterEvaluate {
     publishing {
         repositories {
             maven {
-                if (VERSION_NAME.contains("SNAPSHOT")) {
-                    url "https://oss.sonatype.org/content/repositories/snapshots/"
-                } else {
-                    url "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                }
+                name = 'ossrhStaging'
+                url = "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"
                 credentials {
                     username = project.hasProperty("NEXUS_USERNAME") ? "$NEXUS_USERNAME" : System.getenv("NEXUS_USERNAME")
                     password = project.hasProperty("NEXUS_PASSWORD") ? "$NEXUS_PASSWORD" : System.getenv("NEXUS_PASSWORD")