Skip to content

Commit

Permalink
Put HTTP headers into context in Jaeger Thrift receiver
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <[email protected]>
  • Loading branch information
pavolloffay committed Jan 26, 2021
1 parent ef40657 commit d61af22
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions receiver/jaegerreceiver/trace_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import (
"github.com/uber/jaeger-lib/metrics"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
Expand Down Expand Up @@ -434,6 +435,8 @@ func (jr *jReceiver) HandleThriftHTTPBatch(w http.ResponseWriter, r *http.Reques
if c, ok := client.FromHTTP(r); ok {
ctx = client.NewContext(ctx, c)
}
md := toMetadata(r.Header)
ctx = metadata.NewIncomingContext(ctx, md)

ctx = obsreport.ReceiverContext(ctx, jr.instanceName, collectorHTTPTransport)
ctx = obsreport.StartTraceDataReceiveOp(ctx, jr.instanceName, collectorHTTPTransport)
Expand All @@ -454,6 +457,14 @@ func (jr *jReceiver) HandleThriftHTTPBatch(w http.ResponseWriter, r *http.Reques
obsreport.EndTraceDataReceiveOp(ctx, thriftFormat, numSpans, err)
}

func toMetadata(header http.Header) metadata.MD {
md := metadata.MD{}
for k, v := range header {
md.Append(k, v...)
}
return md
}

func (jr *jReceiver) startCollector(host component.Host) error {
if !jr.collectorGRPCEnabled() && !jr.collectorHTTPEnabled() {
return nil
Expand Down

0 comments on commit d61af22

Please sign in to comment.