Skip to content

Commit ee2a789

Browse files
committed
Add to all overrides too.
1 parent 0647b87 commit ee2a789

File tree

11 files changed

+22
-15
lines changed

11 files changed

+22
-15
lines changed

api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedAttributesBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Arrays;
1010
import java.util.List;
1111
import java.util.function.Predicate;
12+
import javax.annotation.Nullable;
1213

1314
class ArrayBackedAttributesBuilder implements AttributesBuilder {
1415
private final List<Object> data;
@@ -37,7 +38,7 @@ public <T> AttributesBuilder put(AttributeKey<Long> key, int value) {
3738
}
3839

3940
@Override
40-
public <T> AttributesBuilder put(AttributeKey<T> key, T value) {
41+
public <T> AttributesBuilder put(AttributeKey<T> key, @Nullable T value) {
4142
if (key == null || key.getKey().isEmpty() || value == null) {
4243
return this;
4344
}

api/all/src/main/java/io/opentelemetry/api/logs/DefaultLogger.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import io.opentelemetry.context.Context;
1111
import java.time.Instant;
1212
import java.util.concurrent.TimeUnit;
13+
import javax.annotation.Nullable;
1314

1415
class DefaultLogger implements Logger {
1516

@@ -77,7 +78,7 @@ public LogRecordBuilder setBody(Value<?> body) {
7778
}
7879

7980
@Override
80-
public <T> LogRecordBuilder setAttribute(AttributeKey<T> key, T value) {
81+
public <T> LogRecordBuilder setAttribute(AttributeKey<T> key, @Nullable T value) {
8182
return this;
8283
}
8384

api/all/src/main/java/io/opentelemetry/api/trace/PropagatedSpan.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.common.Attributes;
1010
import java.util.concurrent.TimeUnit;
11+
import javax.annotation.Nullable;
1112
import javax.annotation.concurrent.Immutable;
1213

1314
/**
@@ -42,7 +43,7 @@ private PropagatedSpan(SpanContext spanContext) {
4243
}
4344

4445
@Override
45-
public Span setAttribute(String key, String value) {
46+
public Span setAttribute(String key, @Nullable String value) {
4647
return this;
4748
}
4849

@@ -62,7 +63,7 @@ public Span setAttribute(String key, boolean value) {
6263
}
6364

6465
@Override
65-
public <T> Span setAttribute(AttributeKey<T> key, T value) {
66+
public <T> Span setAttribute(AttributeKey<T> key, @Nullable T value) {
6667
return this;
6768
}
6869

api/all/src/test/java/io/opentelemetry/api/common/AttributesTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Map;
2727
import java.util.NoSuchElementException;
2828
import java.util.concurrent.atomic.AtomicBoolean;
29+
import javax.annotation.Nullable;
2930
import org.junit.jupiter.api.Test;
3031

3132
/** Unit tests for {@link Attributes}s. */
@@ -565,7 +566,7 @@ public <T> AttributesBuilder put(AttributeKey<Long> key, int value) {
565566
}
566567

567568
@Override
568-
public <T> AttributesBuilder put(AttributeKey<T> key, T value) {
569+
public <T> AttributesBuilder put(AttributeKey<T> key, @Nullable T value) {
569570
return null;
570571
}
571572

api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedDefaultLogger.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.opentelemetry.context.Context;
1414
import java.time.Instant;
1515
import java.util.concurrent.TimeUnit;
16+
import javax.annotation.Nullable;
1617

1718
class ExtendedDefaultLogger implements ExtendedLogger {
1819

@@ -51,7 +52,7 @@ public <T> ExtendedLogRecordBuilder setAttribute(ExtendedAttributeKey<T> key, T
5152
}
5253

5354
@Override
54-
public <T> ExtendedLogRecordBuilder setAttribute(AttributeKey<T> key, T value) {
55+
public <T> ExtendedLogRecordBuilder setAttribute(AttributeKey<T> key, @Nullable T value) {
5556
return this;
5657
}
5758

api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.opentelemetry.context.Context;
1616
import java.time.Instant;
1717
import java.util.concurrent.TimeUnit;
18+
import javax.annotation.Nullable;
1819

1920
/** Extended {@link LogRecordBuilder} with experimental APIs. */
2021
public interface ExtendedLogRecordBuilder extends LogRecordBuilder {
@@ -110,7 +111,7 @@ default ExtendedLogRecordBuilder setAllAttributes(ExtendedAttributes attributes)
110111
* attribute APIs.
111112
*/
112113
@Override
113-
<T> ExtendedLogRecordBuilder setAttribute(AttributeKey<T> key, T value);
114+
<T> ExtendedLogRecordBuilder setAttribute(AttributeKey<T> key, @Nullable T value);
114115

115116
/**
116117
* Set an attribute.

opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/DelegatingSpan.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.opentelemetry.context.Scope;
1616
import java.time.Instant;
1717
import java.util.concurrent.TimeUnit;
18+
import javax.annotation.Nullable;
1819

1920
/**
2021
* Delegates <i>all</i> {@link Span} methods to some underlying Span via {@link
@@ -52,12 +53,12 @@ default boolean isRecording() {
5253
}
5354

5455
@Override
55-
default <T> Span setAttribute(AttributeKey<T> key, T value) {
56+
default <T> Span setAttribute(AttributeKey<T> key, @Nullable T value) {
5657
return getDelegate().setAttribute(key, value);
5758
}
5859

5960
@Override
60-
default Span setAttribute(String key, String value) {
61+
default Span setAttribute(String key, @Nullable String value) {
6162
return getDelegate().setAttribute(key, value);
6263
}
6364

opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/OpenTelemetryNoRecordEventsSpanImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.EnumSet;
3838
import java.util.Map;
3939
import java.util.concurrent.TimeUnit;
40-
import javax.annotation.Nonnull;
40+
import javax.annotation.Nullable;
4141

4242
final class OpenTelemetryNoRecordEventsSpanImpl extends Span
4343
implements io.opentelemetry.api.trace.Span {
@@ -110,7 +110,7 @@ public void end(long timestamp, TimeUnit unit) {
110110
}
111111

112112
@Override
113-
public io.opentelemetry.api.trace.Span setAttribute(String key, @Nonnull String value) {
113+
public io.opentelemetry.api.trace.Span setAttribute(String key, @Nullable String value) {
114114
return this;
115115
}
116116

@@ -130,7 +130,7 @@ public io.opentelemetry.api.trace.Span setAttribute(String key, boolean value) {
130130
}
131131

132132
@Override
133-
public <T> io.opentelemetry.api.trace.Span setAttribute(AttributeKey<T> key, @Nonnull T value) {
133+
public <T> io.opentelemetry.api.trace.Span setAttribute(AttributeKey<T> key, @Nullable T value) {
134134
return this;
135135
}
136136

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public <T> ExtendedSdkLogRecordBuilder setAttribute(ExtendedAttributeKey<T> key,
117117
}
118118

119119
@Override
120-
public <T> ExtendedSdkLogRecordBuilder setAttribute(AttributeKey<T> key, T value) {
120+
public <T> ExtendedSdkLogRecordBuilder setAttribute(AttributeKey<T> key, @Nullable T value) {
121121
if (key == null || key.getKey().isEmpty() || value == null) {
122122
return this;
123123
}

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public SdkLogRecordBuilder setBody(Value<?> value) {
9595
}
9696

9797
@Override
98-
public <T> SdkLogRecordBuilder setAttribute(AttributeKey<T> key, T value) {
98+
public <T> SdkLogRecordBuilder setAttribute(AttributeKey<T> key, @Nullable T value) {
9999
if (key == null || key.getKey().isEmpty() || value == null) {
100100
return this;
101101
}

0 commit comments

Comments
 (0)