Merge branch '2.1.x'

This commit is contained in:
Marcin Grzejszczak
2019-04-25 18:44:19 +04:00
63 changed files with 246 additions and 143 deletions

View File

@@ -44,8 +44,10 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.BDDAssertions.then;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = { IntegrationSpanCollectorConfig.class,
SampleMessagingApplication.class }, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@SpringBootTest(
classes = { IntegrationSpanCollectorConfig.class,
SampleMessagingApplication.class },
webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@TestPropertySource(properties = { "sample.zipkin.enabled=true",
"spring.sleuth.http.legacy.enabled=true" })
@DirtiesContext