Skip to content

Commit e575b10

Browse files
lauritlaurit
committed
address review comment
1 parent b187dbf commit e575b10

File tree

2 files changed

+102
-206
lines changed

2 files changed

+102
-206
lines changed

‎instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java‎

Lines changed: 66 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_3.springdata;
77

8+
import static io.opentelemetry.api.common.AttributeKey.longKey;
9+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
810
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
911
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1012

11-
import io.opentelemetry.api.common.AttributeKey;
1213
import io.opentelemetry.api.trace.SpanKind;
1314
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
1415
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
@@ -88,15 +89,10 @@ void emptyRepository() {
8889
DbIncubatingAttributes.DB_SYSTEM,
8990
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
9091
equalTo(DbIncubatingAttributes.DB_OPERATION, "SearchAction"),
91-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "SearchAction"),
92-
equalTo(
93-
AttributeKey.stringKey("elasticsearch.request"), "SearchRequest"),
94-
equalTo(
95-
AttributeKey.stringKey("elasticsearch.request.indices"),
96-
"test-index"),
97-
equalTo(
98-
AttributeKey.stringKey("elasticsearch.request.search.types"),
99-
"doc"))));
92+
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
93+
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
94+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
95+
equalTo(stringKey("elasticsearch.request.search.types"), "doc"))));
10096
}
10197

10298
@Test
@@ -127,24 +123,15 @@ void crud() {
127123
DbIncubatingAttributes.DB_SYSTEM,
128124
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
129125
equalTo(DbIncubatingAttributes.DB_OPERATION, "IndexAction"),
130-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "IndexAction"),
131-
equalTo(
132-
AttributeKey.stringKey("elasticsearch.request"), "IndexRequest"),
133-
equalTo(
134-
AttributeKey.stringKey("elasticsearch.request.indices"),
135-
"test-index"),
136-
equalTo(
137-
AttributeKey.stringKey("elasticsearch.request.write.type"), "doc"),
138-
equalTo(
139-
AttributeKey.longKey("elasticsearch.request.write.version"), -3),
140-
equalTo(AttributeKey.longKey("elasticsearch.response.status"), 201),
141-
equalTo(
142-
AttributeKey.longKey("elasticsearch.shard.replication.failed"), 0),
143-
equalTo(
144-
AttributeKey.longKey("elasticsearch.shard.replication.successful"),
145-
1),
146-
equalTo(
147-
AttributeKey.longKey("elasticsearch.shard.replication.total"), 2)),
126+
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
127+
equalTo(stringKey("elasticsearch.request"), "IndexRequest"),
128+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
129+
equalTo(stringKey("elasticsearch.request.write.type"), "doc"),
130+
equalTo(longKey("elasticsearch.request.write.version"), -3),
131+
equalTo(longKey("elasticsearch.response.status"), 201),
132+
equalTo(longKey("elasticsearch.shard.replication.failed"), 0),
133+
equalTo(longKey("elasticsearch.shard.replication.successful"), 1),
134+
equalTo(longKey("elasticsearch.shard.replication.total"), 2)),
148135
span ->
149136
span.hasName("RefreshAction")
150137
.hasKind(SpanKind.CLIENT)
@@ -154,20 +141,12 @@ void crud() {
154141
DbIncubatingAttributes.DB_SYSTEM,
155142
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
156143
equalTo(DbIncubatingAttributes.DB_OPERATION, "RefreshAction"),
157-
equalTo(
158-
AttributeKey.stringKey("elasticsearch.action"), "RefreshAction"),
159-
equalTo(
160-
AttributeKey.stringKey("elasticsearch.request"), "RefreshRequest"),
161-
equalTo(
162-
AttributeKey.stringKey("elasticsearch.request.indices"),
163-
"test-index"),
164-
equalTo(
165-
AttributeKey.longKey("elasticsearch.shard.broadcast.failed"), 0),
166-
equalTo(
167-
AttributeKey.longKey("elasticsearch.shard.broadcast.successful"),
168-
5),
169-
equalTo(
170-
AttributeKey.longKey("elasticsearch.shard.broadcast.total"), 10))));
144+
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
145+
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
146+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
147+
equalTo(longKey("elasticsearch.shard.broadcast.failed"), 0),
148+
equalTo(longKey("elasticsearch.shard.broadcast.successful"), 5),
149+
equalTo(longKey("elasticsearch.shard.broadcast.total"), 10))));
171150
testing.clearData();
172151

