@@ -140,11 +140,12 @@ func (p *Proxy) ProxyHTTP(
140
140
return fmt .Errorf ("response writer is not a flusher" )
141
141
}
142
142
rws := connection .NewHTTPResponseReadWriterAcker (w , flusher , req )
143
- connectedLogger := p .log .Debug ().
143
+ logger := p .log .With ().
144
144
Int (management .EventTypeKey , int (management .HTTP )).
145
145
Str (LogFieldDestAddr , dest ).
146
- Uint8 (LogFieldConnIndex , tr .ConnIndex )
147
- if err := p .proxyStream (tr .ToTracedContext (), rws , dest , originProxy , connectedLogger ); err != nil {
146
+ Uint8 (LogFieldConnIndex , tr .ConnIndex ).
147
+ Logger ()
148
+ if err := p .proxyStream (tr .ToTracedContext (), rws , dest , originProxy , logger ); err != nil {
148
149
rule , srv := ruleField (p .ingressRules , ruleNum )
149
150
p .logRequestError (err , cfRay , "" , rule , srv )
150
151
return err
@@ -178,22 +179,21 @@ func (p *Proxy) ProxyTCP(
178
179
179
180
tracedCtx := tracing .NewTracedContext (serveCtx , req .CfTraceID , p .log )
180
181
181
- debugLogger := func () * zerolog.Event {
182
- return p .log .Debug ().
183
- Int (management .EventTypeKey , int (management .TCP )).
184
- Str (LogFieldFlowID , req .FlowID ).
185
- Str (LogFieldDestAddr , req .Dest ).
186
- Uint8 (LogFieldConnIndex , req .ConnIndex )
187
- }
182
+ logger := p .log .With ().
183
+ Int (management .EventTypeKey , int (management .TCP )).
184
+ Str (LogFieldFlowID , req .FlowID ).
185
+ Str (LogFieldDestAddr , req .Dest ).
186
+ Uint8 (LogFieldConnIndex , req .ConnIndex ).
187
+ Logger ()
188
188
189
- debugLogger ().Msg ("tcp proxy stream started" )
189
+ logger . Debug ().Msg ("tcp proxy stream started" )
190
190
191
- if err := p .proxyStream (tracedCtx , rwa , req .Dest , p .warpRouting .Proxy , debugLogger () ); err != nil {
191
+ if err := p .proxyStream (tracedCtx , rwa , req .Dest , p .warpRouting .Proxy , logger ); err != nil {
192
192
p .logRequestError (err , req .CFRay , req .FlowID , "" , ingress .ServiceWarpRouting )
193
193
return err
194
194
}
195
195
196
- debugLogger ().Msg ("tcp proxy stream finished successfully" )
196
+ logger . Debug ().Msg ("tcp proxy stream finished successfully" )
197
197
198
198
return nil
199
199
}
@@ -303,7 +303,7 @@ func (p *Proxy) proxyStream(
303
303
rwa connection.ReadWriteAcker ,
304
304
dest string ,
305
305
connectionProxy ingress.StreamBasedOriginProxy ,
306
- connectedLogger * zerolog.Event ,
306
+ logger zerolog.Logger ,
307
307
) error {
308
308
ctx := tr .Context
309
309
_ , connectSpan := tr .Tracer ().Start (ctx , "stream-connect" )
@@ -317,6 +317,7 @@ func (p *Proxy) proxyStream(
317
317
}
318
318
connectSpan .End ()
319
319
defer originConn .Close ()
320
+ logger .Debug ().Msg ("origin connection established" )
320
321
321
322
encodedSpans := tr .GetSpans ()
322
323
@@ -326,7 +327,7 @@ func (p *Proxy) proxyStream(
326
327
}
327
328
328
329
connectLatency .Observe (float64 (time .Since (start ).Milliseconds ()))
329
- connectedLogger . Msg ("proxy stream established " )
330
+ logger . Debug (). Msg ("proxy stream acknowledged " )
330
331
331
332
originConn .Stream (ctx , rwa , p .log )
332
333
return nil
0 commit comments