Skip to content

Commit

Permalink
Extract source IP address into context for OTLP/HTTP (#4257)
Browse files Browse the repository at this point in the history
  • Loading branch information
pmm-sumo committed Oct 27, 2021
1 parent 46c8e22 commit 9488d4c
Showing 1 changed file with 19 additions and 3 deletions.
22 changes: 19 additions & 3 deletions receiver/otlpreceiver/otlphttp.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/receiver/otlpreceiver/internal/logs"
"go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metrics"
"go.opentelemetry.io/collector/receiver/otlpreceiver/internal/trace"
Expand All @@ -44,7 +45,12 @@ func handleTraces(resp http.ResponseWriter, req *http.Request, tracesReceiver *t
return
}

otlpResp, err := tracesReceiver.Export(req.Context(), otlpReq)
ctx := req.Context()
if c, ok := client.FromHTTP(req); ok {
ctx = client.NewContext(ctx, c)
}

otlpResp, err := tracesReceiver.Export(ctx, otlpReq)
if err != nil {
writeError(resp, encoder, err, http.StatusInternalServerError)
return
Expand All @@ -70,7 +76,12 @@ func handleMetrics(resp http.ResponseWriter, req *http.Request, metricsReceiver
return
}

otlpResp, err := metricsReceiver.Export(req.Context(), otlpReq)
ctx := req.Context()
if c, ok := client.FromHTTP(req); ok {
ctx = client.NewContext(ctx, c)
}

otlpResp, err := metricsReceiver.Export(ctx, otlpReq)
if err != nil {
writeError(resp, encoder, err, http.StatusInternalServerError)
return
Expand All @@ -96,7 +107,12 @@ func handleLogs(resp http.ResponseWriter, req *http.Request, logsReceiver *logs.
return
}

otlpResp, err := logsReceiver.Export(req.Context(), otlpReq)
ctx := req.Context()
if c, ok := client.FromHTTP(req); ok {
ctx = client.NewContext(ctx, c)
}

otlpResp, err := logsReceiver.Export(ctx, otlpReq)
if err != nil {
writeError(resp, encoder, err, http.StatusInternalServerError)
return
Expand Down

0 comments on commit 9488d4c

Please sign in to comment.