Skip to content

Commit 837193a

Browse files
authored
Code review sweep (run 24896947952) (open-telemetry#18261)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 1b3d530 commit 837193a

9 files changed

Lines changed: 12 additions & 11 deletions

File tree

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private static Field getQueueDisposableField() {
111111
return queueDisposableField;
112112
}
113113

114-
public static boolean canEnable() {
114+
static boolean canEnable() {
115115
return queueDisposableField != null;
116116
}
117117
}

instrumentation/rxjava/rxjava-2.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
class RxJava2AsyncOperationEndStrategyTest {
4646
private static final AttributeKey<Boolean> CANCELED_ATTRIBUTE_KEY =
4747
AttributeKey.booleanKey("rxjava.canceled");
48-
@Mock Instrumenter<String, String> instrumenter;
49-
@Mock Span span;
48+
@Mock private Instrumenter<String, String> instrumenter;
49+
@Mock private Span span;
5050
private final AsyncOperationEndStrategy underTest = RxJava2AsyncOperationEndStrategy.create();
5151
private final RxJava2AsyncOperationEndStrategy underTestWithExperimentalAttributes =
5252
RxJava2AsyncOperationEndStrategy.builder().setCaptureExperimentalSpanAttributes(true).build();

instrumentation/rxjava/rxjava-2.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2SubscriptionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
class RxJava2SubscriptionTest extends AbstractRxJava2SubscriptionTest {
1414
@RegisterExtension
15-
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
15+
private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1616

17-
static final TracingAssembly tracingAssembly = TracingAssembly.create();
17+
private static final TracingAssembly tracingAssembly = TracingAssembly.create();
1818

1919
@Override
2020
protected InstrumentationExtension testing() {

instrumentation/rxjava/rxjava-2.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
class RxJava2Test extends AbstractRxJava2Test {
1414
@RegisterExtension
15-
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
15+
private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1616

17-
static final TracingAssembly tracingAssembly = TracingAssembly.create();
17+
private static final TracingAssembly tracingAssembly = TracingAssembly.create();
1818

1919
@Override
2020
protected InstrumentationExtension testing() {

instrumentation/rxjava/rxjava-2.0/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ features:
88
- CONTEXT_PROPAGATION
99
configurations:
1010
- name: otel.instrumentation.rxjava.experimental-span-attributes
11+
declarative_name: java.rxjava.experimental_span_attributes/development
1112
description: >
1213
Enables the experimental span attribute `rxjava.canceled`.
1314
type: boolean

instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3ExtensionWithSpanTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class RxJava3ExtensionWithSpanTest extends AbstractRxJava3WithSpanTest {
1616
@RegisterExtension
17-
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
17+
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1818

1919
@Override
2020
protected AbstractTracedWithSpan newTraced() {

instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3InstrumentationWithSpanTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class RxJava3InstrumentationWithSpanTest extends AbstractRxJava3WithSpanTest {
1616
@RegisterExtension
17-
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
17+
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1818

1919
@Override
2020
protected AbstractTracedWithSpan newTraced() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class RxJava3SubscriptionTest extends AbstractRxJava3SubscriptionTest {
1414
@RegisterExtension
15-
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
15+
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1616

1717
@Override
1818
protected InstrumentationExtension testing() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class RxJava3Test extends AbstractRxJava3Test {
1414
@RegisterExtension
15-
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
15+
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1616

1717
@Override
1818
protected InstrumentationExtension testing() {

0 commit comments

Comments
 (0)