Skip to content

Convert gcp-auth-extension to use test suites #2342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 14, 2025
Merged

Convert gcp-auth-extension to use test suites #2342

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d0db38
Convert gcp-auth-extension to use test suites
trask Oct 10, 2025
a892757
Merge remote-tracking branch 'upstream/main' into test-suites-gcp-auth
trask Oct 14, 2025
bb8e740
Merge remote-tracking branch 'upstream/main' into test-suites-gcp-auth
trask Oct 14, 2025
ff504b3
fix
trask Oct 14, 2025
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
91 changes: 51 additions & 40 deletions gcp-auth-extension/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,59 @@ dependencies {
agent("io.opentelemetry.javaagent:opentelemetry-javaagent")
}

tasks {
test {
useJUnitPlatform()
// Unset relevant environment variables to provide a clean state for the tests
environment("GOOGLE_CLOUD_PROJECT", "")
environment("GOOGLE_CLOUD_QUOTA_PROJECT", "")
// exclude integration test
exclude("io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.class")
testing {
suites {
val test by getting(JvmTestSuite::class) {
targets.all {
testTask.configure {
// Unset relevant environment variables to provide a clean state for the tests
environment("GOOGLE_CLOUD_PROJECT", "")
environment("GOOGLE_CLOUD_QUOTA_PROJECT", "")
// exclude integration test
exclude("io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.class")
}
}
}

val integrationTestUserCreds by registering(JvmTestSuite::class) {
dependencies {
implementation(project())
}

targets.all {
testTask.configure {
dependsOn(tasks.shadowJar)
dependsOn(tasks.named("copyAgent"))

// include only the integration test file
include("io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.class")

val fakeCredsFilePath = project.file("src/test/resources/fake_user_creds.json").absolutePath

environment("GOOGLE_CLOUD_QUOTA_PROJECT", "quota-project-id")
environment("GOOGLE_APPLICATION_CREDENTIALS", fakeCredsFilePath)
jvmArgs(
"-javaagent:$javaAgentJarPath",
"-Dotel.javaagent.extensions=$authExtensionJarPath",
"-Dgoogle.cloud.project=my-gcp-project",
"-Dotel.java.global-autoconfigure.enabled=true",
"-Dotel.exporter.otlp.endpoint=http://localhost:4318",
"-Dotel.resource.providers.gcp.enabled=true",
"-Dotel.traces.exporter=otlp",
"-Dotel.bsp.schedule.delay=2000",
"-Dotel.metrics.exporter=none",
"-Dotel.logs.exporter=none",
"-Dotel.exporter.otlp.protocol=http/protobuf",
"-Dotel.javaagent.debug=false",
"-Dmockserver.logLevel=trace"
)
}
}
}
}
}

tasks {
shadowJar {
/**
* Shaded version of this extension is required when using it as a OpenTelemetry Java Agent
Expand Down Expand Up @@ -101,35 +144,3 @@ tasks.register<Copy>("copyAgent") {
rename("opentelemetry-javaagent(.*).jar", "otel-agent.jar")
})
}

tasks.register<Test>("IntegrationTestUserCreds") {
Copy link
Member Author

Choose a reason for hiding this comment

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

noticed that this test wasn't running in the build, but fixing in different PR: #2344

testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

dependsOn(tasks.shadowJar)
dependsOn(tasks.named("copyAgent"))

useJUnitPlatform()
// include only the integration test file
include("io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.class")

val fakeCredsFilePath = project.file("src/test/resources/fake_user_creds.json").absolutePath

environment("GOOGLE_CLOUD_QUOTA_PROJECT", "quota-project-id")
environment("GOOGLE_APPLICATION_CREDENTIALS", fakeCredsFilePath)
jvmArgs = listOf(
"-javaagent:$javaAgentJarPath",
"-Dotel.javaagent.extensions=$authExtensionJarPath",
"-Dgoogle.cloud.project=my-gcp-project",
"-Dotel.java.global-autoconfigure.enabled=true",
"-Dotel.exporter.otlp.endpoint=http://localhost:4318",
"-Dotel.resource.providers.gcp.enabled=true",
"-Dotel.traces.exporter=otlp",
"-Dotel.bsp.schedule.delay=2000",
"-Dotel.metrics.exporter=none",
"-Dotel.logs.exporter=none",
"-Dotel.exporter.otlp.protocol=http/protobuf",
"-Dotel.javaagent.debug=false",
"-Dmockserver.logLevel=trace"
)
}
Loading