Crosslink modules

Dockerfile

@@ -2,7 +2,10 @@ FROM  --platform=$BUILDPLATFORM golang:1.24.0-bookworm@sha256:b970e6d47c09fdd341
 
 RUN apt-get update && apt-get install -y curl clang gcc llvm make libbpf-dev
 
-WORKDIR /app
+WORKDIR /usr/src/go.opentelemetry.io/auto/
+
+# Copy auto/sdk so `go mod` finds the replaced module.
+COPY sdk/ /usr/src/go.opentelemetry.io/auto/sdk/
 
 # pre-copy/cache go.mod for pre-downloading dependencies and only redownloading
 # them in subsequent builds if they change
@@ -19,5 +22,5 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     GOARCH=$TARGETARCH make build
 
 FROM gcr.io/distroless/base-debian12@sha256:74ddbf52d93fafbdd21b399271b0b4aac1babf8fa98cab59e5692e01169a1348
-COPY --from=builder /app/otel-go-instrumentation /
+COPY --from=builder /usr/src/go.opentelemetry.io/auto/otel-go-instrumentation /
 CMD ["/otel-go-instrumentation"]

Makefile

@@ -57,8 +57,11 @@ $(TOOLS)/offsetgen: PACKAGE=go.opentelemetry.io/auto/$(TOOLS_MOD_DIR)/inspect/cm
 SYNCLIBBPF = $(TOOLS)/synclibbpf
 $(TOOLS)/synclibbpf: PACKAGE=go.opentelemetry.io/auto/$(TOOLS_MOD_DIR)/synclibbpf
 
+CROSSLINK = $(TOOLS)/crosslink
+$(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/build-tools/crosslink
+
 .PHONY: tools
-tools: $(GOLICENSES) $(MULTIMOD) $(GOLANGCI_LINT) $(DBOTCONF) $(OFFSETGEN) $(SYNCLIBBPF)
+tools: $(GOLICENSES) $(MULTIMOD) $(GOLANGCI_LINT) $(DBOTCONF) $(OFFSETGEN) $(SYNCLIBBPF) $(CROSSLINK)
 
 TEST_TARGETS := test-verbose test-ebpf test-race
 .PHONY: $(TEST_TARGETS) test
@@ -89,20 +92,24 @@ generate/all:
 
 .PHONY: docker-generate
 docker-generate: docker-build-base
-	docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd ../app && make generate"
+	docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd /app && make generate"
 
 .PHONY: docker-test
 docker-test: docker-build-base
-	docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd ../app && make test"
+	docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd /app && make test"
 
 .PHONY: docker-precommit
 docker-precommit: docker-build-base
-	docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd ../app && make precommit"
+	docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd /app && make precommit"
+
+.PHONY: crosslink
+crosslink: $(CROSSLINK)
+	@$(CROSSLINK) --root=$(REPODIR) --prune
 
 .PHONY: go-mod-tidy
 go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%)
 go-mod-tidy/%: DIR=$*
-go-mod-tidy/%:
+go-mod-tidy/%: crosslink
 	@cd $(DIR) && $(GOCMD) mod tidy -compat=1.20
 
 .PHONY: golangci-lint golangci-lint-fix

examples/kafka-go/consumer/go.mod

@@ -16,3 +16,5 @@ require (
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/otel/metric v1.34.0 // indirect
 )
+
+replace go.opentelemetry.io/auto/sdk => ../../../sdk

examples/kafka-go/consumer/go.sum

@@ -31,8 +31,6 @@ github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3k
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
 go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=

examples/rolldice/frontend/go.mod

@@ -5,3 +5,5 @@ go 1.23.0
 replace go.opentelemetry.io/auto/examples/rolldice/user => ../user/
 
 require go.opentelemetry.io/auto/examples/rolldice/user v0.0.0-20250113220501-95ff7a07d6ba
+
+replace go.opentelemetry.io/auto/sdk => ../../../sdk

examples/rolldice/user/go.mod

@@ -14,3 +14,5 @@ require (
 	go.opentelemetry.io/otel/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 )
+
+replace go.opentelemetry.io/auto/sdk => ../../../sdk

examples/rolldice/user/go.sum

@@ -13,8 +13,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
 go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=

go.mod

@@ -79,3 +79,5 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 )
+
+replace go.opentelemetry.io/auto/sdk => ./sdk

go.sum

@@ -68,8 +68,8 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ
 github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@@ -78,8 +78,6 @@ github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryB
 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg=
 go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8=
 go.opentelemetry.io/contrib/bridges/prometheus v0.59.0 h1:HY2hJ7yn3KuEBBBsKxvF3ViSmzLwsgeNvD+0utRMgzc=

internal/test/e2e/grpc/Dockerfile

