Skip to content

Commit ab5b07b

Browse files
lauritlaurit
committed
fix tests
1 parent 92c3aed commit ab5b07b

File tree

69 files changed

+497
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+497
-362
lines changed

Diff for: ‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) {
2828
((ExtendedDoubleHistogramBuilder) builder)
2929
.setAttributesAdvice(
3030
asList(
31-
DbClientCommonAttributesExtractor.DB_SYSTEM,
31+
DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
3232
SqlClientAttributesExtractor.DB_COLLECTION_NAME,
3333
DbClientCommonAttributesExtractor.DB_NAMESPACE,
3434
DbClientAttributesExtractor.DB_OPERATION_NAME,

Diff for: ‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ void shouldExtractAllAvailableAttributes() {
8484
assertThat(startAttributes.build())
8585
.containsOnly(
8686
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
87+
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
8788
entry(DbIncubatingAttributes.DB_USER, "username"),
8889
entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
8990
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
@@ -104,7 +105,7 @@ void shouldExtractAllAvailableAttributes() {
104105
} else if (SemconvStability.emitStableDatabaseSemconv()) {
105106
assertThat(startAttributes.build())
106107
.containsOnly(
107-
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
108+
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
108109
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
109110
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
110111
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));

Diff for: ‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void collectsMetrics() {
4242

4343
Attributes operationAttributes =
4444
Attributes.builder()
45-
.put(DbClientCommonAttributesExtractor.DB_SYSTEM, "myDb")
45+
.put(DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb")
4646
.put(SqlClientAttributesExtractor.DB_COLLECTION_NAME, "table")
4747
.put(DbClientCommonAttributesExtractor.DB_NAMESPACE, "potatoes")
4848
.put(DbClientAttributesExtractor.DB_OPERATION_NAME, "SELECT")
@@ -89,7 +89,7 @@ void collectsMetrics() {
8989
.hasSum(0.15 /* seconds */)
9090
.hasAttributesSatisfying(
9191
equalTo(
92-
DbClientCommonAttributesExtractor.DB_SYSTEM,
92+
DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
9393
"myDb"),
9494
equalTo(
9595
DbClientCommonAttributesExtractor.DB_NAMESPACE,

Diff for: ‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ void shouldExtractAllAttributes() {
108108
assertThat(startAttributes.build())
109109
.containsOnly(
110110
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
111+
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
111112
entry(DbIncubatingAttributes.DB_USER, "username"),
112113
entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
113114
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
@@ -131,7 +132,7 @@ void shouldExtractAllAttributes() {
131132
} else if (SemconvStability.emitStableDatabaseSemconv()) {
132133
assertThat(startAttributes.build())
133134
.containsOnly(
134-
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
135+
entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
135136
entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
136137
entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"),
137138
entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"),

Diff for: ‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1414
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_DYNAMODB_TABLE_NAMES;
1515
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
16+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
1617
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.AWS_DYNAMODB;
1718
import static java.util.Collections.singletonList;
1819

@@ -65,10 +66,6 @@ public void sendRequestWithMockedResponse() throws Exception {
6566
response, client, "DynamoDBv2", "CreateTable", "POST", additionalAttributes);
6667

6768
assertDurationMetric(
68-
testing(),
69-
"io.opentelemetry.aws-sdk-1.11",
70-
maybeStable(DB_SYSTEM),
71-
SERVER_ADDRESS,
72-
SERVER_PORT);
69+
testing(), "io.opentelemetry.aws-sdk-1.11", DB_SYSTEM_NAME, SERVER_ADDRESS, SERVER_PORT);
7370
}
7471
}

Diff for: ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/TracingExecutionInterceptor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ private void populateRequestAttributes(
336336

337337
if (awsSdkRequest.type() == DYNAMODB) {
338338
if (SemconvStability.emitStableDatabaseSemconv()) {
339-
span.setAttribute(DB_SYSTEM, DB_SYSTEM_DYNAMODB);
339+
span.setAttribute(DB_SYSTEM_NAME, DB_SYSTEM_AWS_DYNAMODB);
340340
}
341341
if (SemconvStability.emitOldDatabaseSemconv()) {
342-
span.setAttribute(DB_SYSTEM_NAME, DB_SYSTEM_AWS_DYNAMODB);
342+
span.setAttribute(DB_SYSTEM, DB_SYSTEM_DYNAMODB);
343343
}
344344
String operation = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME);
345345
if (operation != null) {

Diff for: ‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
10+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1112
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
1213
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
@@ -170,7 +171,7 @@ private static void assertCreateTableRequest(SpanDataAssert span) {
170171
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
171172
equalTo(AWS_REQUEST_ID, "UNKNOWN"),
172173
equalTo(stringKey("aws.table.name"), "sometable"),
173-
equalTo(DB_SYSTEM, "dynamodb"),
174+
equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")),
174175
equalTo(maybeStable(DB_OPERATION), "CreateTable"),
175176
equalTo(
176177
stringKey("aws.dynamodb.global_secondary_indexes"),
@@ -196,7 +197,7 @@ private static void assertQueryRequest(SpanDataAssert span) {
196197
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
197198
equalTo(AWS_REQUEST_ID, "UNKNOWN"),
198199
equalTo(stringKey("aws.table.name"), "sometable"),
199-
equalTo(DB_SYSTEM, "dynamodb"),
200+
equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")),
200201
equalTo(maybeStable(DB_OPERATION), "Query"),
201202
equalTo(stringKey("aws.dynamodb.limit"), "10"),
202203
equalTo(stringKey("aws.dynamodb.select"), "ALL_ATTRIBUTES"));
@@ -219,7 +220,7 @@ private static void assertDynamoDbRequest(SpanDataAssert span, String operation)
219220
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
220221
equalTo(AWS_REQUEST_ID, "UNKNOWN"),
221222
equalTo(stringKey("aws.table.name"), "sometable"),
222-
equalTo(DB_SYSTEM, "dynamodb"),
223+
equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")),
223224
equalTo(maybeStable(DB_OPERATION), operation));
224225
}
225226

Diff for: ‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
10+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
1112
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1213
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
@@ -184,7 +185,7 @@ public void testSendDynamoDbRequestWithRetries() {
184185
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
185186
equalTo(AWS_REQUEST_ID, requestId),
186187
equalTo(stringKey("aws.table.name"), "sometable"),
187-
equalTo(DB_SYSTEM, "dynamodb"),
188+
equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("dynamodb")),
188189
equalTo(maybeStable(DB_OPERATION), operation));
189190
if (isRecordIndividualHttpErrorEnabled()) {
190191
span.hasEventsSatisfyingExactly(

Diff for: ‎instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,12 @@ public void pre(
124124
CamelDirection camelDirection) {
125125
super.pre(attributes, exchange, endpoint, camelDirection);
126126

127-
attributes.put(DbIncubatingAttributes.DB_SYSTEM, system);
127+
if (SemconvStability.emitStableDatabaseSemconv()) {
128+
attributes.put(DbIncubatingAttributes.DB_SYSTEM_NAME, system);
129+
}
130+
if (SemconvStability.emitOldDatabaseSemconv()) {
131+
attributes.put(DbIncubatingAttributes.DB_SYSTEM, system);
132+
}
128133
String statement = getStatement(exchange, endpoint);
129134
if (statement != null) {
130135
if (SemconvStability.emitStableDatabaseSemconv()) {

Diff for: ‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,6 @@ void testCassandra() {
124124
equalTo(
125125
maybeStable(DB_STATEMENT),
126126
"select * from test.users where id=? ALLOW FILTERING"),
127-
equalTo(DB_SYSTEM, "cassandra"))));
127+
equalTo(maybeStable(DB_SYSTEM), "cassandra"))));
128128
}
129129
}

Diff for: ‎instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void syncTest(Parameter parameter) {
107107
equalTo(SERVER_PORT, cassandraPort),
108108
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
109109
equalTo(NETWORK_PEER_PORT, cassandraPort),
110-
equalTo(DB_SYSTEM, "cassandra"),
110+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
111111
equalTo(maybeStable(DB_STATEMENT), "USE " + parameter.keyspace))),
112112
trace ->
113113
trace.hasSpansSatisfyingExactly(
@@ -121,7 +121,7 @@ void syncTest(Parameter parameter) {
121121
equalTo(SERVER_PORT, cassandraPort),
122122
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
123123
equalTo(NETWORK_PEER_PORT, cassandraPort),
124-
equalTo(DB_SYSTEM, "cassandra"),
124+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
125125
equalTo(maybeStable(DB_NAME), parameter.keyspace),
126126
equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
127127
equalTo(maybeStable(DB_OPERATION), parameter.operation),
@@ -140,7 +140,7 @@ void syncTest(Parameter parameter) {
140140
equalTo(SERVER_PORT, cassandraPort),
141141
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
142142
equalTo(NETWORK_PEER_PORT, cassandraPort),
143-
equalTo(DB_SYSTEM, "cassandra"),
143+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
144144
equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
145145
equalTo(maybeStable(DB_OPERATION), parameter.operation),
146146
equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table))));
@@ -179,7 +179,7 @@ void asyncTest(Parameter parameter) {
179179
equalTo(SERVER_PORT, cassandraPort),
180180
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
181181
equalTo(NETWORK_PEER_PORT, cassandraPort),
182-
equalTo(DB_SYSTEM, "cassandra"),
182+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
183183
equalTo(maybeStable(DB_STATEMENT), "USE " + parameter.keyspace))),
184184
trace ->
185185
trace.hasSpansSatisfyingExactly(
@@ -194,7 +194,7 @@ void asyncTest(Parameter parameter) {
194194
equalTo(SERVER_PORT, cassandraPort),
195195
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
196196
equalTo(NETWORK_PEER_PORT, cassandraPort),
197-
equalTo(DB_SYSTEM, "cassandra"),
197+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
198198
equalTo(maybeStable(DB_NAME), parameter.keyspace),
199199
equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
200200
equalTo(maybeStable(DB_OPERATION), parameter.operation),
@@ -218,7 +218,7 @@ void asyncTest(Parameter parameter) {
218218
equalTo(SERVER_PORT, cassandraPort),
219219
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
220220
equalTo(NETWORK_PEER_PORT, cassandraPort),
221-
equalTo(DB_SYSTEM, "cassandra"),
221+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
222222
equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
223223
equalTo(maybeStable(DB_OPERATION), parameter.operation),
224224
equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)),

Diff for: ‎instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,20 @@ void syncTest(Parameter parameter) {
112112
equalTo(SERVER_PORT, cassandraPort),
113113
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
114114
equalTo(NETWORK_PEER_PORT, cassandraPort),
115-
equalTo(DB_SYSTEM, "cassandra"),
115+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
116116
equalTo(maybeStable(DB_NAME), parameter.keyspace),
117117
equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
118118
equalTo(maybeStable(DB_OPERATION), parameter.operation),
119-
equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"),
120-
equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"),
119+
equalTo(maybeStable(DB_CASSANDRA_CONSISTENCY_LEVEL), "LOCAL_ONE"),
120+
equalTo(maybeStable(DB_CASSANDRA_COORDINATOR_DC), "datacenter1"),
121121
satisfies(
122-
DB_CASSANDRA_COORDINATOR_ID,
122+
maybeStable(DB_CASSANDRA_COORDINATOR_ID),
123123
val -> val.isInstanceOf(String.class)),
124124
satisfies(
125-
DB_CASSANDRA_IDEMPOTENCE,
125+
maybeStable(DB_CASSANDRA_IDEMPOTENCE),
126126
val -> val.isInstanceOf(Boolean.class)),
127-
equalTo(DB_CASSANDRA_PAGE_SIZE, 5000),
128-
equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0),
127+
equalTo(maybeStable(DB_CASSANDRA_PAGE_SIZE), 5000),
128+
equalTo(maybeStable(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT), 0),
129129
equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table))));
130130

131131
session.close();
@@ -166,20 +166,20 @@ void asyncTest(Parameter parameter) throws Exception {
166166
equalTo(SERVER_PORT, cassandraPort),
167167
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
168168
equalTo(NETWORK_PEER_PORT, cassandraPort),
169-
equalTo(DB_SYSTEM, "cassandra"),
169+
equalTo(maybeStable(DB_SYSTEM), "cassandra"),
170170
equalTo(maybeStable(DB_NAME), parameter.keyspace),
171171
equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
172172
equalTo(maybeStable(DB_OPERATION), parameter.operation),
173-
equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"),
174-
equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"),
173+
equalTo(maybeStable(DB_CASSANDRA_CONSISTENCY_LEVEL), "LOCAL_ONE"),
174+
equalTo(maybeStable(DB_CASSANDRA_COORDINATOR_DC), "datacenter1"),
175175
satisfies(
176-
DB_CASSANDRA_COORDINATOR_ID,
176+
maybeStable(DB_CASSANDRA_COORDINATOR_ID),
177177
val -> val.isInstanceOf(String.class)),
178178
satisfies(
179-
DB_CASSANDRA_IDEMPOTENCE,
179+
maybeStable(DB_CASSANDRA_IDEMPOTENCE),
180180
val -> val.isInstanceOf(Boolean.class)),
181-
equalTo(DB_CASSANDRA_PAGE_SIZE, 5000),
182-
equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0),
181+
equalTo(maybeStable(DB_CASSANDRA_PAGE_SIZE), 5000),
182+
equalTo(maybeStable(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT), 0),
183183
equalTo(maybeStable(DB_CASSANDRA_TABLE), parameter.table)),
184184
span ->
185185
span.hasName("child")

0 commit comments

Comments
 (0)