Skip to content

Commit 7f42bb7

Browse files
ttddyyshakuzen
authored andcommitted
Add nullable to Observation.parentObservation (#3532)
1 parent 990e817 commit 7f42bb7

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

micrometer-observation/src/main/java/io/micrometer/observation/NoopObservation.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package io.micrometer.observation;
1717

1818
import io.micrometer.common.KeyValue;
19+
import io.micrometer.common.lang.Nullable;
1920

2021
/**
2122
* No-op implementation of {@link Observation} so that we can disable the instrumentation
@@ -39,12 +40,12 @@ private NoopObservation() {
3940
}
4041

4142
@Override
42-
public Observation contextualName(String contextualName) {
43+
public Observation contextualName(@Nullable String contextualName) {
4344
return this;
4445
}
4546

4647
@Override
47-
public Observation parentObservation(Observation parentObservation) {
48+
public Observation parentObservation(@Nullable Observation parentObservation) {
4849
return this;
4950
}
5051

micrometer-observation/src/main/java/io/micrometer/observation/Observation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static <T extends Context> Observation createNotStarted(ObservationConvention<T>
302302
* @param parentObservation parent observation to set
303303
* @return this
304304
*/
305-
Observation parentObservation(Observation parentObservation);
305+
Observation parentObservation(@Nullable Observation parentObservation);
306306

307307
/**
308308
* Adds a low cardinality key value. Low cardinality means that this key value will

micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public Observation contextualName(@Nullable String contextualName) {
8585
}
8686

8787
@Override
88-
public Observation parentObservation(Observation parentObservation) {
88+
public Observation parentObservation(@Nullable Observation parentObservation) {
8989
this.context.setParentObservation(parentObservation);
9090
return this;
9191
}

0 commit comments

Comments
 (0)