Update vendor with fresh dependencies and apply memory leak fixes

- Run full vendor update to get latest dependencies
- Apply semaphore patches to prevent ELF parsing memory spikes
- Copy generated eBPF files and Java agent jar from .obi-src
- Update Dockerfile to verify patches are preserved during build
- Add build-preserve-patches target to Makefile for CI
- Set DEV_OBI=1 in Docker build to skip vendor regeneration

This ensures we have both:
1. All required dependencies and generated files
2. Our memory spike fixes for concurrent ELF parsing

Author: curusarn

.github/workflows/betterstack-docker.yml

@@ -84,8 +84,7 @@ jobs:
 
       - name: Build and test
         run: |
-          # Skip vendor regeneration since we have patched vendor code
-          make compile
+          make build-preserve-patches
           make test
 
       - name: Build and push Docker image

Dockerfile

@@ -36,10 +36,19 @@ COPY third_party_licenses.csv third_party_licenses.csv
 ENV TOOLS_DIR=/go/bin
 
 # Build
+RUN echo "=== Verifying patches before build ===" && \
+    grep -q "BEYLA_MAX_CONCURRENT_ELF" vendor/go.opentelemetry.io/obi/pkg/components/discover/typer.go && \
+    echo "✅ Patches present before build steps" || (echo "❌ Patches missing before build steps" && exit 1)
+
 RUN if [ -z "${DEV_OBI}" ]; then \
     make generate && \
     make copy-obi-vendor \
     ; fi
+
+RUN echo "=== Verifying patches after generate/vendor steps ===" && \
+    grep -q "BEYLA_MAX_CONCURRENT_ELF" vendor/go.opentelemetry.io/obi/pkg/components/discover/typer.go && \
+    echo "✅ Patches still present after generate/vendor steps" || (echo "❌ Patches overwritten by generate/vendor steps" && exit 1)
+
 RUN make compile
 
 # Create final image from minimal + built binary

Makefile

@@ -197,15 +197,33 @@ copy-obi-vendor:
 	go get go.opentelemetry.io/obi
 	go mod vendor
 
+.PHONY: copy-generated-files-only
+copy-generated-files-only:
+	@echo "### Copying generated files without overwriting vendor patches..."
+	@if [ -d ".obi-src" ]; then \
+		cp -f .obi-src/pkg/internal/otelsdk/grafana-opentelemetry-java.jar vendor/go.opentelemetry.io/obi/pkg/internal/otelsdk/ 2>/dev/null || true; \
+		find .obi-src -name "*bpfel.go" -exec cp {} vendor/go.opentelemetry.io/obi/pkg/internal/ebpf/ \; 2>/dev/null || true; \
+		find .obi-src -name "*bpfeb.go" -exec cp {} vendor/go.opentelemetry.io/obi/pkg/internal/ebpf/ \; 2>/dev/null || true; \
+		echo "Generated files copied successfully"; \
+	else \
+		echo "No .obi-src directory found, skipping generated file copy"; \
+	fi
+
 .PHONY: vendor-obi
 vendor-obi: obi-submodule docker-generate copy-obi-vendor
 
+.PHONY: vendor-obi-preserve-patches  
+vendor-obi-preserve-patches: obi-submodule docker-generate copy-generated-files-only
+
 .PHONY: verify
 verify: prereqs lint-dashboard vendor-obi lint test
 
 .PHONY: build
 build: vendor-obi verify compile
 
+.PHONY: build-preserve-patches
+build-preserve-patches: vendor-obi-preserve-patches compile
+
 .PHONY: all
 all: vendor-obi build
 

go.mod

@@ -34,7 +34,7 @@ require (
 	go.opentelemetry.io/collector/exporter/otlpexporter v0.136.0
 	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.136.0
 	go.opentelemetry.io/collector/pdata v1.42.0
-	go.opentelemetry.io/obi v0.0.0-20251013143511-10fd81bc8389
+	go.opentelemetry.io/obi v0.0.0-20251023073643-d71d07a6a4d2
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/sdk v1.38.0
 	go.opentelemetry.io/otel/sdk/metric v1.38.0