173152
assertThat(repository.findById("1").get()).isEqualTo(doc);
@@ -193,14 +172,12 @@ void crud() {
193172
DbIncubatingAttributes.DB_SYSTEM,
194173
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
195174
equalTo(DbIncubatingAttributes.DB_OPERATION, "GetAction"),
196-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "GetAction"),
197-
equalTo(AttributeKey.stringKey("elasticsearch.request"), "GetRequest"),
198-
equalTo(
199-
AttributeKey.stringKey("elasticsearch.request.indices"),
200-
"test-index"),
201-
equalTo(AttributeKey.stringKey("elasticsearch.type"), "doc"),
202-
equalTo(AttributeKey.stringKey("elasticsearch.id"), "1"),
203-
equalTo(AttributeKey.longKey("elasticsearch.version"), 1))));
175+
equalTo(stringKey("elasticsearch.action"), "GetAction"),
176+
equalTo(stringKey("elasticsearch.request"), "GetRequest"),
177+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
178+
equalTo(stringKey("elasticsearch.type"), "doc"),
179+
equalTo(stringKey("elasticsearch.id"), "1"),
180+
equalTo(longKey("elasticsearch.version"), 1))));
204181
testing.clearData();
205182

206183
doc.setData("other data");
@@ -229,24 +206,15 @@ void crud() {
229206
DbIncubatingAttributes.DB_SYSTEM,
230207
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
231208
equalTo(DbIncubatingAttributes.DB_OPERATION, "IndexAction"),
232-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "IndexAction"),
233-
equalTo(
234-
AttributeKey.stringKey("elasticsearch.request"), "IndexRequest"),
235-
equalTo(
236-
AttributeKey.stringKey("elasticsearch.request.indices"),
237-
"test-index"),
238-
equalTo(
239-
AttributeKey.stringKey("elasticsearch.request.write.type"), "doc"),
240-
equalTo(
241-
AttributeKey.longKey("elasticsearch.request.write.version"), -3),
242-
equalTo(AttributeKey.longKey("elasticsearch.response.status"), 200),
243-
equalTo(
244-
AttributeKey.longKey("elasticsearch.shard.replication.failed"), 0),
245-
equalTo(
246-
AttributeKey.longKey("elasticsearch.shard.replication.successful"),
247-
1),
248-
equalTo(
249-
AttributeKey.longKey("elasticsearch.shard.replication.total"), 2)),
209+
equalTo(stringKey("elasticsearch.action"), "IndexAction"),
210+
equalTo(stringKey("elasticsearch.request"), "IndexRequest"),
211+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
212+
equalTo(stringKey("elasticsearch.request.write.type"), "doc"),
213+
equalTo(longKey("elasticsearch.request.write.version"), -3),
214+
equalTo(longKey("elasticsearch.response.status"), 200),
215+
equalTo(longKey("elasticsearch.shard.replication.failed"), 0),
216+
equalTo(longKey("elasticsearch.shard.replication.successful"), 1),
217+
equalTo(longKey("elasticsearch.shard.replication.total"), 2)),
250218
span ->
251219
span.hasName("RefreshAction")
252220
.hasKind(SpanKind.CLIENT)
@@ -256,20 +224,12 @@ void crud() {
256224
DbIncubatingAttributes.DB_SYSTEM,
257225
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
258226
equalTo(DbIncubatingAttributes.DB_OPERATION, "RefreshAction"),
259-
equalTo(
260-
AttributeKey.stringKey("elasticsearch.action"), "RefreshAction"),
261-
equalTo(
262-
AttributeKey.stringKey("elasticsearch.request"), "RefreshRequest"),
263-
equalTo(
264-
AttributeKey.stringKey("elasticsearch.request.indices"),
265-
"test-index"),
266-
equalTo(
267-
AttributeKey.longKey("elasticsearch.shard.broadcast.failed"), 0),
268-
equalTo(
269-
AttributeKey.longKey("elasticsearch.shard.broadcast.successful"),
270-
5),
271-
equalTo(
272-
AttributeKey.longKey("elasticsearch.shard.broadcast.total"), 10))),
227+
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
228+
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
229+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
230+
equalTo(longKey("elasticsearch.shard.broadcast.failed"), 0),
231+
equalTo(longKey("elasticsearch.shard.broadcast.successful"), 5),
232+
equalTo(longKey("elasticsearch.shard.broadcast.total"), 10))),
273233
trace ->
274234
trace.hasSpansSatisfyingExactly(
275235
span ->
@@ -290,14 +250,12 @@ void crud() {
290250
DbIncubatingAttributes.DB_SYSTEM,
291251
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
292252
equalTo(DbIncubatingAttributes.DB_OPERATION, "GetAction"),
293-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "GetAction"),
294-
equalTo(AttributeKey.stringKey("elasticsearch.request"), "GetRequest"),
295-
equalTo(
296-
AttributeKey.stringKey("elasticsearch.request.indices"),
297-
"test-index"),
298-
equalTo(AttributeKey.stringKey("elasticsearch.type"), "doc"),
299-
equalTo(AttributeKey.stringKey("elasticsearch.id"), "1"),
300-
equalTo(AttributeKey.longKey("elasticsearch.version"), 2))));
253+
equalTo(stringKey("elasticsearch.action"), "GetAction"),
254+
equalTo(stringKey("elasticsearch.request"), "GetRequest"),
255+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
256+
equalTo(stringKey("elasticsearch.type"), "doc"),
257+
equalTo(stringKey("elasticsearch.id"), "1"),
258+
equalTo(longKey("elasticsearch.version"), 2))));
301259
testing.clearData();
302260

