Skip to content

Commit 0a5c311

Browse files
steveraosteverao
authored
Deleted redundant checks (#10434)
1 parent 0ec3d0a commit 0a5c311

File tree

18 files changed

+910
-1040
lines changed

18 files changed

+910
-1040
lines changed

‎examples/distro/instrumentation/servlet-3/src/test/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationTest.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,10 @@ void shouldAddCustomHeader() throws Exception {
8080
assertEquals("result", response.body().string());
8181

8282
assertThat(instrumentation.waitForTraces(1))
83-
.hasSize(1)
8483
.hasTracesSatisfyingExactly(
8584
trace ->
86-
trace
87-
.hasSize(1)
88-
.hasSpansSatisfyingExactly(
89-
span -> span.hasName("GET /servlet").hasKind(SpanKind.SERVER)));
85+
trace.hasSpansSatisfyingExactly(
86+
span -> span.hasName("GET /servlet").hasKind(SpanKind.SERVER)));
9087

9188
var traceId = instrumentation.spans().get(0).getTraceId();
9289
assertEquals(traceId, response.header("X-server-id"));

‎instrumentation/couchbase/couchbase-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseClient32Test.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,13 @@ void testEmitsSpans() {
7171

7272
testing.waitAndAssertTracesWithoutScopeVersionVerification(
7373
trace ->
74-
trace
75-
.hasSize(2)
76-
.hasSpansSatisfyingExactly(
77-
span -> {
78-
span.hasName("get");
79-
if (Boolean.getBoolean("testLatestDeps")) {
80-
span.hasStatus(StatusData.error());
81-
}
82-
},
83-
span -> span.hasName("dispatch_to_server")));
74+
trace.hasSpansSatisfyingExactly(
75+
span -> {
76+
span.hasName("get");
77+
if (Boolean.getBoolean("testLatestDeps")) {
78+
span.hasStatus(StatusData.error());
79+
}
80+
},
81+
span -> span.hasName("dispatch_to_server")));
8482
}
8583
}

‎instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/ViewRenderTest.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ void testSpan(ViewRenderer renderer, String template) throws IOException {
5151
assertThat(outputStream.toString("UTF-8")).contains("This is an example of a view");
5252
testing.waitAndAssertTraces(
5353
trace ->
54-
trace
55-
.hasSize(2)
56-
.hasSpansSatisfyingExactly(
57-
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
58-
span -> span.hasName("Render " + template).hasParent(trace.getSpan(0))));
54+
trace.hasSpansSatisfyingExactly(
55+
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
56+
span -> span.hasName("Render " + template).hasParent(trace.getSpan(0))));
5957
}
6058

6159
@Test

‎instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java

