Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/workflows/spring-boot-2-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,16 @@ jobs:
./gradlew \
:sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
:sentry-samples:sentry-samples-spring-boot-opentelemetry:testClasses \
:sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:shadowJar \
:sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:testClasses \
:sentry-samples:sentry-samples-spring:war \
:sentry-samples:sentry-samples-spring:testClasses \
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble

- name: Test sentry-spring-boot integration suites
run: ./gradlew :sentry-spring-boot:integrationTest :sentry-spring-boot:integrationTestWebflux
run: |
./gradlew \
:sentry-spring-boot:integrationTest \
:sentry-spring-boot:integrationTestWebflux \
:sentry-spring-boot:integrationTestOtelNoAgent

- name: Test sentry-samples-spring-boot-opentelemetry agent init true
run: |
Expand All @@ -100,13 +102,6 @@ jobs:
--agent true \
--auto-init "false"

- name: Test sentry-samples-spring-boot-opentelemetry-noagent
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-opentelemetry-noagent" \
--agent false \
--auto-init "true"

- name: Test sentry-samples-spring
run: |
python3 test/system-test-runner.py test \
Expand Down
22 changes: 3 additions & 19 deletions .github/workflows/spring-boot-3-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,8 @@ jobs:
- name: Build sample artifacts
run: |
./gradlew \
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:bootJar \
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:testClasses \
:sentry-samples:sentry-samples-spring-jakarta:war \
:sentry-samples:sentry-samples-spring-jakarta:testClasses \
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
:sentry-samples:sentry-samples-spring-jakarta:testClasses

- name: Test sentry-spring-boot-jakarta integration suites
run: |
Expand All @@ -84,21 +81,8 @@ jobs:
:sentry-spring-boot-jakarta:integrationTestWebflux \
:sentry-spring-boot-jakarta:integrationTestOtelNoAgent \
:sentry-spring-boot-jakarta:integrationTestLog4j2 \
:sentry-spring-boot-jakarta:integrationTestOtelAgent

- name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init true
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-jakarta-opentelemetry" \
--agent true \
--auto-init "true"

- name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init false
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-jakarta-opentelemetry" \
--agent true \
--auto-init "false"
:sentry-spring-boot-jakarta:integrationTestOtelAgent \
:sentry-spring-boot-jakarta:integrationTestOtelAgentWithoutAutoInit

- name: Test sentry-samples-spring-jakarta
run: |
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/system-tests-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
sample: [ "sentry-samples-spring-boot-opentelemetry-noagent" ]
sample: [ "sentry-samples-console" ]
agent: [ "false" ]
agent-auto-init: [ "true" ]
include:
Expand All @@ -34,15 +34,6 @@ jobs:
- sample: "sentry-samples-spring-boot-opentelemetry"
agent: "true"
agent-auto-init: "false"
- sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
agent: "true"
agent-auto-init: "true"
- sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
agent: "true"
agent-auto-init: "false"
- sample: "sentry-samples-console"
agent: "false"
agent-auto-init: "true"
- sample: "sentry-samples-console-otlp"
agent: "false"
agent-auto-init: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {
alias(libs.plugins.spring.dependency.management)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
id("io.sentry.systemtest")
}

group = "io.sentry.sample.spring-boot-jakarta"
Expand Down Expand Up @@ -61,17 +60,6 @@ dependencies {
// database query tracing
implementation(projects.sentryJdbc)
runtimeOnly(libs.hsqldb)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sample test task finds no tests

Medium Severity

This sample no longer has test sources or test dependencies, and DummyTest is gone. Gradle's Test task still fails when it discovers no tests (failOnNoDiscoveredTests defaults to true and is not overridden). check on this project, or a root check that includes samples, will fail.

Fix in Cursor Fix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bugbot

Reviewed by Cursor Bugbot for commit 574efe9. Configure here.

testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(projects.sentrySystemTestSupport)
testImplementation(libs.apollo3.kotlin)
testImplementation(libs.kotlin.test.junit)
testImplementation(libs.slf4j2.api)
testImplementation(libs.springboot3.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation("ch.qos.logback:logback-classic:1.5.16")
testImplementation("ch.qos.logback:logback-core:1.5.16")
}

tasks.register<BootRun>("bootRunWithAgent").configure {
Expand Down Expand Up @@ -105,25 +93,3 @@ tasks.register<BootRun>("bootRunWithAgent").configure {

jvmArgs = listOf("-Dotel.javaagent.debug=true", "-javaagent:$agentJarPath")
}

// The runner launches this sample with -javaagent, so track the agent jar as a systemTest input.
sentrySystemTest { usesOpenTelemetryAgent = true }

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

maxParallelForks = 1

filter { includeTestsMatching("io.sentry.systemtest*") }
}

tasks.named("test").configure {
require(this is Test)

filter { excludeTestsMatching("io.sentry.systemtest.*") }
}

This file was deleted.

This file was deleted.

Loading
Loading