This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new b1dae0c01 [ISSUE #3721]Do some code optimization[JaegerTraceService]
(#3789)
b1dae0c01 is described below
commit b1dae0c018ed965f5368fa1ce28f1e25a4515dfc
Author: pandaapo <[email protected]>
AuthorDate: Wed May 3 13:27:00 2023 +0800
[ISSUE #3721]Do some code optimization[JaegerTraceService] (#3789)
* Correct the wrong variable in lambda in ZipkinTraceService#inject() and
other optimiaziton.
* Remove unused import.
* Revoke a part of modification.
---
.../java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java | 5 +++--
.../org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java | 2 +-
.../java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
index f8139a7f7..20b3fb0b7 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
@@ -31,6 +31,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import io.opentelemetry.api.OpenTelemetry;
@@ -123,13 +124,13 @@ public class JaegerTraceService implements
EventMeshTraceService {
public Context extractFrom(final Context context, final Map<String,
Object> carrier) throws TraceException {
textMapPropagator.extract(context, carrier, new
TextMapGetter<Map<String, Object>>() {
@Override
- public Iterable<String> keys(final Map<String, Object> carrier) {
+ public Iterable<String> keys(@Nonnull final Map<String, Object>
carrier) {
return carrier.keySet();
}
@Nullable
@Override
- public String get(final @Nullable Map<String, Object> carrier,
final String key) {
+ public String get(final @Nonnull Map<String, Object> carrier,
final String key) {
return
Optional.ofNullable(carrier.get(key)).map(Objects::toString).orElse(null);
}
});
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
index fb8160ca9..411533566 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
@@ -122,7 +122,7 @@ public class PinpointTraceService implements
EventMeshTraceService {
}
@Override
- public String get(final Map<String, Object> carrier, final
@Nonnull String key) {
+ public String get(final @Nonnull Map<String, Object> carrier,
final @Nonnull String key) {
return
Optional.ofNullable(carrier.get(key)).map(Objects::toString).orElse(null);
}
});
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
index 609cf12a0..2ea3a26a0 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import io.opentelemetry.api.OpenTelemetry;
@@ -130,12 +131,12 @@ public class ZipkinTraceService implements
EventMeshTraceService {
public Context extractFrom(Context context, Map<String, Object> map)
throws TraceException {
textMapPropagator.extract(context, map, new TextMapGetter<Map<String,
Object>>() {
@Override
- public Iterable<String> keys(Map<String, Object> carrier) {
+ public Iterable<String> keys(@Nonnull Map<String, Object> carrier)
{
return carrier.keySet();
}
@Override
- public String get(Map<String, Object> carrier, String key) {
+ public String get(@Nonnull Map<String, Object> carrier, String
key) {
return
Optional.ofNullable(carrier.get(key)).map(Object::toString).orElse(null);
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