+24-26
Original file line numberDiff line numberDiff line change
@@ -126,32 +126,30 @@ void shouldSanitizeGeodeQuery() throws QueryException {
126126
void assertGeodeTrace(String verb, String query) {
127127
testing.waitAndAssertTraces(
128128
trace ->
129-
trace
130-
.hasSize(4)
131-
.hasSpansSatisfyingExactly(
132-
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL),
133-
span ->
134-
span.hasName("clear test-region")
135-
.hasKind(SpanKind.CLIENT)
136-
.hasAttributesSatisfyingExactly(
137-
equalTo(SemanticAttributes.DB_SYSTEM, "geode"),
138-
equalTo(SemanticAttributes.DB_NAME, "test-region"),
139-
equalTo(SemanticAttributes.DB_OPERATION, "clear")),
140-
span ->
141-
span.hasName("put test-region")
142-
.hasKind(SpanKind.CLIENT)
143-
.hasAttributesSatisfyingExactly(
144-
equalTo(SemanticAttributes.DB_SYSTEM, "geode"),
145-
equalTo(SemanticAttributes.DB_NAME, "test-region"),
146-
equalTo(SemanticAttributes.DB_OPERATION, "put")),
147-
span ->
148-
span.hasName(verb.concat(" test-region"))
149-
.hasKind(SpanKind.CLIENT)
150-
.hasAttributesSatisfyingExactly(
151-
equalTo(SemanticAttributes.DB_SYSTEM, "geode"),
152-
equalTo(SemanticAttributes.DB_NAME, "test-region"),
153-
equalTo(SemanticAttributes.DB_OPERATION, verb),
154-
equalTo(SemanticAttributes.DB_STATEMENT, query))));
129+
trace.hasSpansSatisfyingExactly(
130+
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL),
131+
span ->
132+
span.hasName("clear test-region")
133+
.hasKind(SpanKind.CLIENT)
134+
.hasAttributesSatisfyingExactly(
135+
equalTo(SemanticAttributes.DB_SYSTEM, "geode"),
136+
equalTo(SemanticAttributes.DB_NAME, "test-region"),
137+
equalTo(SemanticAttributes.DB_OPERATION, "clear")),
138+
span ->
139+
span.hasName("put test-region")
140+
.hasKind(SpanKind.CLIENT)
141+
.hasAttributesSatisfyingExactly(
142+
equalTo(SemanticAttributes.DB_SYSTEM, "geode"),
143+
equalTo(SemanticAttributes.DB_NAME, "test-region"),
144+
equalTo(SemanticAttributes.DB_OPERATION, "put")),
145+
span ->
146+
span.hasName(verb.concat(" test-region"))
147+
.hasKind(SpanKind.CLIENT)
148+
.hasAttributesSatisfyingExactly(
149+
equalTo(SemanticAttributes.DB_SYSTEM, "geode"),
150+
equalTo(SemanticAttributes.DB_NAME, "test-region"),
151+
equalTo(SemanticAttributes.DB_OPERATION, verb),
152+
equalTo(SemanticAttributes.DB_STATEMENT, query))));
155153
}
156154

157155
static class Card implements DataSerializable {

‎instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtTest.java

+29-35
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,20 @@ void testGwt() {
147147

148148
testing.waitAndAssertTraces(
149149
trace ->
150-
trace
151-
.hasSize(2)
152-
.hasSpansSatisfyingExactly(
153-
span ->
154-
span.hasName("POST " + getContextPath() + "/greeting/greet")
155-
.hasKind(SpanKind.SERVER)
156-
.hasNoParent(),
157-
span ->
158-
span.hasName("test.gwt.shared.MessageService/sendMessage")
159-
.hasKind(SpanKind.SERVER)
160-
.hasParent(trace.getSpan(0))
161-
.hasAttributesSatisfyingExactly(
162-
equalTo(SemanticAttributes.RPC_SYSTEM, "gwt"),
163-
equalTo(
164-
SemanticAttributes.RPC_SERVICE,
165-
"test.gwt.shared.MessageService"),
166-
equalTo(SemanticAttributes.RPC_METHOD, "sendMessage"))));
150+
trace.hasSpansSatisfyingExactly(
151+
span ->
152+
span.hasName("POST " + getContextPath() + "/greeting/greet")
153+
.hasKind(SpanKind.SERVER)
154+
.hasNoParent(),
155+
span ->
156+
span.hasName("test.gwt.shared.MessageService/sendMessage")
157+
.hasKind(SpanKind.SERVER)
158+
.hasParent(trace.getSpan(0))
159+
.hasAttributesSatisfyingExactly(
160+
equalTo(SemanticAttributes.RPC_SYSTEM, "gwt"),
161+
equalTo(
162+
SemanticAttributes.RPC_SERVICE, "test.gwt.shared.MessageService"),
163+
equalTo(SemanticAttributes.RPC_METHOD, "sendMessage"))));
167164

168165
testing.clearData();
169166

@@ -173,24 +170,21 @@ void testGwt() {
173170

174171
testing.waitAndAssertTraces(
175172
trace ->
176-
trace
177-
.hasSize(2)
178-
.hasSpansSatisfyingExactly(
179-
span ->
180-
span.hasName("POST " + getContextPath() + "/greeting/greet")
181-
.hasKind(SpanKind.SERVER)
182-
.hasNoParent(),
183-
span ->
184-
span.hasName("test.gwt.shared.MessageService/sendMessage")
185-
.hasKind(SpanKind.SERVER)
186-
.hasParent(trace.getSpan(0))
187-
.hasException(new IOException())
188-
.hasAttributesSatisfyingExactly(
189-
equalTo(SemanticAttributes.RPC_SYSTEM, "gwt"),
190-
equalTo(
191-
SemanticAttributes.RPC_SERVICE,
192-
"test.gwt.shared.MessageService"),
193-
equalTo(SemanticAttributes.RPC_METHOD, "sendMessage"))));
173+
trace.hasSpansSatisfyingExactly(
174+
span ->
175+
span.hasName("POST " + getContextPath() + "/greeting/greet")
176+
.hasKind(SpanKind.SERVER)
177+
.hasNoParent(),
178+
span ->
179+
span.hasName("test.gwt.shared.MessageService/sendMessage")
180+
.hasKind(SpanKind.SERVER)
181+
.hasParent(trace.getSpan(0))
182+
.hasException(new IOException())
183+
.hasAttributesSatisfyingExactly(
184+
equalTo(SemanticAttributes.RPC_SYSTEM, "gwt"),
185+
equalTo(
186+
SemanticAttributes.RPC_SERVICE, "test.gwt.shared.MessageService"),
187+
equalTo(SemanticAttributes.RPC_METHOD, "sendMessage"))));
194188

195189
driver.close();
196190
}

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java

