open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix main branch merge race (#2844)

This commit is contained in:
John Watson 2021-02-17 08:53:28 -08:00 committed by GitHub
parent f83c21638a
commit a100a45780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java
View File

@ -171,7 +171,7 @@ class ZipkinSpanExporterTest {
@Test @Test
void generateSpan_defaultResourceServiceName() { void generateSpan_defaultResourceServiceName() {
SpanData data = buildStandardSpan().setResource(Resource.getEmpty()).build(); SpanData data = buildStandardSpan().setResource(Resource.empty()).build();
Endpoint expectedEndpoint = Endpoint expectedEndpoint =
Endpoint.newBuilder() Endpoint.newBuilder()