Skip to content

Deprecating obsreport scraper and receiver API #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flachesis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Deprecating obsreport scraper and receiver API #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions trace_receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/obsreport"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/receiverhelper"
"go.uber.org/zap"
"golang.org/x/sync/semaphore"
"google.golang.org/protobuf/types/known/timestamppb"
Expand All @@ -30,7 +30,7 @@ type elasticapmReceiver struct {
shutdownWG sync.WaitGroup

nextConsumer consumer.Traces
traceReceiver *obsreport.Receiver
traceReceiver *receiverhelper.ObsReport
settings receiver.CreateSettings
}

Expand All @@ -42,7 +42,7 @@ func newElasticAPMReceiver(cfg *Config, settings receiver.CreateSettings) (*elas
}

var err error
r.traceReceiver, err = obsreport.NewReceiver(obsreport.ReceiverSettings{
r.traceReceiver, err = receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
ReceiverID: settings.ID,
Transport: "http",
ReceiverCreateSettings: settings,
Expand Down Expand Up @@ -184,7 +184,7 @@ func (r *elasticapmReceiver) processBatch(reader io.Reader, baseEvent *modelpb.A
return events, nil
}

func (r *elasticapmReceiver) handleTraces(w http.ResponseWriter, req *http.Request, baseEvent *modelpb.APMEvent, tracesReceiver *obsreport.Receiver) (*ptrace.Traces, error) {
func (r *elasticapmReceiver) handleTraces(w http.ResponseWriter, req *http.Request, baseEvent *modelpb.APMEvent, tracesReceiver *receiverhelper.ObsReport) (*ptrace.Traces, error) {
events, err := r.processBatch(req.Body, baseEvent)

if err != nil {
Expand Down