Skip to content

Commit b69b7b3

Browse files
otelbot[bot]otelbot[bot]
authored
Code review sweep (run 25233765496) (#18499)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 1750153 commit b69b7b3

10 files changed

Lines changed: 33 additions & 23 deletions

File tree

‎instrumentation/rxjava/rxjava-2.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ static void launchAndWait(
3939
//noinspection ResultOfMethodCallIgnored
4040
latch.await(timeoutMillis, MILLISECONDS);
4141
} catch (InterruptedException e) {
42+
Thread.currentThread().interrupt();
4243
throw new IllegalStateException(e);
4344
}
4445
}

‎instrumentation/rxjava/rxjava-3.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v3_0/RxJava3SubscriptionTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.opentelemetry.instrumentation.rxjava.common.v3_0.AbstractRxJava3SubscriptionTest;
99
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1010
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
11+
import org.junit.jupiter.api.AfterAll;
1112
import org.junit.jupiter.api.BeforeAll;
1213
import org.junit.jupiter.api.extension.RegisterExtension;
1314

@@ -27,4 +28,9 @@ protected InstrumentationExtension testing() {
2728
static void setup() {
2829
tracingAssembly.enable();
2930
}
31+
32+
@AfterAll
33+
static void cleanup() {
34+
tracingAssembly.disable();
35+
}
3036
}

‎instrumentation/rxjava/rxjava-3.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v3_0/RxJava3Test.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.opentelemetry.instrumentation.rxjava.common.v3_0.AbstractRxJava3Test;
99
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1010
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
11+
import org.junit.jupiter.api.AfterAll;
1112
import org.junit.jupiter.api.BeforeAll;
1213
import org.junit.jupiter.api.extension.RegisterExtension;
1314

@@ -26,4 +27,9 @@ protected InstrumentationExtension testing() {
2627
void setup() {
2728
tracingAssembly.enable();
2829
}
30+
31+
@AfterAll
32+
static void cleanup() {
33+
tracingAssembly.disable();
34+
}
2935
}

‎instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ tasks {
3030
classpath = sourceSets.test.get().runtimeClasspath
3131

3232
jvmArgs("-Dotel.instrumentation.rxjava.experimental-span-attributes=true")
33+
systemProperty("metadataConfig", "otel.instrumentation.rxjava.experimental-span-attributes=true")
3334
}
3435

