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

Foundation to report application processes #892

Merged
merged 34 commits into from
Jun 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
aac7662
start porting process sampler
mariomac May 24, 2024
7c55aa6
refactored harvester_linux.go
mariomac May 27, 2024
ef731c8
refactored harvester_linux_test.go
mariomac May 27, 2024
bdee025
removed unneeded darwin files
mariomac May 27, 2024
ba134ab
first refactor version without any integration
mariomac May 27, 2024
c007023
renamings
mariomac May 28, 2024
4b04063
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac May 28, 2024
0d34949
Collector provider
mariomac May 29, 2024
e9479c5
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac May 29, 2024
522aa2e
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac May 30, 2024
50fe1c4
connecting pipelines
mariomac May 30, 2024
87cbabb
basic integration
mariomac May 30, 2024
dcc653f
some process metrics verification
mariomac May 30, 2024
10f4ee2
WIP generifying expirer
mariomac May 31, 2024
4e12f03
Generified OTEL metrics expirer
mariomac May 31, 2024
e178868
fix some unit tests
mariomac May 31, 2024
b8ffb4f
procolly metrics exporter merges app+net
mariomac Jun 3, 2024
d4b5d88
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac Jun 3, 2024
0d10250
a process exporter per service
mariomac Jun 3, 2024
27b29db
process_cpu_utilization_ratio now reported for OTEL
mariomac Jun 3, 2024
4d39a07
Basic process sampling working
mariomac Jun 4, 2024
1548f73
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac Jun 4, 2024
29a4d27
fix lint and unit tests
mariomac Jun 4, 2024
d703a08
merging otel exporters into single package
mariomac Jun 4, 2024
1efa6c2
fix harvest test
mariomac Jun 4, 2024
d6d6720
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac Jun 4, 2024
f9cc569
Reorganized code
mariomac Jun 4, 2024
21838ca
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
mariomac Jun 5, 2024
9702fb6
Fixed compilation and unit tests
mariomac Jun 5, 2024
11a1134
Fixed and improved process harvesting
mariomac Jun 5, 2024
8738980
Process integration tests
mariomac Jun 5, 2024
4c7cd6f
Fix unit test
mariomac Jun 5, 2024
7720949
fix integration test
mariomac Jun 5, 2024
2833a13
Added extra comment
mariomac Jun 5, 2024
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
Merge branch 'main' of github.com:grafana/ebpf-autoinstrument into pr…
…ocess
mariomac committed May 28, 2024
commit 4b0406345209418e60b6a1dc98c780e10d1ac341
6 changes: 2 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -25,8 +25,7 @@ require (
github.com/prometheus/client_model v0.6.0
github.com/prometheus/common v0.48.0
github.com/prometheus/procfs v0.12.0
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/shirou/gopsutil/v3 v3.24.2
github.com/shirou/gopsutil/v3 v3.24.4
github.com/stretchr/testify v1.9.0
github.com/vishvananda/netlink v1.1.0
github.com/vladimirvivien/gexe v0.2.0
@@ -36,6 +35,7 @@ require (
go.opentelemetry.io/collector/config/configgrpc v0.97.0
go.opentelemetry.io/collector/config/confighttp v0.97.0
go.opentelemetry.io/collector/config/configopaque v1.4.0
go.opentelemetry.io/collector/config/configretry v0.97.0
go.opentelemetry.io/collector/config/configtelemetry v0.97.0
go.opentelemetry.io/collector/config/configtls v0.97.0
go.opentelemetry.io/collector/consumer v0.97.0
@@ -131,7 +131,6 @@ require (
github.com/rs/cors v1.10.1 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -142,7 +141,6 @@ require (
go.opentelemetry.io/collector/config/configauth v0.97.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.4.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.97.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.97.0 // indirect
go.opentelemetry.io/collector/config/internal v0.97.0 // indirect
go.opentelemetry.io/collector/confmap v0.97.0 // indirect
go.opentelemetry.io/collector/extension v0.97.0 // indirect
9 changes: 3 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -207,10 +207,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y=
github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk=
github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -220,7 +218,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -374,7 +371,7 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/shirou/gopsutil/v3/net/net_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 29 additions & 13 deletions vendor/github.com/shirou/gopsutil/v3/net/net_openbsd.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions vendor/github.com/stretchr/objx/.codeclimate.yml

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/stretchr/objx/.gitignore

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/github.com/stretchr/objx/LICENSE

This file was deleted.

80 changes: 0 additions & 80 deletions vendor/github.com/stretchr/objx/README.md

This file was deleted.

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.