Skip to content

Commit 5d65a7e

Browse files
trasktrask
committed
script groovy
1 parent 66592be commit 5d65a7e

File tree

5 files changed

+73
-79
lines changed

5 files changed

+73
-79
lines changed

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ package io.opentelemetry.instrumentation.awssdk.v2_2
77

88
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil
99
import io.opentelemetry.instrumentation.test.InstrumentationSpecification
10-
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes
11-
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes
12-
import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes
13-
import io.opentelemetry.semconv.ServerAttributes
1410
import io.opentelemetry.semconv.HttpAttributes
11+
import io.opentelemetry.semconv.ServerAttributes
1512
import io.opentelemetry.semconv.UrlAttributes
13+
import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes
14+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes
15+
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes
1616
import io.opentelemetry.testing.internal.armeria.common.HttpResponse
1717
import io.opentelemetry.testing.internal.armeria.common.HttpStatus
1818
import io.opentelemetry.testing.internal.armeria.common.MediaType
19+
import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension
1920
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
2021
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
2122
import software.amazon.awssdk.core.client.builder.SdkClientBuilder
@@ -24,15 +25,14 @@ import software.amazon.awssdk.regions.Region
2425
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
2526
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
2627
import software.amazon.awssdk.services.dynamodb.model.*
27-
import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension
2828
import spock.lang.Shared
2929
import spock.lang.Unroll
3030

3131
import java.util.concurrent.Future
3232

3333
import static com.google.common.collect.ImmutableMap.of
3434
import static io.opentelemetry.api.trace.SpanKind.CLIENT
35-
35+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable
3636

3737
@Unroll
3838
abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
@@ -150,7 +150,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
150150
"$AwsIncubatingAttributes.AWS_REQUEST_ID" "$requestId"
151151
"aws.table.name" "sometable"
152152
"$DbIncubatingAttributes.DB_SYSTEM" "dynamodb"
153-
"$DbIncubatingAttributes.DB_OPERATION" "CreateTable"
153+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "CreateTable"
154154
"aws.dynamodb.global_secondary_indexes" "[{\"IndexName\":\"globalIndex\",\"KeySchema\":[{\"AttributeName\":\"attribute\"}],\"ProvisionedThroughput\":{\"ReadCapacityUnits\":10,\"WriteCapacityUnits\":12}},{\"IndexName\":\"globalIndexSecondary\",\"KeySchema\":[{\"AttributeName\":\"attributeSecondary\"}],\"ProvisionedThroughput\":{\"ReadCapacityUnits\":7,\"WriteCapacityUnits\":8}}]"
155155
"aws.dynamodb.provisioned_throughput.read_capacity_units" "1"
156156
"aws.dynamodb.provisioned_throughput.write_capacity_units" "1"
@@ -183,7 +183,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
183183
"$AwsIncubatingAttributes.AWS_REQUEST_ID" "$requestId"
184184
"aws.table.name" "sometable"
185185
"$DbIncubatingAttributes.DB_SYSTEM" "dynamodb"
186-
"$DbIncubatingAttributes.DB_OPERATION" "Query"
186+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "Query"
187187
"aws.dynamodb.limit" "10"
188188
"aws.dynamodb.select" "ALL_ATTRIBUTES"
189189
}
@@ -215,7 +215,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
215215
"$AwsIncubatingAttributes.AWS_REQUEST_ID" "$requestId"
216216
"aws.table.name" "sometable"
217217
"$DbIncubatingAttributes.DB_SYSTEM" "dynamodb"
218-
"$DbIncubatingAttributes.DB_OPERATION" "${operation}"
218+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "${operation}"
219219
}
220220
}
221221
}

‎instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import spring.jpa.PersistenceConfig
1414

1515
import static io.opentelemetry.api.trace.SpanKind.CLIENT
1616
import static io.opentelemetry.api.trace.SpanKind.INTERNAL
17+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable
1718

