Cleanups of build including upgrade of Brave (#1530)

In efforts to dig deep into benchmarks, I noticed we were a bit out of
date on Brave. Then, noticed some other artifacts could be bumped
safely. Finally, a find/replace on http/https was over zealous and
tripped up XML.

One change to test expectations and Brave is explained here:
https://github.com/openzipkin/brave/blob/master/instrumentation/RATIONALE.md#calling-spanfinish-while-the-context-is-in-scope
This commit is contained in:
Adrian Cole
2020-01-21 16:44:08 +08:00
committed by Adrian Cole
parent d7b7e81235
commit 8a4002d288
33 changed files with 51 additions and 99 deletions

View File

@@ -15,7 +15,7 @@
~ limitations under the License.
-->
<project xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -383,7 +383,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>4</forkCount>

View File

@@ -89,7 +89,7 @@ public class TracingFeignClientTests {
}
then(this.reporter.getSpans().get(0)).extracting("kind.ordinal")
.contains(Span.Kind.CLIENT.ordinal());
.isEqualTo(Span.Kind.CLIENT.ordinal());
}
@Test
@@ -113,7 +113,7 @@ public class TracingFeignClientTests {
}
then(this.reporter.getSpans().get(0)).extracting("kind.ordinal")
.contains(Span.Kind.CLIENT.ordinal());
.isEqualTo(Span.Kind.CLIENT.ordinal());
then(this.reporter.getSpans().get(0).tags()).containsEntry("error",
"exception has occurred");
}