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.

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

Consolidate HTTP server instrumentations to use single bpf probe implementation #249

Closed
wants to merge 9 commits into from
Closed

Consolidate HTTP server instrumentations to use single bpf probe implementation #249

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d934c45
move bpf headers into bpf root dir
MikeGoldsmith Aug 7, 2023
766d104
move http_server bpf code to bpf root dir
MikeGoldsmith Aug 7, 2023
2a3799b
update gin instrumentation to use common probe
MikeGoldsmith Aug 7, 2023
4b92af2
update gorrila instrumentation
MikeGoldsmith Aug 7, 2023
058037f
revert bpf_include rename
MikeGoldsmith Aug 7, 2023
ff491ba
fix paths in license makefile targets
MikeGoldsmith Aug 7, 2023
2a2d00c
add changelog entry
MikeGoldsmith Aug 7, 2023
f2d4ed3
Merge branch 'main' into mike/http-reorg
MikeGoldsmith Aug 7, 2023
044b764
fix changelog entry formatting
MikeGoldsmith Aug 7, 2023
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
revert bpf_include rename
  • Loading branch information
@MikeGoldsmith
MikeGoldsmith committed Aug 7, 2023
commit 058037f221273e4420a10bd69ae3f0bd213ef35a
10 changes: 4 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' ! -path './LICENSES/*'
OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_MOD_DIRS))

# Build the list of include directories to compile the bpf program
CFLAGS += -I${REPODIR}/bpf/include
CFLAGS += -I${REPODIR}/bpf/include/libbpf

BPF_PROBES := $(REPODIR)/bpf
BPF_INCLUDE += -I${REPODIR}/bpf/include
BPF_INCLUDE += -I${REPODIR}/bpf/include/libbpf

.DEFAULT_GOAL := precommit

Expand Down Expand Up @@ -50,8 +48,8 @@ test/%:
cd $(shell dirname $(GO_MOD)) && go test -v ./...

.PHONY: generate
generate: export CFLAGS := $(CFLAGS)
generate: export BPF_PROBES := $(BPF_PROBES)
generate: export CFLAGS := $(BPF_INCLUDE)
generate: export BPF_PROBES := $(REPODIR)/bpf
generate: go-mod-tidy
generate:
go generate ./...
Expand Down