1819
class SpringJpaTest extends AgentInstrumentationSpecification {
1920

@@ -62,12 +63,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
6263
childOf span(1)
6364
attributes {
6465
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
65-
"$DbIncubatingAttributes.DB_NAME" "test"
66+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
6667
"$DbIncubatingAttributes.DB_USER" "sa"
6768
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
68-
"$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName(.*)from Customer(.*)/
69-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
70-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
69+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName(.*)from Customer(.*)/
70+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
71+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
7172
}
7273
}
7374
span(3) {
@@ -118,11 +119,11 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
118119
childOf span(1)
119120
attributes {
120121
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
121-
"$DbIncubatingAttributes.DB_NAME" "test"
122+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
122123
"$DbIncubatingAttributes.DB_USER" "sa"
123-
"$DbIncubatingAttributes.DB_STATEMENT" "call next value for Customer_SEQ"
124+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" "call next value for Customer_SEQ"
124125
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
125-
"$DbIncubatingAttributes.DB_OPERATION" "CALL"
126+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "CALL"
126127
}
127128
}
128129
span(3) {
@@ -139,12 +140,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
139140
childOf span(3)
140141
attributes {
141142
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
142-
"$DbIncubatingAttributes.DB_NAME" "test"
143+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
143144
"$DbIncubatingAttributes.DB_USER" "sa"
144145
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
145-
"$DbIncubatingAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/
146-
"$DbIncubatingAttributes.DB_OPERATION" "INSERT"
147-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
146+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/insert into Customer \(.*\) values \(.*\)/
147+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "INSERT"
148+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
148149
}
149150
}
150151
} else {
@@ -154,12 +155,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
154155
childOf span(1)
155156
attributes {
156157
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
157-
"$DbIncubatingAttributes.DB_NAME" "test"
158+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
158159
"$DbIncubatingAttributes.DB_USER" "sa"
159160
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
160-
"$DbIncubatingAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/
161-
"$DbIncubatingAttributes.DB_OPERATION" "INSERT"
162-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
161+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/insert into Customer \(.*\) values \(.*\)/
162+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "INSERT"
163+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
163164
}
164165
}
165166
span(3) {
@@ -209,12 +210,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
209210
kind CLIENT
210211
attributes {
211212
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
212-
"$DbIncubatingAttributes.DB_NAME" "test"
213+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
213214
"$DbIncubatingAttributes.DB_USER" "sa"
214215
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
215-
"$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
216-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
217-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
216+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
217+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
218+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
218219
}
219220
}
220221
span(3) {
@@ -230,12 +231,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
230231
kind CLIENT
231232
attributes {
232233
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
233-
"$DbIncubatingAttributes.DB_NAME" "test"
234+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
234235
"$DbIncubatingAttributes.DB_USER" "sa"
235236
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
236-
"$DbIncubatingAttributes.DB_STATEMENT" ~/update Customer set firstName=\?,(.*)lastName=\? where id=\?/
237-
"$DbIncubatingAttributes.DB_OPERATION" "UPDATE"
238-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
237+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/update Customer set firstName=\?,(.*)lastName=\? where id=\?/
238+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "UPDATE"
239+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
239240
}
240241
}
241242
}
@@ -273,12 +274,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
273274
childOf span(1)
274275
attributes {
275276
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
276-
"$DbIncubatingAttributes.DB_NAME" "test"
277+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
277278
"$DbIncubatingAttributes.DB_USER" "sa"
278279
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
279-
"$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/
280-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
281-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
280+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/
281+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
282+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
282283
}
283284
}
284285
}
@@ -317,12 +318,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
317318
childOf span(1)
318319
attributes {
319320
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
320-
"$DbIncubatingAttributes.DB_NAME" "test"
321+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
321322
"$DbIncubatingAttributes.DB_USER" "sa"
322323
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
323-
"$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
324-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
325-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
324+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
325+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
326+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
326327
}
327328
}
328329
}
@@ -342,12 +343,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
342343
childOf span(1)
343344
attributes {
344345
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
345-
"$DbIncubatingAttributes.DB_NAME" "test"
346+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
346347
"$DbIncubatingAttributes.DB_USER" "sa"
347348
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
348-
"$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
349-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
350-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
349+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
350+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
351+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
351352
}
352353
}
353354
}
@@ -372,12 +373,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
372373
kind CLIENT
373374
attributes {
374375
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
375-
"$DbIncubatingAttributes.DB_NAME" "test"
376+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
376377
"$DbIncubatingAttributes.DB_USER" "sa"
377378
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
378-
"$DbIncubatingAttributes.DB_STATEMENT" "delete from Customer where id=?"
379-
"$DbIncubatingAttributes.DB_OPERATION" "DELETE"
380-
"$DbIncubatingAttributes.DB_SQL_TABLE" "Customer"
379+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" "delete from Customer where id=?"
380+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "DELETE"
381+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "Customer"
381382
}
382383
}
383384
}

