open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable flaky test (#10360)

This commit is contained in:
Lauri Tulmin 2024-01-31 12:23:40 +02:00 committed by GitHub
parent f52a3b404a
commit 7bc2b7ba90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
View File

@ -59,6 +59,8 @@ dependencies {
} }
tasks.withType<Test>().configureEach { tasks.withType<Test>().configureEach {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
// TODO run tests both with and without experimental span attributes // TODO run tests both with and without experimental span attributes
jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true")

7
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
View File

@ -7,8 +7,10 @@ package springdata
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.SemanticAttributes
import org.junit.jupiter.api.Assumptions
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared import spock.lang.Shared
import spock.util.environment.Jvm
import java.lang.reflect.InvocationHandler import java.lang.reflect.InvocationHandler
import java.lang.reflect.Method import java.lang.reflect.Method
@ -48,7 +50,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat
} }
void close() { void close() {
applicationContext.close() applicationContext?.close()
} }
@Override @Override
@ -58,6 +60,9 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat
} }
def setup() { def setup() {
// when running on jdk 21 this test occasionally fails with timeout
Assumptions.assumeTrue(Boolean.getBoolean("testLatestDeps") || !Jvm.getCurrent().isJava21Compatible())
repo.refresh() repo.refresh()
clearExportedData() clearExportedData()
runWithSpan("delete") { runWithSpan("delete") {