Skip to content

Commit

Permalink
add local exporter
Browse files Browse the repository at this point in the history
  • Loading branch information
dmathieu committed Aug 25, 2023
1 parent 27d510d commit 7d9d543
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions internal/beater/beater.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import (
srvmodelprocessor "github.com/elastic/apm-server/internal/model/modelprocessor"
"github.com/elastic/apm-server/internal/publish"
"github.com/elastic/apm-server/internal/sourcemap"
"github.com/elastic/apm-server/internal/telemetry"
"github.com/elastic/apm-server/internal/version"
)

Expand Down Expand Up @@ -306,14 +307,6 @@ func (s *Runner) Run(ctx context.Context) error {
}
otel.SetTracerProvider(tracerProvider)

exporter, err := apmotel.NewGatherer()
if err != nil {
return err
}
meterProvider := metric.NewMeterProvider(metric.WithReader(exporter))
otel.SetMeterProvider(meterProvider)
tracer.RegisterMetricsGatherer(exporter)

// Ensure the libbeat output and go-elasticsearch clients do not index
// any events to Elasticsearch before the integration is ready.
publishReady := make(chan struct{})
Expand Down Expand Up @@ -428,6 +421,18 @@ func (s *Runner) Run(ctx context.Context) error {
finalBatchProcessor,
})

exporter, err := apmotel.NewGatherer()
if err != nil {
return err
}
localExporter := telemetry.NewMetricExporter(batchProcessor)
meterProvider := metric.NewMeterProvider(
metric.WithReader(exporter),
metric.WithReader(metric.NewPeriodicReader(localExporter)),
)
otel.SetMeterProvider(meterProvider)
tracer.RegisterMetricsGatherer(exporter)

agentConfigFetcher, fetcherRunFunc, err := newAgentConfigFetcher(
ctx,
s.config,
Expand Down

0 comments on commit 7d9d543

Please sign in to comment.