Update websocket.go

fixed merge conflict
elastic · Jan 17, 2025 · e0419e2 · e0419e2
1 parent fcfddb2
commit e0419e2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/x-pack/filebeat/input/streaming/websocket.go b/x-pack/filebeat/input/streaming/websocket.go
@@ -219,11 +219,7 @@ func (s *websocketStream) FollowStream(ctx context.Context) error {
 			}
 			s.metrics.receivedBytesTotal.Add(uint64(len(message)))
 			state["response"] = message
-<<<<<<< HEAD
-			s.log.Debugw("received websocket message", logp.Namespace("websocket"), string(message))
-=======
 			s.log.Debugw("received websocket message", logp.Namespace(s.ns), "msg", string(message))
->>>>>>> ef3bd69d3 ([streaming] - Made namespace consistent in logging & put a null check to stop paincs on shutdown (#42315))
 			err = s.process(ctx, state, s.cursor, s.now().In(time.UTC))
 			if err != nil {
 				s.metrics.errorsTotal.Inc()