getsentry
diff --git a/‎build.gradle.kts‎
Lines changed: 3 additions & 1 deletion b/‎build.gradle.kts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎buildSrc/src/main/java/MergeSpringMetadataAction.kt‎
Lines changed: 292 additions & 0 deletions b/‎buildSrc/src/main/java/MergeSpringMetadataAction.kt‎
Lines changed: 292 additions & 0 deletions
diff --git a/‎gradle/libs.versions.toml‎
Lines changed: 2 additions & 2 deletions b/‎gradle/libs.versions.toml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎sentry-android-core/src/test/java/io/sentry/android/core/anr/AnrProfilingIntegrationTest.kt‎
Lines changed: 1 addition & 1 deletion b/‎sentry-android-core/src/test/java/io/sentry/android/core/anr/AnrProfilingIntegrationTest.kt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts‎
Lines changed: 2 additions & 0 deletions b/‎sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts‎
Lines changed: 2 additions & 0 deletions b/‎sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts‎
Lines changed: 13 additions & 1 deletion b/‎sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts‎
Lines changed: 5 additions & 0 deletions b/‎sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts‎
Lines changed: 5 additions & 0 deletions
@@ -87,7 +87,9 @@ apiValidation {
             "test-app-sentry",
             "test-app-size",
             "sentry-samples-netflix-dgs",
-            "sentry-samples-console-otlp"
+            "sentry-samples-console-otlp",
+            "sentry-test-support",
+            "sentry-system-test-support"
         )
     )
 }
 
