Skip to content

Commit 82d2ecb

Browse files
svc-excavator-botsvc-excavator-bot
committed
Excavator: Upgrades Baseline to the latest version
1 parent 5b6f60c commit 82d2ecb

File tree

4 files changed

+40
-44
lines changed

4 files changed

+40
-44
lines changed

‎.baseline/checkstyle/checkstyle.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@
469469
<module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
470470
<module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
471471
<module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
472-
<property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
472+
<property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
473473
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
474474
</module>
475475
<module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ buildscript {
2727
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
2828
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
2929
classpath 'com.netflix.nebula:nebula-publishing-plugin:13.5.1'
30-
classpath 'com.palantir.baseline:gradle-baseline-java:2.5.0'
30+
classpath 'com.palantir.baseline:gradle-baseline-java:2.8.0'
3131
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
3232
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
3333
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'

‎tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616

1717
package com.palantir.tracing.jersey;
1818

19-
import static org.hamcrest.Matchers.is;
20-
import static org.hamcrest.Matchers.not;
21-
import static org.hamcrest.Matchers.nullValue;
22-
import static org.junit.Assert.assertThat;
19+
import static org.assertj.core.api.Assertions.assertThat;
2320
import static org.mockito.ArgumentMatchers.anyBoolean;
2421
import static org.mockito.ArgumentMatchers.anyString;
2522
import static org.mockito.ArgumentMatchers.eq;
@@ -113,11 +110,11 @@ public void testTraceState_withHeaderUsesTraceId() {
113110
.header(TraceHttpHeaders.PARENT_SPAN_ID, "parentSpanId")
114111
.header(TraceHttpHeaders.SPAN_ID, "spanId")
115112
.get();
116-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), is("traceId"));
117-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
118-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
113+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isEqualTo("traceId");
114+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
115+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
119116
verify(observer).consume(spanCaptor.capture());
120-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace"));
117+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /trace");
121118
}
122119

123120
@Test
@@ -127,11 +124,11 @@ public void testTraceState_respectsMethod() {
127124
.header(TraceHttpHeaders.PARENT_SPAN_ID, "parentSpanId")
128125
.header(TraceHttpHeaders.SPAN_ID, "spanId")
129126
.post(Entity.json(""));
130-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), is("traceId"));
131-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
132-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
127+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isEqualTo("traceId");
128+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
129+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
133130
verify(observer).consume(spanCaptor.capture());
134-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: POST /trace"));
131+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: POST /trace");
135132
}
136133

137134
@Test
@@ -141,51 +138,51 @@ public void testTraceState_doesNotIncludePathParams() {
141138
.header(TraceHttpHeaders.PARENT_SPAN_ID, "parentSpanId")
142139
.header(TraceHttpHeaders.SPAN_ID, "spanId")
143140
.get();
144-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), is("traceId"));
145-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
146-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
141+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isEqualTo("traceId");
142+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
143+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
147144
verify(observer).consume(spanCaptor.capture());
148-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace/{param}"));
145+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /trace/{param}");
149146
}
150147

151148
@Test
152149
public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeaders() {
153150
Response response = target.path("/trace").request().get();
154-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), not(nullValue()));
155-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
156-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
151+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isNotNull();
152+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
153+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
157154
verify(observer).consume(spanCaptor.capture());
158-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace"));
155+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /trace");
159156
}
160157

161158
@Test
162159
public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeadersWhenFailing() {
163160
Response response = target.path("/failing-trace").request().get();
164-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), not(nullValue()));
165-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
166-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
161+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isNotNull();
162+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
163+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
167164
verify(observer).consume(spanCaptor.capture());
168-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /failing-trace"));
165+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /failing-trace");
169166
}
170167

171168
@Test
172169
public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeadersWhenStreaming() {
173170
Response response = target.path("/streaming-trace").request().get();
174-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), not(nullValue()));
175-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
176-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
171+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isNotNull();
172+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
173+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
177174
verify(observer).consume(spanCaptor.capture());
178-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /streaming-trace"));
175+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /streaming-trace");
179176
}
180177