+36-38
Original file line numberDiff line numberDiff line change
@@ -59,43 +59,41 @@ void testCriteriaQuery(Consumer<Query<Value>> interaction) {
5959

6060
testing.waitAndAssertTraces(
6161
trace ->
62-
trace
63-
.hasSize(4)
64-
.hasSpansSatisfyingExactly(
65-
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
66-
span ->
67-
span.hasName(
68-
"SELECT io.opentelemetry.javaagent.instrumentation.hibernate.v6_0.Value")
69-
.hasKind(SpanKind.INTERNAL)
70-
.hasParent(trace.getSpan(0))
71-
.hasAttributesSatisfyingExactly(
72-
satisfies(
73-
AttributeKey.stringKey("hibernate.session_id"),
74-
val -> val.isInstanceOf(String.class))),
75-
span ->
76-
span.hasName("SELECT db1.Value")
77-
.hasKind(SpanKind.CLIENT)
78-
.hasParent(trace.getSpan(1))
79-
.hasAttributesSatisfyingExactly(
80-
equalTo(SemanticAttributes.DB_SYSTEM, "h2"),
81-
equalTo(SemanticAttributes.DB_NAME, "db1"),
82-
equalTo(SemanticAttributes.DB_USER, "sa"),
83-
equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"),
84-
satisfies(
85-
SemanticAttributes.DB_STATEMENT,
86-
stringAssert -> stringAssert.startsWith("select")),
87-
equalTo(SemanticAttributes.DB_OPERATION, "SELECT"),
88-
equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")),
89-
span ->
90-
span.hasName("Transaction.commit")
91-
.hasKind(SpanKind.INTERNAL)
92-
.hasParent(trace.getSpan(0))
93-
.hasAttributesSatisfyingExactly(
94-
equalTo(
95-
AttributeKey.stringKey("hibernate.session_id"),
96-
trace
97-
.getSpan(1)
98-
.getAttributes()
99-
.get(AttributeKey.stringKey("hibernate.session_id"))))));
62+
trace.hasSpansSatisfyingExactly(
63+
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
64+
span ->
65+
span.hasName(
66+
"SELECT io.opentelemetry.javaagent.instrumentation.hibernate.v6_0.Value")
67+
.hasKind(SpanKind.INTERNAL)
68+
.hasParent(trace.getSpan(0))
69+
.hasAttributesSatisfyingExactly(
70+
satisfies(
71+
AttributeKey.stringKey("hibernate.session_id"),
72+
val -> val.isInstanceOf(String.class))),
73+
span ->
74+
span.hasName("SELECT db1.Value")
75+
.hasKind(SpanKind.CLIENT)
76+
.hasParent(trace.getSpan(1))
77+
.hasAttributesSatisfyingExactly(
78+
equalTo(SemanticAttributes.DB_SYSTEM, "h2"),
79+
equalTo(SemanticAttributes.DB_NAME, "db1"),
80+
equalTo(SemanticAttributes.DB_USER, "sa"),
81+
equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"),
82+
satisfies(
83+
SemanticAttributes.DB_STATEMENT,
84+
stringAssert -> stringAssert.startsWith("select")),
85+
equalTo(SemanticAttributes.DB_OPERATION, "SELECT"),
86+
equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")),
87+
span ->
88+
span.hasName("Transaction.commit")
89+
.hasKind(SpanKind.INTERNAL)
90+
.hasParent(trace.getSpan(0))
91+
.hasAttributesSatisfyingExactly(
92+
equalTo(
93+
AttributeKey.stringKey("hibernate.session_id"),
94+
trace
95+
.getSpan(1)
96+
.getAttributes()
97+
.get(AttributeKey.stringKey("hibernate.session_id"))))));
10098
}
10199
}

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java

