From 79f360e9fa5fb7d084a6e3b5a29f46572497bc3d Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Tue, 2 Aug 2022 11:23:51 -0400 Subject: [PATCH 1/2] Build remote-storage Signed-off-by: Yuri Shkuro --- .gitignore | 3 ++- Makefile | 11 +++++++++-- scripts/build-upload-docker-images.sh | 19 ++++--------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 1f1239b99b5..1372707b7ac 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,8 @@ cmd/collector/collector cmd/collector/collector-* cmd/ingester/ingester cmd/ingester/ingester-* +cmd/remote-storage/remote-storage +cmd/remote-storage/remote-storage-* cmd/es-index-cleaner/es-index-cleaner-* cmd/es-rollover/es-rollover-* cmd/query/query @@ -38,4 +40,3 @@ crossdock/crossdock-* run-crossdock.log proto-gen/.patched-otel-proto/ __pycache__ - diff --git a/Makefile b/Makefile index 1d0cc87a9ec..7bc9d6e746e 100644 --- a/Makefile +++ b/Makefile @@ -216,8 +216,8 @@ rebuild-ui: build-all-in-one-linux: GOOS=linux $(MAKE) build-all-in-one -build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug: DISABLE_OPTIMIZATIONS = -gcflags="all=-N -l" -build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug: SUFFIX = -debug +build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug build-remote-storage-debug: DISABLE_OPTIMIZATIONS = -gcflags="all=-N -l" +build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug build-remote-storage-debug: SUFFIX = -debug .PHONY: build-all-in-one build-all-in-one-debug build-all-in-one build-all-in-one-debug: build-ui @@ -239,6 +239,10 @@ build-collector build-collector-debug: build-ingester build-ingester-debug: $(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/ingester/ingester$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/ingester/main.go +.PHONY: build-remote-storage build-remote-storage-debug +build-remote-storage build-remote-storage-debug: + $(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/remote-storage/remote-storage$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/remote-storage/main.go + .PHONY: build-binaries-linux build-binaries-linux: GOOS=linux GOARCH=amd64 $(MAKE) build-platform-binaries @@ -276,7 +280,10 @@ build-platform-binaries: build-agent \ build-query-debug \ build-ingester \ build-ingester-debug \ + build-remote-storage \ + build-remote-storage-debug \ build-all-in-one \ + build-all-in-one-debug \ build-examples \ build-tracegen \ build-anonymizer \ diff --git a/scripts/build-upload-docker-images.sh b/scripts/build-upload-docker-images.sh index 7e004fc48bd..3f3c9254a1e 100755 --- a/scripts/build-upload-docker-images.sh +++ b/scripts/build-upload-docker-images.sh @@ -13,30 +13,19 @@ make build-binaries-arm64 # build multi-arch docker images platforms="linux/amd64,linux/s390x,linux/ppc64le,linux/arm64" -# build/upload images for release version of Jaeger backend components -for component in agent collector query ingester +# build/upload raw and debug images of Jaeger backend components +for component in agent collector query ingester remote-storage do bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release + bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}-debug" -d "cmd/${component}" -t debug done -# build/upload images for jaeger-es-index-cleaner and jaeger-es-rollover bash scripts/build-upload-a-docker-image.sh -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -p "${platforms}" -t release bash scripts/build-upload-a-docker-image.sh -b -c jaeger-es-rollover -d cmd/es-rollover -p "${platforms}" -t release +bash scripts/build-upload-a-docker-image.sh -c jaeger-cassandra-schema -d plugin/storage/cassandra/ # build/upload images for jaeger-tracegen and jaeger-anonymizer for component in tracegen anonymizer do bash scripts/build-upload-a-docker-image.sh -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -done - - -# build amd64 docker images - -# build/upload images for debug version of Jaeger backend components -for component in agent collector query ingester -do - bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}-debug" -d "cmd/${component}" -t debug done - -# build/upload images for jaeger-cassandra-schema -bash scripts/build-upload-a-docker-image.sh -c jaeger-cassandra-schema -d plugin/storage/cassandra/ From 703d04088cdf41a8b77eafd246e6249ae50c36e2 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Tue, 2 Aug 2022 11:55:36 -0400 Subject: [PATCH 2/2] fix-docker-file Signed-off-by: Yuri Shkuro --- cmd/remote-storage/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/remote-storage/Dockerfile b/cmd/remote-storage/Dockerfile index 8ca40ad2ee8..0da1354b60d 100644 --- a/cmd/remote-storage/Dockerfile +++ b/cmd/remote-storage/Dockerfile @@ -5,12 +5,12 @@ ARG SVC=remote-storage FROM $base_image AS release ARG TARGETARCH -COPY $SVC-linux-$TARGETARCH /go/bin/$SVC-linux +COPY remote-storage-linux-$TARGETARCH /go/bin/remote-storage-linux EXPOSE 16686/tcp -ENTRYPOINT ["/go/bin/$SVC-linux"] +ENTRYPOINT ["/go/bin/remote-storage-linux"] FROM $debug_image AS debug ARG TARGETARCH=amd64 -COPY $SVC-debug-linux-$TARGETARCH /go/bin/$SVC-linux +COPY remote-storage-debug-linux-$TARGETARCH /go/bin/remote-storage-linux EXPOSE 12345/tcp 16686/tcp -ENTRYPOINT ["/go/bin/dlv", "exec", "/go/bin/$SVC-linux", "--headless", "--listen=:12345", "--api-version=2", "--accept-multiclient", "--log", "--"] +ENTRYPOINT ["/go/bin/dlv", "exec", "/go/bin/remote-storage-linux", "--headless", "--listen=:12345", "--api-version=2", "--accept-multiclient", "--log", "--"]