‎instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import scala.concurrent.duration.Duration
1616
import spock.lang.Shared
1717

1818
import static io.opentelemetry.api.trace.SpanKind.CLIENT
19+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable
1920

2021
class RediscalaClientTest extends AgentInstrumentationSpecification {
2122

@@ -91,7 +92,7 @@ class RediscalaClientTest extends AgentInstrumentationSpecification {
9192
kind CLIENT
9293
attributes {
9394
"$DbIncubatingAttributes.DB_SYSTEM" "redis"
94-
"$DbIncubatingAttributes.DB_OPERATION" "SET"
95+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SET"
9596
}
9697
}
9798
}
@@ -126,7 +127,7 @@ class RediscalaClientTest extends AgentInstrumentationSpecification {
126127
childOf span(0)
127128
attributes {
128129
"$DbIncubatingAttributes.DB_SYSTEM" "redis"
129-
"$DbIncubatingAttributes.DB_OPERATION" "SET"
130+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SET"
130131
}
131132
}
132133
span(2) {
@@ -135,7 +136,7 @@ class RediscalaClientTest extends AgentInstrumentationSpecification {
135136
childOf span(0)
136137
attributes {
137138
"$DbIncubatingAttributes.DB_SYSTEM" "redis"
138-
"$DbIncubatingAttributes.DB_OPERATION" "GET"
139+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "GET"
139140
}
140141
}
141142
}

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@ import io.opentelemetry.api.trace.SpanKind
99
import io.opentelemetry.context.Context
1010
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
1111
import io.opentelemetry.instrumentation.test.utils.PortUtils
12+
import io.opentelemetry.semconv.*
1213
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes
13-
import io.opentelemetry.semconv.ServerAttributes
14-
import io.opentelemetry.semconv.ClientAttributes
15-
import io.opentelemetry.semconv.UserAgentAttributes
16-
import io.opentelemetry.semconv.HttpAttributes
17-
import io.opentelemetry.semconv.NetworkAttributes
18-
import io.opentelemetry.semconv.UrlAttributes
1914
import io.opentelemetry.testing.internal.armeria.client.WebClient
2015
import io.opentelemetry.testing.internal.armeria.common.HttpRequest
2116
import io.opentelemetry.testing.internal.armeria.common.HttpRequestBuilder
@@ -29,6 +24,7 @@ import static VertxReactiveWebServer.TEST_REQUEST_ID_ATTRIBUTE
2924
import static VertxReactiveWebServer.TEST_REQUEST_ID_PARAMETER
3025
import static io.opentelemetry.api.trace.SpanKind.CLIENT
3126
import static io.opentelemetry.api.trace.SpanKind.SERVER
27+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable
3228
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS
3329

3430
class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
@@ -99,12 +95,12 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
9995
childOf span(2)
10096
attributes {
10197
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
102-
"$DbIncubatingAttributes.DB_NAME" "test"
98+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
10399
"$DbIncubatingAttributes.DB_USER" "SA"
104100
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
105-
"$DbIncubatingAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products"
106-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
107-
"$DbIncubatingAttributes.DB_SQL_TABLE" "products"
101+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" "SELECT id, name, price, weight FROM products"
102+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
103+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "products"
108104
}
109105
}
110106
}
@@ -199,12 +195,12 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
199195
childOf(span(3))
200196
attributes {
201197
"$DbIncubatingAttributes.DB_SYSTEM" "hsqldb"
202-
"$DbIncubatingAttributes.DB_NAME" "test"
198+
"${maybeStable(DbIncubatingAttributes.DB_NAME)}" "test"
203199
"$DbIncubatingAttributes.DB_USER" "SA"
204200
"$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:"
205-
"$DbIncubatingAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products"
206-
"$DbIncubatingAttributes.DB_OPERATION" "SELECT"
207-
"$DbIncubatingAttributes.DB_SQL_TABLE" "products"
201+
"${maybeStable(DbIncubatingAttributes.DB_STATEMENT)}" "SELECT id AS request$requestId, name, price, weight FROM products"
202+
"${maybeStable(DbIncubatingAttributes.DB_OPERATION)}" "SELECT"
203+
"${maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)}" "products"
208204
}
209205
}
210206
}

0 commit comments

Comments
 (0)