Skip to content

Commit d883538

Browse files
lrhkobelrhkobe
committed
fix checkMainStyle problem
1 parent 3bbf724 commit d883538

File tree

2 files changed

+52
-53
lines changed

2 files changed

+52
-53
lines changed

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java

+46-46
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,13 @@
5151
import java.util.concurrent.ThreadPoolExecutor;
5252
import java.util.concurrent.atomic.AtomicBoolean;
5353
import java.util.concurrent.atomic.AtomicInteger;
54+
5455
import javax.net.ssl.SSLContext;
5556
import javax.net.ssl.SSLEngine;
57+
5658
import org.slf4j.Logger;
5759
import org.slf4j.LoggerFactory;
60+
5861
import io.netty.bootstrap.ServerBootstrap;
5962
import io.netty.channel.ChannelDuplexHandler;
6063
import io.netty.channel.ChannelFuture;
@@ -297,43 +300,43 @@ class HTTPHandler extends SimpleChannelInboundHandler<HttpRequest> {
297300

298301
@Override
299302
protected void channelRead0(ChannelHandlerContext ctx, HttpRequest httpRequest) {
300-
// Context context = null;
301-
// Span span = null;
302-
// if (useTrace) {
303-
//
304-
// //if the client injected span context,this will extract the context from httpRequest or it will be null
305-
// context = textMapPropagator.extract(Context.current(), httpRequest, new TextMapGetter<HttpRequest>() {
306-
// @Override
307-
// public Iterable<String> keys(HttpRequest carrier) {
308-
// return carrier.headers().names();
309-
// }
310-
//
311-
// @Override
312-
// public String get(HttpRequest carrier, String key) {
313-
// return carrier.headers().get(key);
314-
// }
315-
// });
316-
//
317-
// span = tracer.spanBuilder("HTTP " + httpRequest.method())
318-
// .setParent(context)
319-
// .setSpanKind(SpanKind.SERVER)
320-
// .startSpan();
321-
// //attach the span to the server context
322-
// context = context.with(SpanKey.SERVER_KEY, span);
323-
// //put the context in channel
324-
// ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).set(context);
325-
// }
303+
// Context context = null;
304+
// Span span = null;
305+
// if (useTrace) {
306+
//
307+
// //if the client injected span context,this will extract the context from httpRequest or it will be null
308+
// context = textMapPropagator.extract(Context.current(), httpRequest, new TextMapGetter<HttpRequest>() {
309+
// @Override
310+
// public Iterable<String> keys(HttpRequest carrier) {
311+
// return carrier.headers().names();
312+
// }
313+
//
314+
// @Override
315+
// public String get(HttpRequest carrier, String key) {
316+
// return carrier.headers().get(key);
317+
// }
318+
// });
319+
//
320+
// span = tracer.spanBuilder("HTTP " + httpRequest.method())
321+
// .setParent(context)
322+
// .setSpanKind(SpanKind.SERVER)
323+
// .startSpan();
324+
// //attach the span to the server context
325+
// context = context.with(SpanKey.SERVER_KEY, span);
326+
// //put the context in channel
327+
// ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).set(context);
328+
// }
326329

327330

328331

329332
Span span = null;
330-
// Context context = null;
331-
// context = EventMeshServer.getTrace().extractFrom();
332-
// span = EventMeshServer.getTrace().createSpan("", context);
333-
// //attach the span to the server context
334-
// context = context.with(SpanKey.SERVER_KEY, span);
335-
// //put the context in channel
336-
// ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).set(context);
333+
// Context context = null;
334+
// context = EventMeshServer.getTrace().extractFrom();
335+
// span = EventMeshServer.getTrace().createSpan("", context);
336+
// //attach the span to the server context
337+
// context = context.with(SpanKey.SERVER_KEY, span);
338+
// //put the context in channel
339+
// ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).set(context);
337340

338341
try {
339342
preProcessHttpRequestHeader(ctx, httpRequest);
@@ -384,11 +387,11 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpRequest httpRequest)
384387
requestCommand.setHttpVersion(httpRequest.protocolVersion().protocolName());
385388
requestCommand.setRequestCode(requestCode);
386389

387-
// if (useTrace) {
388-
// span.setAttribute(SemanticAttributes.HTTP_METHOD, httpRequest.method().name());
389-
// span.setAttribute(SemanticAttributes.HTTP_FLAVOR, httpRequest.protocolVersion().protocolName());
390-
// span.setAttribute(String.valueOf(SemanticAttributes.HTTP_STATUS_CODE), requestCode);
391-
// }
390+
// if (useTrace) {
391+
// span.setAttribute(SemanticAttributes.HTTP_METHOD, httpRequest.method().name());
392+
// span.setAttribute(SemanticAttributes.HTTP_FLAVOR, httpRequest.protocolVersion().protocolName());
393+
// span.setAttribute(String.valueOf(SemanticAttributes.HTTP_STATUS_CODE), requestCode);
394+
// }
392395

393396
HttpCommand responseCommand = null;
394397

@@ -428,8 +431,6 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpRequest httpRequest)
428431

429432
} catch (Exception ex) {
430433
httpServerLogger.error("AbrstractHTTPServer.HTTPHandler.channelRead0 err", ex);
431-
432-
// EventMeshServer.getTrace().finishSpan(span, null, null, ex);
433434
}
434435
}
435436

