24
24
import io .opentelemetry .api .trace .Tracer ;
25
25
import io .opentelemetry .instrumentation .testing .junit .InstrumentationExtension ;
26
26
import io .opentelemetry .instrumentation .testing .util .ThrowingRunnable ;
27
- import io .opentelemetry .sdk .testing . assertj . EventDataAssert ;
27
+ import io .opentelemetry .sdk .trace . data . EventData ;
28
28
import io .opentelemetry .semconv .NetworkAttributes ;
29
29
import io .opentelemetry .semconv .ServerAttributes ;
30
30
import io .opentelemetry .semconv .incubating .MessageIncubatingAttributes ;
@@ -153,12 +153,12 @@ public void onCompleted() {
153
153
.sorted ()
154
154
.collect (Collectors .toList ()));
155
155
156
- List <Consumer <EventDataAssert >> events = new ArrayList <>();
156
+ List <Consumer <EventData >> events = new ArrayList <>();
157
157
for (int i = 1 ; i <= clientMessageCount * serverMessageCount + clientMessageCount ; i ++) {
158
158
long messageId = i ;
159
159
events .add (
160
160
event ->
161
- event
161
+ assertThat ( event )
162
162
.hasName ("message" )
163
163
.hasAttributesSatisfying (
164
164
attrs ->
@@ -192,7 +192,11 @@ public void onCompleted() {
192
192
(long ) Status .Code .OK .value ()),
193
193
equalTo (ServerAttributes .SERVER_ADDRESS , "localhost" ),
194
194
equalTo (ServerAttributes .SERVER_PORT , (long ) server .getPort ())))
195
- .hasEventsSatisfyingExactly (events .toArray (new Consumer [0 ])),
195
+ .satisfies (
196
+ spanData ->
197
+ assertThat (spanData .getEvents ())
198
+ .satisfiesExactlyInAnyOrder (
199
+ events .toArray (new Consumer [0 ]))),
196
200
span ->
197
201
span .hasName ("example.Greeter/Conversation" )
198
202
.hasKind (SpanKind .SERVER )
@@ -211,7 +215,11 @@ public void onCompleted() {
211
215
satisfies (
212
216
NetworkAttributes .NETWORK_PEER_PORT ,
213
217
val -> assertThat (val ).isNotNull ()))
214
- .hasEventsSatisfyingExactly (events .toArray (new Consumer [0 ]))));
218
+ .satisfies (
219
+ spanData ->
220
+ assertThat (spanData .getEvents ())
221
+ .satisfiesExactlyInAnyOrder (
222
+ events .toArray (new Consumer [0 ])))));
215
223
testing ()
216
224
.waitAndAssertMetrics (
217
225
"io.opentelemetry.grpc-1.6" ,
0 commit comments