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

Revert workaround for a spock bug (#6154)

This commit is contained in:
Lauri Tulmin 2022-06-13 23:12:45 +03:00 committed by GitHub
parent b992e894bc
commit 1c388d46fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy
View File

@ -24,12 +24,7 @@ class SnsCamelTest extends AgentInstrumentationSpecification {
String queueName = "snsCamelTest"
def camelApp = new CamelSpringApp(awsConnector, SnsConfig, ImmutableMap.of("topicName", topicName, "queueName", queueName))
// TODO: def (queueUrl, topicArn) fails to compile, switch back when this is fixed in spock
// https://github.com/spockframework/spock/pull/1333
// def (queueUrl, topicArn) = setupTestInfrastructure(queueName, topicName)
Tuple tuple = setupTestInfrastructure(queueName, topicName)
def queueUrl = tuple.get(0)
def topicArn = tuple.get(1)
def (queueUrl, topicArn) = setupTestInfrastructure(queueName, topicName)
waitAndClearSetupTraces(queueUrl, queueName)
when:
@ -66,12 +61,7 @@ class SnsCamelTest extends AgentInstrumentationSpecification {
String queueName = "snsCamelTest"
def camelApp = new CamelSpringApp(awsConnector, SnsConfig, ImmutableMap.of("topicName", topicName, "queueName", queueName))
// TODO: def (queueUrl, topicArn) fails to compile, switch back when this is fixed in spock
// https://github.com/spockframework/spock/pull/1333
// def (queueUrl, topicArn) = setupTestInfrastructure(queueName, topicName)
Tuple tuple = setupTestInfrastructure(queueName, topicName)
def queueUrl = tuple.get(0)
def topicArn = tuple.get(1)
def (queueUrl, topicArn) = setupTestInfrastructure(queueName, topicName)
waitAndClearSetupTraces(queueUrl, queueName)
when:

7
instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy
View File

@ -495,10 +495,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification {
connection = driver.connect(jdbcUrl, null)
}
// TODO: def (Statement statement, ResultSet rs) fails to compile, switch back when this is fixed in spock
// https://github.com/spockframework/spock/pull/1333
// def (Statement statement, ResultSet rs) = runWithSpan("parent") {
Tuple tuple = runWithSpan("parent") {
def (Statement statement, ResultSet rs) = runWithSpan("parent") {
if (prepareStatement) {
def stmt = connection.prepareStatement(query)
return new Tuple(stmt, stmt.executeQuery())
@ -507,8 +504,6 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification {
def stmt = connection.createStatement()
return new Tuple(stmt, stmt.executeQuery(query))
}
Statement statement = tuple.get(0)
ResultSet rs = tuple.get(1)
then:
rs.next()