Skip to content

Commit 3fc9623

Browse files
committed
Fix flaky unit tests
1 parent 221442d commit 3fc9623

File tree

3 files changed

+6
-44
lines changed

3 files changed

+6
-44
lines changed

gcp-auth-extension/build.gradle.kts

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ dependencies {
5555
tasks {
5656
test {
5757
useJUnitPlatform()
58+
// Unset relevant environment variables to provide a clean state for the tests
59+
environment("GOOGLE_CLOUD_PROJECT", "")
60+
environment("GOOGLE_CLOUD_QUOTA_PROJECT", "")
5861
// exclude integration test
5962
exclude("io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.class")
6063
}
@@ -127,34 +130,7 @@ tasks.register<Test>("IntegrationTestUserCreds") {
127130
"-Dotel.metrics.exporter=none",
128131
"-Dotel.logs.exporter=none",
129132
"-Dotel.exporter.otlp.protocol=http/protobuf",
130-
"-Dmockserver.logLevel=off"
131-
)
132-
}
133-
134-
tasks.register<Test>("IntegrationTestServiceAccountCreds") {
135-
dependsOn(tasks.shadowJar)
136-
dependsOn(tasks.named("copyAgent"))
137-
138-
useJUnitPlatform()
139-
// include only the integration test file
140-
include("io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.class")
141-
142-
val fakeCredsFilePath = project.file("src/test/resources/fake_service_account_creds.json").absolutePath
143-
144-
environment("GOOGLE_CLOUD_QUOTA_PROJECT", "quota-project-id")
145-
environment("GOOGLE_APPLICATION_CREDENTIALS", fakeCredsFilePath)
146-
jvmArgs = listOf(
147-
"-javaagent:$javaAgentJarPath",
148-
"-Dotel.javaagent.extensions=$authExtensionJarPath",
149-
"-Dgoogle.cloud.project=my-gcp-project",
150-
"-Dotel.java.global-autoconfigure.enabled=true",
151-
"-Dotel.exporter.otlp.endpoint=http://localhost:4318",
152-
"-Dotel.resource.providers.gcp.enabled=true",
153-
"-Dotel.traces.exporter=otlp",
154-
"-Dotel.bsp.schedule.delay=2000",
155-
"-Dotel.metrics.exporter=none",
156-
"-Dotel.logs.exporter=none",
157-
"-Dotel.exporter.otlp.protocol=http/protobuf",
158-
"-Dmockserver.logLevel=off"
133+
"-Dotel.javaagent.debug=false",
134+
"-Dmockserver.logLevel=trace"
159135
)
160136
}

gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ public static void setup() throws NoSuchAlgorithmException, KeyManagementExcepti
8989
// Set up mock OTLP backend server to which traces will be exported
9090
backendServer = ClientAndServer.startClientAndServer(EXPORTER_ENDPOINT_PORT);
9191
backendServer.when(request()).respond(response().withStatusCode(200));
92-
93-
// Set up the mock gcp metadata server to provide fake credentials
9492
String accessTokenResponse =
9593
"{\"access_token\": \"fake.access_token\",\"expires_in\": 3600, \"token_type\": \"Bearer\"}";
94+
9695
mockGcpOAuth2Server = ClientAndServer.startClientAndServer(MOCK_GCP_OAUTH2_PORT);
9796

9897
MockServerClient mockServerClient =

gcp-auth-extension/src/test/resources/fake_service_account_creds.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)