Update cli.Dockerfile

Author: stephanos

dockerfiles/cli.Dockerfile

@@ -1,37 +1,80 @@
 # Build in a full featured container
 ARG TARGETARCH
 
-FROM --platform=linux/$TARGETARCH golang:1.25 AS build
+# Source stage: prepare source code and install Antithesis SDK
+FROM --platform=linux/$TARGETARCH golang:1.25 AS source
 
 WORKDIR /app
 
 # Install protobuf compiler and git
 RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
+    && DEBIAN_FRONTEND=noninteractive \
     apt-get install --no-install-recommends --assume-yes \
-      protobuf-compiler=3.21.12-11 libprotoc-dev=3.21.12-11 \
-  && rm -rf /var/lib/apt/lists/*
+    protobuf-compiler=3.21.12-11 libprotoc-dev=3.21.12-11 \
+    && rm -rf /var/lib/apt/lists/*
 
-# Install Rust for kitchen-sink-gen
-RUN wget -q -O - https://sh.rustup.rs | sh -s -- -y \
-  && . $HOME/.cargo/env \
-  && echo "TARGETARCH: $TARGETARCH" \
-  && ARCH=$(uname -m) \
-  && echo "uname -m: $ARCH" \
-  && if [ "$TARGETARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then \
-       rustup target add aarch64-unknown-linux-musl; \
-     else \
-       rustup target add x86_64-unknown-linux-musl; \
-     fi
-ENV PATH="$PATH:/root/.cargo/bin"
-
-# Copy CLI build dependencies
+# Copy all source code
 COPY cmd ./cmd
 COPY loadgen ./loadgen
 COPY scenarios ./scenarios
 COPY workers ./workers/
+COPY common ./common
 COPY go.mod go.sum ./
 
+# Install Antithesis SDK and instrumentor
+RUN go get github.com/antithesishq/antithesis-sdk-go@feature-assertion-wrappers && \
+    go install github.com/antithesishq/antithesis-sdk-go/tools/antithesis-go-instrumentor@feature-assertion-wrappers
+
+# Instrumented stage: instrument the code with Antithesis
+FROM --platform=linux/$TARGETARCH golang:1.25 AS instrumented
+
+# Copy source and instrumentor
+COPY --from=source /app /omes_source
+COPY --from=source /go/bin/antithesis-go-instrumentor /go/bin/antithesis-go-instrumentor
+COPY --from=source /go/pkg/mod /go/pkg/mod
+
+WORKDIR /omes_source
+
+# Instrument OMES with Antithesis
+RUN echo "🔧 Instrumenting OMES..." && \
+    mkdir /omes_transformed && \
+    antithesis-go-instrumentor /omes_source /omes_transformed && \
+    cp -r /omes_source/.git /omes_transformed/ 2>/dev/null || true && \
+    mv /omes_transformed /instrumented && \
+    mkdir -p /notifier /symbols && \
+    mv /instrumented/notifier.json /notifier/ 2>/dev/null || true && \
+    mv /instrumented/symbols.json /symbols/ 2>/dev/null || true
+
+# Build stage: compile the instrumented code
+FROM --platform=linux/$TARGETARCH golang:1.25 AS build
+
+ARG TARGETARCH
+
+WORKDIR /app
+
+# Install protobuf compiler and git
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive \
+    apt-get install --no-install-recommends --assume-yes \
+    protobuf-compiler=3.21.12-11 libprotoc-dev=3.21.12-11 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Rust for kitchen-sink-gen
+RUN wget -q -O - https://sh.rustup.rs | sh -s -- -y \
+    && . $HOME/.cargo/env \
+    && echo "TARGETARCH: $TARGETARCH" \
+    && ARCH=$(uname -m) \
+    && echo "uname -m: $ARCH" \
+    && if [ "$TARGETARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then \
+    rustup target add aarch64-unknown-linux-musl; \
+    else \
+    rustup target add x86_64-unknown-linux-musl; \
+    fi
+ENV PATH="$PATH:/root/.cargo/bin"
+
+# Copy instrumented source code
+COPY --from=instrumented /instrumented /app
+
 # Build the CLI
 RUN CGO_ENABLED=0 go build -o temporal-omes ./cmd
 
@@ -40,22 +83,26 @@ RUN go install google.golang.org/protobuf/cmd/[email protected]
 
 # Build kitchen-sink-gen (statically linked)
 RUN cd loadgen/kitchen-sink-gen && \
-  echo "TARGETARCH: $TARGETARCH" && \
-  ARCH=$(uname -m) && \
-  echo "uname -m: $ARCH" && \
-  if [ "$TARGETARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then \
+    echo "TARGETARCH: $TARGETARCH" && \
+    ARCH=$(uname -m) && \
+    echo "uname -m: $ARCH" && \
+    if [ "$TARGETARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then \
     RUST_TARGET=aarch64-unknown-linux-musl; \
-  else \
+    else \
     RUST_TARGET=x86_64-unknown-linux-musl; \
-  fi && \
-  echo "Building for rust target: $RUST_TARGET" && \
-  RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target $RUST_TARGET
+    fi && \
+    echo "Building for rust target: $RUST_TARGET" && \
+    RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target $RUST_TARGET
 
 # Copy the CLI to a distroless "run" container
 FROM --platform=linux/$TARGETARCH gcr.io/distroless/static-debian11:nonroot
 
 COPY --from=build /app/temporal-omes /app/temporal-omes
 COPY --from=build /app/loadgen/kitchen-sink-gen/target/*/release/kitchen-sink-gen /app/kitchen-sink-gen
 
+# Copy instrumentation metadata
+COPY --from=instrumented /notifier /notifier
+COPY --from=instrumented /symbols /symbols
+
 # Default entrypoint for CLI usage
-ENTRYPOINT ["/app/temporal-omes"]
+ENTRYPOINT ["/app/temporal-omes"]