+25-27
Original file line numberDiff line numberDiff line change
@@ -129,33 +129,31 @@ void testAttachesStateToQuery(Parameter parameter) {
129129

130130
testing.waitAndAssertTraces(
131131
trace ->
132-
trace
133-
.hasSize(4)
134-
.hasSpansSatisfyingExactly(
135-
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
136-
span -> assertSessionSpan(span, trace.getSpan(0), parameter.resource),
137-
span ->
138-
span.hasName("SELECT db1.Value")
139-
.hasKind(SpanKind.CLIENT)
140-
.hasParent(trace.getSpan(1))
141-
.hasAttributesSatisfyingExactly(
142-
equalTo(SemanticAttributes.DB_SYSTEM, "h2"),
143-
equalTo(SemanticAttributes.DB_NAME, "db1"),
144-
equalTo(SemanticAttributes.DB_USER, "sa"),
145-
equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"),
146-
satisfies(
147-
SemanticAttributes.DB_STATEMENT,
148-
val -> val.isInstanceOf(String.class)),
149-
equalTo(SemanticAttributes.DB_OPERATION, "SELECT"),
150-
equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")),
151-
span ->
152-
assertTransactionCommitSpan(
153-
span,
154-
trace.getSpan(0),
155-
trace
156-
.getSpan(1)
157-
.getAttributes()
158-
.get(AttributeKey.stringKey("hibernate.session_id")))));
132+
trace.hasSpansSatisfyingExactly(
133+
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
134+
span -> assertSessionSpan(span, trace.getSpan(0), parameter.resource),
135+
span ->
136+
span.hasName("SELECT db1.Value")
137+
.hasKind(SpanKind.CLIENT)
138+
.hasParent(trace.getSpan(1))
139+
.hasAttributesSatisfyingExactly(
140+
equalTo(SemanticAttributes.DB_SYSTEM, "h2"),
141+
equalTo(SemanticAttributes.DB_NAME, "db1"),
142+
equalTo(SemanticAttributes.DB_USER, "sa"),
143+
equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"),
144+
satisfies(
145+
SemanticAttributes.DB_STATEMENT,
146+
val -> val.isInstanceOf(String.class)),
147+
equalTo(SemanticAttributes.DB_OPERATION, "SELECT"),
148+
equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")),
149+
span ->
150+
assertTransactionCommitSpan(
151+
span,
152+
trace.getSpan(0),
153+
trace
154+
.getSpan(1)
155+
.getAttributes()
156+
.get(AttributeKey.stringKey("hibernate.session_id")))));
159157
}
160158

161159
private static Stream<Arguments> provideHibernateActionParameters() {

0 commit comments

Comments
 (0)