303261
repository.deleteById("1");
@@ -324,23 +282,14 @@ void crud() {
324282
DbIncubatingAttributes.DB_SYSTEM,
325283
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
326284
equalTo(DbIncubatingAttributes.DB_OPERATION, "DeleteAction"),
327-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "DeleteAction"),
328-
equalTo(
329-
AttributeKey.stringKey("elasticsearch.request"), "DeleteRequest"),
330-
equalTo(
331-
AttributeKey.stringKey("elasticsearch.request.indices"),
332-
"test-index"),
333-
equalTo(
334-
AttributeKey.stringKey("elasticsearch.request.write.type"), "doc"),
335-
equalTo(
336-
AttributeKey.longKey("elasticsearch.request.write.version"), -3),
337-
equalTo(
338-
AttributeKey.longKey("elasticsearch.shard.replication.failed"), 0),
339-
equalTo(
340-
AttributeKey.longKey("elasticsearch.shard.replication.successful"),
341-
1),
342-
equalTo(
343-
AttributeKey.longKey("elasticsearch.shard.replication.total"), 2)),
285+
equalTo(stringKey("elasticsearch.action"), "DeleteAction"),
286+
equalTo(stringKey("elasticsearch.request"), "DeleteRequest"),
287+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
288+
equalTo(stringKey("elasticsearch.request.write.type"), "doc"),
289+
equalTo(longKey("elasticsearch.request.write.version"), -3),
290+
equalTo(longKey("elasticsearch.shard.replication.failed"), 0),
291+
equalTo(longKey("elasticsearch.shard.replication.successful"), 1),
292+
equalTo(longKey("elasticsearch.shard.replication.total"), 2)),
344293
span ->
345294
span.hasName("RefreshAction")
346295
.hasKind(SpanKind.CLIENT)
@@ -350,20 +299,12 @@ void crud() {
350299
DbIncubatingAttributes.DB_SYSTEM,
351300
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
352301
equalTo(DbIncubatingAttributes.DB_OPERATION, "RefreshAction"),
353-
equalTo(
354-
AttributeKey.stringKey("elasticsearch.action"), "RefreshAction"),
355-
equalTo(
356-
AttributeKey.stringKey("elasticsearch.request"), "RefreshRequest"),
357-
equalTo(
358-
AttributeKey.stringKey("elasticsearch.request.indices"),
359-
"test-index"),
360-
equalTo(
361-
AttributeKey.longKey("elasticsearch.shard.broadcast.failed"), 0),
362-
equalTo(
363-
AttributeKey.longKey("elasticsearch.shard.broadcast.successful"),
364-
5),
365-
equalTo(
366-
AttributeKey.longKey("elasticsearch.shard.broadcast.total"), 10))),
302+
equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
303+
equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
304+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
305+
equalTo(longKey("elasticsearch.shard.broadcast.failed"), 0),
306+
equalTo(longKey("elasticsearch.shard.broadcast.successful"), 5),
307+
equalTo(longKey("elasticsearch.shard.broadcast.total"), 10))),
367308
trace ->
368309
trace.hasSpansSatisfyingExactly(
369310
span ->
@@ -384,14 +325,9 @@ void crud() {
384325
DbIncubatingAttributes.DB_SYSTEM,
385326
DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH),
386327
equalTo(DbIncubatingAttributes.DB_OPERATION, "SearchAction"),
387-
equalTo(AttributeKey.stringKey("elasticsearch.action"), "SearchAction"),
388-
equalTo(
389-
AttributeKey.stringKey("elasticsearch.request"), "SearchRequest"),
390-
equalTo(
391-
AttributeKey.stringKey("elasticsearch.request.indices"),
392-
"test-index"),
393-
equalTo(
394-
AttributeKey.stringKey("elasticsearch.request.search.types"),
395-
"doc"))));
328+
equalTo(stringKey("elasticsearch.action"), "SearchAction"),
329+
equalTo(stringKey("elasticsearch.request"), "SearchRequest"),
330+
equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
331+
equalTo(stringKey("elasticsearch.request.search.types"), "doc"))));
396332
}
397333
}

0 commit comments

Comments
 (0)