SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Opened API, added methods required for Wavefront integration with OTel (#1852)

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-02-19 21:00:27 +01:00
committed by GitHub
parent b3ff42eade
commit 68f284d1cf
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-sleuth-api/src/main/java/org/springframework/cloud/sleuth/exporter/FinishedSpan.java
View File

@@ -76,6 +76,12 @@ public interface FinishedSpan {
@Nullable
String getRemoteIp();
/**
* @return span's local ip
*/
@Nullable
String getLocalIp();
/**
* @return span's remote port
*/

15
spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/BraveFinishedSpan.java
View File

@@ -30,11 +30,11 @@ import org.springframework.cloud.sleuth.exporter.FinishedSpan;
* @author Marcin Grzejszczak
* @since 3.0.0
*/
class BraveFinishedSpan implements FinishedSpan {
public class BraveFinishedSpan implements FinishedSpan {
private final MutableSpan mutableSpan;
BraveFinishedSpan(MutableSpan mutableSpan) {
public BraveFinishedSpan(MutableSpan mutableSpan) {
this.mutableSpan = mutableSpan;
}
@@ -78,6 +78,11 @@ class BraveFinishedSpan implements FinishedSpan {
return this.mutableSpan.remoteIp();
}
@Override
public String getLocalIp() {
return this.mutableSpan.localIp();
}
@Override
public int getRemotePort() {
return this.mutableSpan.remotePort();
@@ -106,10 +111,14 @@ class BraveFinishedSpan implements FinishedSpan {
return this.mutableSpan.remoteServiceName();
}
static FinishedSpan fromBrave(MutableSpan mutableSpan) {
public static FinishedSpan fromBrave(MutableSpan mutableSpan) {
return new BraveFinishedSpan(mutableSpan);
}
public static MutableSpan toBrave(FinishedSpan mutableSpan) {
return ((BraveFinishedSpan) mutableSpan).mutableSpan;
}
@Override
public String toString() {
return "BraveFinishedSpan{" + "mutableSpan=" + mutableSpan + '}';

8
spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/BraveTraceContext.java
View File

@@ -27,11 +27,11 @@ import org.springframework.lang.Nullable;
* @author Marcin Grzejszczak
* @since 3.0.0
*/
class BraveTraceContext implements TraceContext {
public class BraveTraceContext implements TraceContext {
final brave.propagation.TraceContext traceContext;
BraveTraceContext(brave.propagation.TraceContext traceContext) {
public BraveTraceContext(brave.propagation.TraceContext traceContext) {
this.traceContext = traceContext;
}
@@ -61,14 +61,14 @@ class BraveTraceContext implements TraceContext {
return this.traceContext != null ? this.traceContext.toString() : "null";
}
static brave.propagation.TraceContext toBrave(TraceContext traceContext) {
public static brave.propagation.TraceContext toBrave(TraceContext traceContext) {
if (traceContext == null) {
return null;
}
return ((BraveTraceContext) traceContext).traceContext;
}
static TraceContext fromBrave(brave.propagation.TraceContext traceContext) {
public static TraceContext fromBrave(brave.propagation.TraceContext traceContext) {
return new BraveTraceContext(traceContext);
}