3536
check {

‎instrumentation/rxjava/rxjava-common-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/TracingSingleObserver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void onSubscribe(Disposable d) {
4444
if (!DisposableHelper.validate(disposable, d)) {
4545
return;
4646
}
47-
this.disposable = d;
47+
disposable = d;
4848
actual.onSubscribe(this);
4949
}
5050

‎instrumentation/rxjava/rxjava-common-3.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/RxJava3AsyncOperationEndStrategyTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -927,20 +927,20 @@ void endsSpanWhenCancelledExperimentalAttributes() {
927927
verify(instrumenter).end(context, "request", null, null);
928928
}
929929

930-
class CustomPublisher implements Publisher<String>, Subscription {
931-
Subscriber<? super String> subscriber;
930+
private class CustomPublisher implements Publisher<String>, Subscription {
931+
private Subscriber<? super String> subscriber;
932932

933933
@Override
934934
public void subscribe(Subscriber<? super String> subscriber) {
935935
this.subscriber = subscriber;
936936
subscriber.onSubscribe(this);
937937
}
938938

939-
public void onComplete() {
939+
private void onComplete() {
940940
this.subscriber.onComplete();
941941
}
942942

943-
public void onError(Throwable exception) {
943+
private void onError(Throwable exception) {
944944
this.subscriber.onError(exception);
945945
}
946946

‎instrumentation/rxjava/rxjava-common-3.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/AbstractRxJava3Test.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void basicFlowable() {
182182
Iterable<Integer> result =
183183
createParentSpan(
184184
() -> Flowable.fromIterable(asList(5, 6)).map(this::addOne).toList().blockingGet());
185-
assertThat(result).contains(6, 7);
185+
assertThat(result).containsExactly(6, 7);
186186
testing()
187187
.waitAndAssertTraces(
188188
trace ->
@@ -208,7 +208,7 @@ void twoOperationsFlowable() {
208208
.map(this::addOne)
209209
.toList()
210210
.blockingGet());
211-
assertThat(result).contains(8, 9);
211+
assertThat(result).containsExactly(8, 9);
212212
testing()
213213
.waitAndAssertTraces(
214214
trace ->
@@ -273,7 +273,7 @@ void delayedFlowable() {
273273
.map(this::addOne)
274274
.toList()
275275
.blockingGet());
276-
assertThat(result).contains(8, 9);
276+
assertThat(result).containsExactly(8, 9);
277277
testing()
278278
.waitAndAssertTraces(
279279
trace ->
@@ -301,7 +301,7 @@ void delayedTwiceFlowable() {
301301
.map(this::addOne)
302302
.toList()
303303
.blockingGet());
304-
assertThat(result).contains(10, 11);
304+
assertThat(result).containsExactly(10, 11);
305305
testing()
306306
.waitAndAssertTraces(
307307
trace ->
@@ -365,7 +365,7 @@ void basicSingle() {
365365
void basicObservable() {
366366
List<Integer> result =
367367
createParentSpan(() -> Observable.just(0).map(this::addOne).toList().blockingGet());
368-
assertThat(result).contains(1);
368+
assertThat(result).containsExactly(1);
369369
testing()
370370
.waitAndAssertTraces(
371371
trace ->
@@ -387,7 +387,7 @@ void connectableFlowable() {
387387
.map(this::addOne)
388388
.toList()
389389
.blockingGet());
390-
assertThat(result).contains(1);
390+
assertThat(result).containsExactly(1);
391391
testing()
392392
.waitAndAssertTraces(
393393
trace ->
@@ -409,7 +409,7 @@ void connectableObservable() {
409409
.map(this::addOne)
410410
.toList()
411411
.blockingGet());
412-
assertThat(result).contains(1);
412+
assertThat(result).containsExactly(1);
413413
testing()
414414
.waitAndAssertTraces(
415415
trace ->
@@ -729,7 +729,7 @@ void flowableChainHasSubscriptionContext() {
729729
.toList()
730730
.blockingGet();
731731
});
732-
assertThat(result).contains(4, 5);
732+
assertThat(result).containsExactly(4, 5);
733733
testing()
734734
.waitAndAssertTraces(
735735
trace ->
@@ -798,7 +798,7 @@ void observableChainHasSubscriptionContext() {
798798
.toList()
799799
.blockingGet();
800800
});
801-
assertThat(result).contains(4);
801+
assertThat(result).containsExactly(4);
802802
testing()
803803
.waitAndAssertTraces(
804804
trace ->

‎instrumentation/servlet/servlet-3.0/javaagent-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/HttpServletResponseTest.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public void sendRedirect(String s) {
132132
}
133133

134134
/** Tests deprecated methods */
135+
@SuppressWarnings({"deprecation", "ReturnsNullCollection"})
135136
static class TestResponse implements HttpServletResponse {
136137
@Override
137138
public void addCookie(Cookie cookie) {}
@@ -151,15 +152,11 @@ public String encodeRedirectURL(String s) {
151152
return null;
152153
}
153154

154-
// test deprecated methods
155-
@SuppressWarnings("deprecation")
156155
@Override
157156
public String encodeUrl(String s) {
158157
return null;
159158
}
160159

161-
// test deprecated methods
162-
@SuppressWarnings("deprecation")
163160
@Override
164161
public String encodeRedirectUrl(String s) {
165162
return null;
@@ -195,8 +192,6 @@ public void addIntHeader(String s, int i) {}
195192
@Override
196193
public void setStatus(int i) {}
197194

198-
// test deprecated methods
199-
@SuppressWarnings("deprecation")
200195
@Override
201196
public void setStatus(int i, String s) {}
202197

@@ -210,13 +205,11 @@ public String getHeader(String s) {
210205
return null;
211206
}
212207

213-
@SuppressWarnings("ReturnsNullCollection")
214208
@Override
215209
public Collection<String> getHeaders(String s) {
216210
return null;
217211
}
218212

219-
@SuppressWarnings("ReturnsNullCollection")
220213
@Override
221214
public Collection<String> getHeaderNames() {
222215
return null;

‎instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ && helper().needsRescoping(currentContext, attachedContext)) {
7979
if (context != null) {
8080
// Only trigger response customizer once, so only if server span was created here
8181
HttpServerResponseCustomizerHolder.getCustomizer()
82-
.customize(contextToUpdate, response, new Servlet3HttpServerResponseMutator());
82+
.customize(contextToUpdate, response, Servlet3HttpServerResponseMutator.INSTANCE);
8383
}
8484
}
8585

‎instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3HttpServerResponseMutator.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
public class Servlet3HttpServerResponseMutator
1212
implements HttpServerResponseMutator<HttpServletResponse> {
13+
public static final Servlet3HttpServerResponseMutator INSTANCE =
14+
new Servlet3HttpServerResponseMutator();
15+
1316
@Override
1417
public void appendHeader(HttpServletResponse response, String name, String value) {
1518
response.addHeader(name, value);

0 commit comments

Comments
 (0)