Skip to content

Commit f2f65b6

Browse files
renovate[bot]traskotelbot[bot]laurit
authored
fix(deps): update errorprone packages to v2.41.0 (open-telemetry#2061)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]> Co-authored-by: otelbot <[email protected]> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 212cdf5 commit f2f65b6

File tree

14 files changed

+41
-42
lines changed

14 files changed

+41
-42
lines changed

‎consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private static final class State {
7474
private final double effectiveWindowNanos;
7575
private final long lastNanoTime;
7676

77-
public State(double effectiveWindowCount, double effectiveWindowNanos, long lastNanoTime) {
77+
State(double effectiveWindowCount, double effectiveWindowNanos, long lastNanoTime) {
7878
this.effectiveWindowCount = effectiveWindowCount;
7979
this.effectiveWindowNanos = effectiveWindowNanos;
8080
this.lastNanoTime = lastNanoTime;

‎consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static final class ReadableSpanWithPriority {
5555
private final int rval;
5656
private final long priority;
5757

58-
public static ReadableSpanWithPriority create(
58+
static ReadableSpanWithPriority create(
5959
ReadableSpan readableSpan, RandomGenerator randomGenerator) {
6060
String otelTraceStateString =
6161
readableSpan.getSpanContext().getTraceState().get(OtelTraceState.TRACE_STATE_KEY);
@@ -201,7 +201,7 @@ private static final class Reservoir {
201201
private final PriorityQueue<ReadableSpanWithPriority> queue;
202202
private final RandomGenerator randomGenerator;
203203

204-
public Reservoir(int reservoirSize, RandomGenerator randomGenerator) {
204+
Reservoir(int reservoirSize, RandomGenerator randomGenerator) {
205205
if (reservoirSize < 1) {
206206
throw new IllegalArgumentException();
207207
}
@@ -211,7 +211,7 @@ public Reservoir(int reservoirSize, RandomGenerator randomGenerator) {
211211
this.randomGenerator = randomGenerator;
212212
}
213213

214-
public void add(ReadableSpanWithPriority readableSpanWithPriority) {
214+
void add(ReadableSpanWithPriority readableSpanWithPriority) {
215215

216216
if (queue.size() < reservoirSize) {
217217
queue.add(readableSpanWithPriority);
@@ -232,7 +232,7 @@ public void add(ReadableSpanWithPriority readableSpanWithPriority) {
232232
}
233233
}
234234

235-
public List<SpanData> getResult() {
235+
List<SpanData> getResult() {
236236

237237
if (numberOfDiscardedSpansWithMaxDiscardedRValue == 0) {
238238
return queue.stream().map(x -> x.readableSpan.toSpanData()).collect(Collectors.toList());
@@ -294,7 +294,7 @@ public List<SpanData> getResult() {
294294
return result;
295295
}
296296

297-
public boolean isEmpty() {
297+
boolean isEmpty() {
298298
return queue.isEmpty();
299299
}
300300
}

‎consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSampler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static final class State {
104104
private final double effectiveDelegateProbability;
105105
private final long lastNanoTime;
106106

107-
public State(
107+
State(
108108
double effectiveWindowCount,
109109
double effectiveWindowNanos,
110110
long lastNanoTime,

‎consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public CompletableResultCode shutdown() {
125125
return CompletableResultCode.ofSuccess();
126126
}
127127

128-
public void reset() {
128+
void reset() {
129129
this.countDownLatch = new CountDownLatch(numberOfSpansToWaitFor);
130130
}
131131
}

‎consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,42 @@ private static class Input {
3737
private OptionalLong parentThreshold = OptionalLong.empty();
3838
private OptionalLong parentRandomValue = OptionalLong.empty();
3939

40-
public void setParentSampled(boolean parentSampled) {
40+
void setParentSampled(boolean parentSampled) {
4141
this.parentSampled = parentSampled;
4242
}
4343

44-
public void setParentThreshold(long parentThreshold) {
44+
void setParentThreshold(long parentThreshold) {
4545
assertThat(parentThreshold).isBetween(0L, 0xffffffffffffffL);
4646
this.parentThreshold = OptionalLong.of(parentThreshold);
4747
}
4848

49-
public void setParentRandomValue(long parentRandomValue) {
49+
void setParentRandomValue(long parentRandomValue) {
5050
assertThat(parentRandomValue).isBetween(0L, 0xffffffffffffffL);
5151
this.parentRandomValue = OptionalLong.of(parentRandomValue);
5252
}
5353

54-
public Context getParentContext() {
54+
Context getParentContext() {
5555
return createParentContext(
5656
traceId, spanId, parentThreshold, parentRandomValue, parentSampled);
5757
}
5858

59-
public static String getTraceId() {
59+
static String getTraceId() {
6060
return traceId;
6161
}
6262

63-
public static String getName() {
63+
static String getName() {
6464
return name;
6565
}
6666

67-
public static SpanKind getSpanKind() {
67+
static SpanKind getSpanKind() {
6868
return spanKind;
6969
}
7070

71-
public static Attributes getAttributes() {
71+
static Attributes getAttributes() {
7272
return attributes;
7373
}
7474

75-
public static List<LinkData> getParentLinks() {
75+
static List<LinkData> getParentLinks() {
7676
return parentLinks;
7777
}
7878
}

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ dependencies {
2727
api("com.google.auto.service:auto-service-annotations:1.1.1")
2828
api("com.google.auto.value:auto-value:1.11.0")
2929
api("com.google.auto.value:auto-value-annotations:1.11.0")
30-
api("com.google.errorprone:error_prone_annotations:2.40.0")
31-
api("com.google.errorprone:error_prone_core:2.40.0")
30+
api("com.google.errorprone:error_prone_annotations:2.41.0")
31+
api("com.google.errorprone:error_prone_core:2.41.0")
3232
api("io.github.netmikey.logunit:logunit-jul:2.0.0")
3333
api("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
3434
api("io.prometheus:simpleclient:0.16.0")

‎disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,8 @@ private static Attributes protoToAttributes(List<KeyValue> source) {
766766
}
767767

768768
private static final class DataWithType {
769-
public final Data<?> data;
770-
public final MetricDataType type;
769+
final Data<?> data;
770+
final MetricDataType type;
771771

772772
private DataWithType(Data<?> data, MetricDataType type) {
773773
this.data = data;

‎inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,28 +90,27 @@ private static class PropertiesApplier {
9090

9191
private final ConfigProperties properties;
9292

93-
public PropertiesApplier(ConfigProperties properties) {
93+
PropertiesApplier(ConfigProperties properties) {
9494
this.properties = properties;
9595
}
9696

97-
public void applyBool(String configKey, Consumer<Boolean> funcToApply) {
97+
void applyBool(String configKey, Consumer<Boolean> funcToApply) {
9898
applyValue(properties.getBoolean(configKey), funcToApply);
9999
}
100100

101-
public void applyInt(String configKey, Consumer<Integer> funcToApply) {
101+
void applyInt(String configKey, Consumer<Integer> funcToApply) {
102102
applyValue(properties.getInt(configKey), funcToApply);
103103
}
104104

105-
public void applyDuration(String configKey, Consumer<Duration> funcToApply) {
105+
void applyDuration(String configKey, Consumer<Duration> funcToApply) {
106106
applyValue(properties.getDuration(configKey), funcToApply);
107107
}
108108

109-
public void applyString(String configKey, Consumer<String> funcToApply) {
109+
void applyString(String configKey, Consumer<String> funcToApply) {
110110
applyValue(properties.getString(configKey), funcToApply);
111111
}
112112

113-
public void applyWildcards(
114-
String configKey, Consumer<? super List<WildcardMatcher>> funcToApply) {
113+
void applyWildcards(String configKey, Consumer<? super List<WildcardMatcher>> funcToApply) {
115114
String wildcardListString = properties.getString(configKey);
116115
if (wildcardListString != null && !wildcardListString.isEmpty()) {
117116
List<WildcardMatcher> values =

‎inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ public int compareTo(StackTraceEvent o) {
806806
}
807807

808808
private static class ActivationEvent {
809-
public static final int SERIALIZED_SIZE =
809+
static final int SERIALIZED_SIZE =
810810
Long.SIZE / Byte.SIZE
811811
+ // timestamp
812812
TraceContext.SERIALIZED_LENGTH
@@ -826,7 +826,7 @@ private static class ActivationEvent {
826826
private long threadId;
827827
private boolean activation;
828828

829-
public void activation(
829+
void activation(
830830
Span context,
831831
long threadId,
832832
@Nullable Span previousContext,
@@ -835,7 +835,7 @@ public void activation(
835835
set(context, threadId, /* activation= */ true, previousContext, nanoTime, clock);
836836
}
837837

838-
public void deactivation(
838+
void deactivation(
839839
Span context,
840840
long threadId,
841841
@Nullable Span previousContext,
@@ -864,7 +864,7 @@ private void set(
864864
this.timestamp = nanoTime;
865865
}
866866

867-
public void handle(SamplingProfiler samplingProfiler) {
867+
void handle(SamplingProfiler samplingProfiler) {
868868
if (logger.isLoggable(Level.FINE)) {
869869
logger.log(
870870
Level.FINE,
@@ -975,7 +975,7 @@ private void stopProfiling(SamplingProfiler samplingProfiler) {
975975
}
976976
}
977977

978-
public void serialize(ByteBuffer buf) {
978+
void serialize(ByteBuffer buf) {
979979
buf.putLong(timestamp);
980980
buf.put(traceContextBuffer);
981981
buf.put(previousContextBuffer);
@@ -984,7 +984,7 @@ public void serialize(ByteBuffer buf) {
984984
buf.put(activation ? (byte) 1 : (byte) 0);
985985
}
986986

987-
public void deserialize(ByteBuffer buf) {
987+
void deserialize(ByteBuffer buf) {
988988
timestamp = buf.getLong();
989989
buf.get(traceContextBuffer);
990990
buf.get(previousContextBuffer);

‎inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ private static class StackTraceEvent {
10521052
private final List<StackFrame> trace;
10531053
private final long nanoTime;
10541054

1055-
public StackTraceEvent(List<StackFrame> trace, long nanoTime) {
1055+
StackTraceEvent(List<StackFrame> trace, long nanoTime) {
10561056

10571057
this.trace = trace;
10581058
this.nanoTime = nanoTime;

0 commit comments

Comments
 (0)