181178
@Test
182179
public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeadersWhenFailingToStream() {
183180
Response response = target.path("/failing-streaming-trace").request().get();
184-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), not(nullValue()));
185-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
186-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
181+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isNotNull();
182+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
183+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
187184
verify(observer).consume(spanCaptor.capture());
188-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /failing-streaming-trace"));
185+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /failing-streaming-trace");
189186
}
190187

191188
@Test
@@ -208,18 +205,18 @@ public void testTraceState_withSamplingHeaderWithoutTraceIdDoesNotUseTraceSample
208205
@Test
209206
public void testTraceState_withEmptyTraceIdGeneratesValidTraceResponseHeaders() {
210207
Response response = target.path("/trace").request().header(TraceHttpHeaders.TRACE_ID, "").get();
211-
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID), not(nullValue()));
212-
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
213-
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
208+
assertThat(response.getHeaderString(TraceHttpHeaders.TRACE_ID)).isNotNull();
209+
assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID)).isNull();
210+
assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID)).isNull();
214211
verify(observer).consume(spanCaptor.capture());
215-
assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace"));
212+
assertThat(spanCaptor.getValue().getOperation()).isEqualTo("Jersey: GET /trace");
216213
}
217214

218215
@Test
219216
public void testFilter_setsMdcIfTraceIdHeaderIsPresent() throws Exception {
220217
when(request.getHeaderString(TraceHttpHeaders.TRACE_ID)).thenReturn("traceId");
221218
TraceEnrichingFilter.INSTANCE.filter(request);
222-
assertThat(MDC.get(Tracers.TRACE_ID_KEY), is("traceId"));
219+
assertThat(MDC.get(Tracers.TRACE_ID_KEY)).isEqualTo("traceId");
223220
verify(request).setProperty(TraceEnrichingFilter.TRACE_ID_PROPERTY_NAME, "traceId");
224221
// Note: this will be set to a random value; we want to check whether the value is being set
225222
verify(request).setProperty(eq(TraceEnrichingFilter.SAMPLED_PROPERTY_NAME), anyBoolean());
@@ -230,13 +227,13 @@ public void testFilter_createsReceiveAndSendEvents() throws Exception {
230227
target.path("/trace").request().header(TraceHttpHeaders.TRACE_ID, "").get();
231228
verify(observer).consume(spanCaptor.capture());
232229
Span span = spanCaptor.getValue();
233-
assertThat(span.type(), is(SpanType.SERVER_INCOMING));
230+
assertThat(span.type()).isEqualTo(SpanType.SERVER_INCOMING);
234231
}
235232

236233
@Test
237234
public void testFilter_setsMdcIfTraceIdHeaderIsNotePresent() throws Exception {
238235
TraceEnrichingFilter.INSTANCE.filter(request);
239-
assertThat(MDC.get(Tracers.TRACE_ID_KEY).length(), is(16));
236+
assertThat(MDC.get(Tracers.TRACE_ID_KEY).length()).isEqualTo(16);
240237
verify(request).setProperty(eq(TraceEnrichingFilter.TRACE_ID_PROPERTY_NAME), anyString());
241238
}
242239

‎tracing/src/test/java/com/palantir/tracing/TracerTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.palantir.logsafe.testing.Assertions.assertThatLoggableExceptionThrownBy;
2020
import static org.assertj.core.api.Assertions.assertThat;
21-
import static org.junit.Assert.assertTrue;
2221
import static org.mockito.ArgumentMatchers.any;
2322
import static org.mockito.Mockito.times;
2423
import static org.mockito.Mockito.verify;
@@ -251,13 +250,13 @@ public void testCompleteSpanWithMetadataIncludesMetadata() {
251250
"key2", "value2");
252251
Tracer.fastStartSpan("operation");
253252
Optional<Span> maybeSpan = Tracer.completeSpan(metadata);
254-
assertTrue(maybeSpan.isPresent());
253+
assertThat(maybeSpan.isPresent()).isTrue();
255254
assertThat(maybeSpan.get().getMetadata()).isEqualTo(metadata);
256255
}
257256

258257
@Test
259258
public void testCompleteSpanWithoutMetadataHasNoMetadata() {
260-
assertTrue(startAndCompleteSpan().getMetadata().isEmpty());
259+
assertThat(startAndCompleteSpan().getMetadata().isEmpty()).isTrue();
261260
}
262261

263262
@Test

0 commit comments

Comments
 (0)