@@ -514,8 +515,10 @@ public void processEventMeshRequest(final ChannelHandlerContext ctx,
514515
sendResponse(ctx, responseCommand.httpResponse());
515516

516517
Map<String, Object> traceMap = asyncContext.getRequest().getHeader().toMap();
517-
Span span = TraceUtils.prepareServerSpan(traceMap, EventMeshTraceConstants.TRACE_UPSTREAM_EVENTMESH_SERVER_SPAN, false);
518-
TraceUtils.finishSpanWithException(span, traceMap, EventMeshRetCode.EVENTMESH_REJECT_BY_PROCESSOR_ERROR.getErrMsg(), null);
518+
Span span = TraceUtils.prepareServerSpan(traceMap, EventMeshTraceConstants.TRACE_UPSTREAM_EVENTMESH_SERVER_SPAN,
519+
false);
520+
TraceUtils.finishSpanWithException(span, traceMap,
521+
EventMeshRetCode.EVENTMESH_REJECT_BY_PROCESSOR_ERROR.getErrMsg(), null);
519522
}
520523
return;
521524
}
@@ -534,8 +537,6 @@ public void processEventMeshRequest(final ChannelHandlerContext ctx,
534537

535538
sendResponse(ctx, asyncContext.getResponse().httpResponse());
536539

537-
// EventMeshServer.getTrace().finishSpan(ctx, StatusCode.OK);
538-
539540
} catch (Exception e) {
540541
httpServerLogger.error("process error", e);
541542
}
@@ -551,7 +552,6 @@ public void processEventMeshRequest(final ChannelHandlerContext ctx,
551552
Map<String, Object> traceMap = asyncContext.getRequest().getHeader().toMap();
552553
Span span = TraceUtils.prepareServerSpan(traceMap, EventMeshTraceConstants.TRACE_UPSTREAM_EVENTMESH_SERVER_SPAN, false);
553554
TraceUtils.finishSpanWithException(span, traceMap, EventMeshRetCode.EVENTMESH_RUNTIME_ERR.getErrMsg(), re);
554-
// EventMeshServer.getTrace().finishSpan(ctx, StatusCode.ERROR, EventMeshRetCode.OVERLOAD.getErrMsg(), re);
555555
} catch (Exception e) {
556556
httpServerLogger.error("processEventMeshRequest fail", re);
557557
}
@@ -574,7 +574,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
574574
}
575575
}
576576

577-
Map<String, String> extractFromRequest(HttpRequest httpRequest){
577+
Map<String, String> extractFromRequest(HttpRequest httpRequest) {
578578
return null;
579579
}
580580
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/HTTPMessageHandler.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
package org.apache.eventmesh.runtime.core.protocol.http.push;
1919

20-
import io.opentelemetry.api.trace.Span;
21-
import io.opentelemetry.context.Scope;
22-
2320
import org.apache.eventmesh.common.Constants;
2421
import org.apache.eventmesh.common.ThreadPoolFactory;
2522
import org.apache.eventmesh.runtime.core.protocol.http.consumer.EventMeshConsumer;
@@ -41,6 +38,8 @@
4138
import org.slf4j.Logger;
4239
import org.slf4j.LoggerFactory;
4340

41+
import io.opentelemetry.api.trace.Span;
42+
4443
import com.google.common.collect.Maps;
4544
import com.google.common.collect.Sets;
4645

@@ -89,13 +88,13 @@ public boolean handle(final HandleMsgContext handleMsgContext) {
8988
String protocolVersion = Objects.requireNonNull(handleMsgContext.getEvent().getExtension(
9089
Constants.PROTOCOL_VERSION)).toString();
9190

92-
Span span = TraceUtils.prepareClientSpan(
93-
EventMeshUtil.getCloudEventExtensionMap(protocolVersion, handleMsgContext.getEvent()), EventMeshTraceConstants.TRACE_DOWNSTREAM_EVENTMESH_CLIENT_SPAN, false);
91+
Span span = TraceUtils.prepareClientSpan(EventMeshUtil.getCloudEventExtensionMap(protocolVersion, handleMsgContext.getEvent()),
92+
EventMeshTraceConstants.TRACE_DOWNSTREAM_EVENTMESH_CLIENT_SPAN, false);
9493

95-
try(Scope scope = span.makeCurrent()){
94+
try {
9695
AsyncHTTPPushRequest asyncPushRequest = new AsyncHTTPPushRequest(handleMsgContext, waitingRequests);
9796
asyncPushRequest.tryHTTPRequest();
98-
}finally {
97+
} finally {
9998
TraceUtils.finishSpan(span, handleMsgContext.getEvent());
10099
}
101100

0 commit comments

Comments
 (0)