Skip to content
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.

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

Translate otel metrics to libbeat monitoring #15094

Merged
merged 48 commits into from
Jan 28, 2025
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7bcfa46
Translate otel metrics to libbeat monitoring
axw Dec 4, 2024
0491b4c
Merge remote-tracking branch 'upstream/main' into otel-adapter
kruskall Dec 31, 2024
166a717
demo: send metrics directly and add another reader
kruskall Jan 1, 2025
11b11d8
Revert "demo: send metrics directly and add another reader"
kruskall Jan 1, 2025
128b5b9
lint: fix linter issues
kruskall Jan 1, 2025
0adb6ab
Merge branch 'main' into otel-adapter
kruskall Jan 15, 2025
642a89b
lint: fix linter issues
kruskall Jan 15, 2025
15d6652
feat: refactor code to propagate meterprovider and fix tests
kruskall Jan 21, 2025
bfedda8
Merge remote-tracking branch 'upstream/main' into otel-adapter
kruskall Jan 21, 2025
cc914d0
lint: fix linter issues
kruskall Jan 21, 2025
4e9110d
refactor: remove unused files
kruskall Jan 21, 2025
63a49cc
refactor: remove more global meters
kruskall Jan 21, 2025
64fe558
refactor: cleanup more unused code
kruskall Jan 21, 2025
df2e35c
Merge branch 'main' into otel-adapter
kruskall Jan 21, 2025
3931dab
refactor: remove more unused code
kruskall Jan 21, 2025
750668f
test: account for agentcfg metric in test
kruskall Jan 21, 2025
fe73501
test: account for agentcfg metric in test
kruskall Jan 21, 2025
ee6fc70
fix: pass meter provider in main func
kruskall Jan 21, 2025
8d8b066
Fix LSM metrics tests
axw Jan 22, 2025
9821bcc
test: fix remaining test
kruskall Jan 22, 2025
50bcc39
lint: fix linter issues
kruskall Jan 22, 2025
b4b9631
fix: update docappender metrics name
kruskall Jan 22, 2025
b275098
test: update systemtest metric assertions
kruskall Jan 22, 2025
8155566
fix: update grpc interceptor meter path
kruskall Jan 22, 2025
4ae20a0
fix: add back output.type=elasticsearch
kruskall Jan 22, 2025
3b4fc56
test: upate remaining systemtest
kruskall Jan 22, 2025
62e0c25
test: remove debug print
kruskall Jan 22, 2025
ee22add
Merge branch 'main' into otel-adapter
kruskall Jan 22, 2025
928ccf8
fix: use correct outputRegistry variable
kruskall Jan 22, 2025
268e4d7
Merge branch 'main' into otel-adapter
kruskall Jan 23, 2025
46ed7f7
fix: remove panic on err
kruskall Jan 23, 2025
c459533
fix: propagate meter provider to grpc services
kruskall Jan 23, 2025
dd8ccf9
lint: add meterprovider field docs
kruskall Jan 23, 2025
bc9ec45
lint: fix comment typo
kruskall Jan 23, 2025
87d42ba
feat: pass apmotel gatherer too
kruskall Jan 23, 2025
f400792
refactor: use switch pattern consistently when mapping metrics
kruskall Jan 23, 2025
775b0ec
Update beater.go
kruskall Jan 24, 2025
243e90f
Update beat.go
kruskall Jan 24, 2025
1d9793f
Update beater.go
kruskall Jan 24, 2025
3575c50
Merge branch 'main' into otel-adapter
kruskall Jan 24, 2025
08501f2
fix: solve compile errors and systemtest fix
kruskall Jan 24, 2025
ea2260f
refactor: reduce diff noise
kruskall Jan 24, 2025
83bc51b
lint: fix linter issues
kruskall Jan 24, 2025
929f011
lint: fix linter issues
kruskall Jan 24, 2025
1f2322b
Update x-pack/apm-server/main.go
kruskall Jan 27, 2025
06080ca
test: use legacy metrics for validating grpc tests
kruskall Jan 27, 2025
45f84a7
fix: unregister callback if available
kruskall Jan 27, 2025
c95e71d
Merge branch 'main' into otel-adapter
kruskall Jan 28, 2025
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
Prev Previous commit
Next Next commit
fix: add back output.type=elasticsearch
kruskall committed Jan 22, 2025
commit 4ae20a0cabe4d7e3767d7f060b5e26a25fa90e15
6 changes: 4 additions & 2 deletions internal/beater/beater.go
Original file line number Diff line number Diff line change
@@ -683,9 +683,9 @@ func (s *Runner) newFinalBatchProcessor(
newElasticsearchClient func(cfg *elasticsearch.Config) (*elasticsearch.Client, error),
memLimit float64,
) (modelpb.BatchProcessor, func(context.Context) error, error) {
monitoring.Default.Remove("libbeat")
libbeatMonitoringRegistry := monitoring.Default.NewRegistry("libbeat")
if s.elasticsearchOutputConfig == nil {
monitoring.Default.Remove("libbeat")
libbeatMonitoringRegistry := monitoring.Default.NewRegistry("libbeat")
return s.newLibbeatFinalBatchProcessor(tracer, libbeatMonitoringRegistry)
}

@@ -711,6 +711,8 @@ func (s *Runner) newFinalBatchProcessor(
if err != nil {
return nil, nil, err
}
outputType := monitoring.NewString(libbeatMonitoringRegistry.GetRegistry("output"), "type")
outputType.Set("elasticsearch")
return newDocappenderBatchProcessor(appender), appender.Close, nil
}