@@ -3,10 +3,14 @@ FROM golang:1.24.0@sha256:3f7444391c51a11a039bf0359ee81cc64e663c17d787ad0e637a4d
 # pre-copy/cache go.mod for pre-downloading dependencies and only redownloading
 # them in subsequent builds if they change
 WORKDIR /usr/src/go.opentelemetry.io/auto/internal/test/e2e/grpc
-COPY go.mod go.sum ./
+
+# Copy auto/sdk so `go mod` finds the replaced module.
+COPY sdk/ /usr/src/go.opentelemetry.io/auto/sdk/
+
+COPY internal/test/e2e/grpc/go.mod internal/test/e2e/grpc/go.sum ./
 RUN --mount=type=cache,target=/go/pkg go mod download && go mod verify
 
-COPY *.go .
+COPY internal/test/e2e/grpc/*.go .
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg \
 	go build -v -o /usr/local/bin/app .

internal/test/e2e/grpc/build.sh

@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+usage() {
+    local progname
+    progname="$( basename "$0" )"
+
+    cat <<-EOF
+    Usage: $progname [OPTIONS]
+
+    Builds the SDK end-to-end testing docker image.
+
+    OPTIONS:
+        -t --tag            Docker tag to use ["sample-app"]
+        -h --help           Show this help message
+EOF
+}
+
+parse_opts() {
+    # Make sure getopts starts at the beginning
+    OPTIND=1
+
+    local deliminator option
+    local arg=
+
+    # Translate --gnu-long-options to -g (short options)
+    for arg
+    do
+        deliminator=""
+        case "$arg" in
+            --tag)
+                args="${args}-d "
+                ;;
+            --help)
+                args="${args}-h "
+                ;;
+            *)
+                [[ "${arg:0:1}" == "-" ]] || deliminator='"'
+                args="${args}${deliminator}${arg}${deliminator} "
+                ;;
+        esac
+    done
+
+    # Reset the positional parameters to start parsing short options
+    eval set -- "$args"
+
+    while getopts ":t:h" option
+    do
+        case "$option" in
+            t)
+                readonly TAG="$OPTARG"
+                ;;
+            h)
+                usage
+                exit 0
+                ;;
+            *)
+                echo "Invalid option: -${option}" >&2
+                usage
+                exit 1
+                ;;
+        esac
+    done
+
+    # Default values
+    [ -z "${TAG}" ] \
+        && readonly TAG="sample-app"
+
+    return 0
+}
+
+build() {
+    local root_dir="$1"
+    local local_dir="$2"
+    local dockerfile="${local_dir}/Dockerfile"
+    local tag_arg
+
+    if [ ! -f "$dockerfile" ]; then
+        echo "Dockerfile does not exist: $dockerfile"
+        return 1
+    fi
+
+    if [ ! -d "$root_dir" ]; then
+        echo "Project root directory does not exist: $root_dir"
+        return 1
+    fi
+
+    if [ -n "$TAG" ]; then
+        tag_arg=("-t" "$TAG")
+    fi
+
+    (cd "$root_dir" && docker build "${tag_arg[@]}" -f "$dockerfile" .)
+    return 0
+}
+
+main() {
+    local root_dir script_dir
+
+    # Check dependencies
+    hash git 2>/dev/null\
+        || { echo >&2 "Required git client not found"; exit 1; }
+    hash docker 2>/dev/null\
+        || { echo >&2 "Required docker client not found"; exit 1; }
+
+    parse_opts "$@"
+
+    root_dir=$( git rev-parse --show-toplevel )
+    script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+    build "$root_dir" "$script_dir"
+}
+
+main "$@"

internal/test/e2e/grpc/go.mod

@@ -20,3 +20,5 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 )
+
+replace go.opentelemetry.io/auto/sdk => ../../../../sdk

internal/test/e2e/grpc/go.sum

@@ -15,8 +15,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
 go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=

internal/test/e2e/otelglobal/Dockerfile

@@ -3,10 +3,14 @@ FROM golang:1.24.0@sha256:3f7444391c51a11a039bf0359ee81cc64e663c17d787ad0e637a4d
 # pre-copy/cache go.mod for pre-downloading dependencies and only redownloading
 # them in subsequent builds if they change
 WORKDIR /usr/src/go.opentelemetry.io/auto/internal/test/e2e/otelglobal
-COPY go.mod go.sum ./
+
+# Copy auto/sdk so `go mod` finds the replaced module.
+COPY sdk/ /usr/src/go.opentelemetry.io/auto/sdk/
+
+COPY internal/test/e2e/otelglobal/go.mod internal/test/e2e/otelglobal/go.sum ./
 RUN --mount=type=cache,target=/go/pkg go mod download && go mod verify
 
-COPY *.go .
+COPY internal/test/e2e/otelglobal/*.go .
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg \
 	go build -v -o /usr/local/bin/app .