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

Split sample build to own target #1602

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Split sample build to own target #1602

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e0aa41
Split sample build to own target
MrAlias Jan 14, 2025
3e7a455
Merge branch 'main' into make-sample-app-target
MrAlias Jan 14, 2025
bc7aeaa
Merge branch 'main' into make-sample-app-target
MrAlias Jan 15, 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
16 changes: 10 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ docker-build:
docker-build-base:
docker buildx build -t $(IMG_NAME_BASE) --target base .

.PHONY: sample-app/nethttp sample-app/gin sample-app/databasesql sample-app/nethttp-custom sample-app/otelglobal sample-app/autosdk sample-app/kafka-go
sample-app/%: LIBRARY=$*
sample-app/%:
if [ -f ./internal/test/e2e/$(LIBRARY)/build.sh ]; then \
./internal/test/e2e/$(LIBRARY)/build.sh; \
else \
cd internal/test/e2e/$(LIBRARY) && docker build -t sample-app . ;\
fi

OFFSETS_OUTPUT_FILE="$(REPODIR)/internal/pkg/inject/offset_results.json"
.PHONY: offsets
offsets: | $(OFFSETGEN)
Expand Down Expand Up @@ -169,12 +178,7 @@ fixture-otelglobal: fixtures/otelglobal
fixture-autosdk: fixtures/autosdk
fixture-kafka-go: fixtures/kafka-go
fixtures/%: LIBRARY=$*
fixtures/%: docker-build
if [ -f ./internal/test/e2e/$(LIBRARY)/build.sh ]; then \
./internal/test/e2e/$(LIBRARY)/build.sh; \
else \
cd internal/test/e2e/$(LIBRARY) && docker build -t sample-app . ;\
fi
fixtures/%: docker-build sample-app/%
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
kind create cluster
kind load docker-image otel-go-instrumentation sample-app
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
Expand Down
Loading