@@ -0,0 +1,292 @@
+import java.net.URI
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import java.util.LinkedHashSet
+import java.util.zip.ZipFile
+import org.gradle.api.Action
+import org.gradle.api.Task
+import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+/**
+ * Patches a built shadow JAR by merging Spring metadata and service descriptor files from the
+ * runtime classpath into the final archive.
+ *
+ * Spring metadata files do not all share the same merge semantics, so this action merges
+ * `spring.factories` as list properties, `.imports` files as line-based metadata, and other Spring
+ * metadata as key/value properties. It also deduplicates service-provider configuration entries
+ * under `META-INF/services` so the flat executable JAR keeps the runtime registrations it needs.
+ */
+class MergeSpringMetadataAction(
+    private val runtimeClasspath: FileCollection,
+    private val springMetadataFiles: List<String>,
+) : Action<Task> {
+    companion object {
+        val DEFAULT_SPRING_METADATA_FILES =
+            listOf(
+                "META-INF/spring.factories",
+                "META-INF/spring.handlers",
+                "META-INF/spring.schemas",
+                "META-INF/spring-autoconfigure-metadata.properties",
+                "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports",
+                "META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports",
+            )
+    }
+
+    override fun execute(task: Task) {
+        val archiveTask = task as AbstractArchiveTask
+        val jar = archiveTask.archiveFile.get().asFile
+        val runtimeJars = runtimeClasspath.files.filter { it.name.endsWith(".jar") }
+        val uri = URI.create("jar:${jar.toURI()}")
+
+        FileSystems.newFileSystem(uri, mapOf("create" to "false")).use { fs ->
+            springMetadataFiles.forEach { entryPath ->
+                val target = fs.getPath(entryPath)
+                val contents = mutableListOf<String>()
+
+                if (Files.exists(target)) {
+                    contents.add(Files.readString(target))
+                }
+
+                runtimeJars.forEach { depJar ->
+                    try {
+                        ZipFile(depJar).use { zip ->
+                            val entry = zip.getEntry(entryPath)
+                            if (entry != null) {
+                                contents.add(zip.getInputStream(entry).bufferedReader().readText())
+                            }
+                        }
+                    } catch (_: Exception) {
+                        // Ignore non-zip files on the runtime classpath.
+                    }
+                }
+
+                val merged =
+                    when {
+                        entryPath == "META-INF/spring.factories" -> mergeListProperties(contents)
+                        entryPath.endsWith(".imports") -> mergeLineBasedMetadata(contents)
+                        else -> mergeMapProperties(contents)
+                    }
+
+                if (merged.isNotEmpty()) {
+                    if (target.parent != null) {
+                        Files.createDirectories(target.parent)
+                    }
+                    Files.write(target, merged.toByteArray())
+                }
+            }
+
+            val serviceEntries = linkedSetOf<String>()
+
+            runtimeJars.forEach { depJar ->
+                try {
+                    ZipFile(depJar).use { zip ->
+                        val entries = zip.entries()
+                        while (entries.hasMoreElements()) {
+                            val entry = entries.nextElement()
+                            if (!entry.isDirectory && entry.name.startsWith("META-INF/services/")) {
+                                serviceEntries.add(entry.name)
+                            }
+                        }
+                    }
+                } catch (_: Exception) {
+                    // Ignore non-zip files on the runtime classpath.
+                }
+            }
+
+            serviceEntries.forEach { entryPath ->
+                val providers = LinkedHashSet<String>()
+                val target = fs.getPath(entryPath)
+
+                if (Files.exists(target)) {
+                    Files.newBufferedReader(target).useLines { lines ->
+                        lines.forEach { line ->
+                            val provider = line.trim()
+                            if (provider.isNotEmpty() && !provider.startsWith("#")) {
+                                providers.add(provider)
+                            }
+                        }
+                    }
+                }
+
+                runtimeJars.forEach { depJar ->
+                    try {
+                        ZipFile(depJar).use { zip ->
+                            val entry = zip.getEntry(entryPath)
+                            if (entry != null) {
+                                zip.getInputStream(entry).bufferedReader().useLines { lines ->
+                                    lines.forEach { line ->
+                                        val provider = line.trim()
+                                        if (provider.isNotEmpty() && !provider.startsWith("#")) {
+                                            providers.add(provider)
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } catch (_: Exception) {
+                        // Ignore non-zip files on the runtime classpath.
+                    }
+                }
+
+                if (providers.isNotEmpty()) {
+                    if (target.parent != null) {
+                        Files.createDirectories(target.parent)
+                    }
+                    Files.write(target, providers.joinToString(separator = "\n", postfix = "\n").toByteArray())
+                }
+            }
+        }
+    }
+
+    private fun mergeLineBasedMetadata(contents: List<String>): String {
+        val lines = LinkedHashSet<String>()
+
+        contents.forEach { content ->
+            content.lineSequence().forEach { rawLine ->
+                val line = rawLine.trim()
+                if (line.isNotEmpty() && !line.startsWith("#")) {
+                    lines.add(line)
+                }
+            }
+        }
+
+        return if (lines.isEmpty()) "" else lines.joinToString(separator = "\n", postfix = "\n")
+    }
+
+    private fun mergeMapProperties(contents: List<String>): String {
+        val merged = linkedMapOf<String, String>()
+
+        contents.forEach { content ->
+            parseProperties(content).forEach { (key, value) ->
+                merged[key] = value
+            }
+        }
+
+        return if (merged.isEmpty()) {
+            ""
+        } else {
+            merged.entries.joinToString(separator = "\n", postfix = "\n") { (key, value) -> "$key=$value" }
+        }
+    }
+
+    private fun mergeListProperties(contents: List<String>): String {
+        val merged = linkedMapOf<String, LinkedHashSet<String>>()
+
+        contents.forEach { content ->
+            parseProperties(content).forEach { (key, value) ->
+                val values = merged.getOrPut(key) { LinkedHashSet() }
+                value
+                    .split(',')
+                    .map(String::trim)
+                    .filter(String::isNotEmpty)
+                    .forEach(values::add)
+            }
+        }
+
+        return if (merged.isEmpty()) {
+            ""
+        } else {
+            merged.entries.joinToString(separator = "\n", postfix = "\n") { (key, values) ->
+                "$key=${values.joinToString(separator = ",")}"
+            }
+        }
+    }
+
+    private fun parseProperties(content: String): List<Pair<String, String>> {
+        val logicalLines = mutableListOf<String>()
+        val current = StringBuilder()
+
+        content.lineSequence().forEach { rawLine ->
+            val line = rawLine.trim()
+            if (current.isEmpty() && (line.isEmpty() || line.startsWith("#") || line.startsWith("!"))) {
+                return@forEach
+            }
+
+            val normalized = if (current.isEmpty()) line else line.trimStart()
+            current.append(
+                if (endsWithContinuation(rawLine)) normalized.dropLast(1) else normalized,
+            )
+
+            if (!endsWithContinuation(rawLine)) {
+                logicalLines.add(current.toString())
+                current.setLength(0)
+            }
+        }
+
+        if (current.isNotEmpty()) {
+            logicalLines.add(current.toString())
+        }
+
+        return logicalLines.map { line ->
+            val separatorIndex = findSeparatorIndex(line)
+            if (separatorIndex < 0) {
+                line to ""
+            } else {
+                val keyEnd = trimTrailingWhitespace(line, separatorIndex)
+                val valueStart = findValueStart(line, separatorIndex)
+                line.substring(0, keyEnd) to line.substring(valueStart).trim()
+            }
+        }
+    }
+
+    private fun endsWithContinuation(line: String): Boolean {
+        var backslashCount = 0
+
+        for (index in line.length - 1 downTo 0) {
+            if (line[index] == '\\') {
+                backslashCount++
+            } else {
+                break
+            }
+        }
+
+        return backslashCount % 2 == 1
+    }
+
+    private fun findSeparatorIndex(line: String): Int {
+        var backslashCount = 0
+
+        line.forEachIndexed { index, char ->
+            if (char == '\\') {
+                backslashCount++
+            } else {
+                val isEscaped = backslashCount % 2 == 1
+                if (!isEscaped && (char == '=' || char == ':' || char.isWhitespace())) {
+                    return index
+                }
+                backslashCount = 0
+            }
+        }
+
+        return -1
+    }
+
+    private fun trimTrailingWhitespace(line: String, endExclusive: Int): Int {
+        var end = endExclusive
+
+        while (end > 0 && line[end - 1].isWhitespace()) {
+            end--
+        }
+
+        return end
+    }
+
+    private fun findValueStart(line: String, separatorIndex: Int): Int {
+        var valueStart = separatorIndex
+
+        while (valueStart < line.length && line[valueStart].isWhitespace()) {
+            valueStart++
+        }
+
+        if (valueStart < line.length && (line[valueStart] == '=' || line[valueStart] == ':')) {
+            valueStart++
+        }
+
+        while (valueStart < line.length && line[valueStart].isWhitespace()) {
+            valueStart++
+        }
+
+        return valueStart
+    }
+}
@@ -61,14 +61,13 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
 jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
 vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
-springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
 springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" }
 springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" }
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
 gretty = { id = "org.gretty", version = "4.0.0" }
 animalsniffer = { id = "ru.vyarus.animalsniffer", version = "2.0.1" }
 sentry = { id = "io.sentry.android.gradle", version = "6.0.0-alpha.6"}
-shadow = { id = "com.gradleup.shadow", version = "8.3.6" }
+shadow = { id = "com.gradleup.shadow", version = "9.4.1" }
 
 [libraries]
 apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
@@ -159,6 +158,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
 slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
 spotlessLib = { module = "com.diffplug.spotless:com.diffplug.spotless.gradle.plugin", version.ref = "spotless"}
+springboot2-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springboot2" }
 springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
 springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
 springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }
 
@@ -174,7 +174,7 @@ class AnrProfilingIntegrationTest {
 
     val integration = AnrProfilingIntegration()
     integration.register(mockScopes, androidOptions)
-    integration.onForeground()
+    // Drive the state machine synchronously to avoid racing the background polling thread.
 
     SystemClock.setCurrentTimeMillis(1_000)
     integration.checkMainThread(mainThread)
 
@@ -81,6 +81,8 @@ android {
   lint {
     warningsAsErrors = true
     checkDependencies = true
+    // Suppress OldTargetApi: lint 8.13.1 expects API 37 but we target 36
+    disable += "OldTargetApi"
 
     // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
     checkReleaseBuilds = false
 
@@ -74,6 +74,8 @@ android {
   lint {
     warningsAsErrors = true
     checkDependencies = true
+    // Suppress OldTargetApi: lint 8.13.1 expects API 37 but we target 36
+    disable += "OldTargetApi"
 
     // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
     checkReleaseBuilds = false
 
@@ -152,7 +152,19 @@ tasks {
 
     duplicatesStrategy = DuplicatesStrategy.FAIL
 
-    mergeServiceFiles { include("inst/META-INF/services/*") }
+    filesMatching("META-INF/services/**") { duplicatesStrategy = DuplicatesStrategy.INCLUDE }
+    filesMatching("inst/META-INF/services/**") { duplicatesStrategy = DuplicatesStrategy.INCLUDE }
+
+    // Shadow 9.x only applies relocations to service files handled by a ServiceFileTransformer.
+    // We need two mergeServiceFiles calls:
+    // 1. Default path (META-INF/services) — ensures bootstrap service files get relocated
+    //    (e.g., ContextStorageProvider → shaded path). Without this, Shadow 9.x skips
+    //    relocation for service file names/contents not claimed by a transformer.
+    // 2. inst/ path — merges isolated agent service files from both the upstream agent
+    //    and the distro libs. Uses `path` instead of `include` filter because Shadow 9.x's
+    //    include() strips the `inst/` prefix on output.
+    mergeServiceFiles()
+    mergeServiceFiles { path = "inst/META-INF/services" }
     exclude("**/module-info.class")
     relocatePackages(this)
 
 
@@ -48,6 +48,7 @@ dependencies {
 tasks.shadowJar {
   manifest { attributes["Main-Class"] = "io.sentry.samples.console.Main" }
   archiveClassifier.set("") // Remove the classifier so it replaces the regular JAR
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
 }
 
@@ -66,6 +67,10 @@ tasks.register<Test>("systemTest").configure {
   group = "verification"
   description = "Runs the System tests"
 
+  val test = project.extensions.getByType<SourceSetContainer>()["test"]
+  testClassesDirs = test.output.classesDirs
+  classpath = test.runtimeClasspath
+
   outputs.upToDateWhen { false }
 
   maxParallelForks = 1
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ apiValidation {`
`87`	`87`	`"test-app-sentry",`
`88`	`88`	`"test-app-size",`
`89`	`89`	`"sentry-samples-netflix-dgs",`
`90`		`- "sentry-samples-console-otlp"`
	`90`	`+ "sentry-samples-console-otlp",`
	`91`	`+ "sentry-test-support",`
	`92`	`+ "sentry-system-test-support"`
`91`	`93`	`)`
`92`	`94`	`)`
`93`	`95`	`}`