merge Instana change into upstream

.env

@@ -2,14 +2,23 @@
 
 # Images
 IMAGE_VERSION=1.6.0
-IMAGE_NAME=ghcr.io/open-telemetry/demo
+# IMAGE_NAME=ghcr.io/open-telemetry/demo
+# IMAGE_NAME=default-route-openshift-image-registry.apps.ocp05.tec.cz.ibm.com/otel-demo/demo
+IMAGE_NAME=styblope/otel-demo
 TRACETEST_IMAGE_VERSION=v0.14.5
 
+# Instana
+# INSTANA_AGENT_HOST=instana-agent.instana-agent  # k8s agent service
+INSTANA_AGENT_HOST=172.17.0.1 # docker0 interface
+INSTANA_AGENT_PORT=42699
+
+# Collector
 # Demo Platform
 ENV_PLATFORM=local
 
 # OpenTelemetry Collector
-OTEL_COLLECTOR_HOST=otelcol
+# OTEL_COLLECTOR_HOST=otelcol
+OTEL_COLLECTOR_HOST=${INSTANA_AGENT_HOST:-otelcol}
 OTEL_COLLECTOR_PORT_GRPC=4317
 OTEL_COLLECTOR_PORT_HTTP=4318
 OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}

.github/README.md

@@ -0,0 +1 @@
+../instana/README.md

.github/workflows/custom-manual-release.yml

@@ -0,0 +1,125 @@
+name: "Custom manual release"
+
+on: workflow_dispatch
+
+jobs:
+  build_and_push_images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      # RELEASE_VERSION: "${{ github.event.release.tag_name }}"
+      RELEASE_VERSION: "1.6.0"
+      DOCKERHUB_REPO: "styblope/otel-demo"
+      # GHCR_REPO: "styblope/otel-emo"
+
+    strategy:
+      matrix:
+        file_tag:
+          - file: ./src/adservice/Dockerfile
+            tag_suffix: adservice
+            context: ./
+          - file: ./src/cartservice/src/Dockerfile
+            tag_suffix: cartservice
+            context: ./
+          - file: ./src/checkoutservice/Dockerfile
+            tag_suffix: checkoutservice
+            context: ./
+          - file: ./src/currencyservice/Dockerfile
+            tag_suffix: currencyservice
+            context: ./src/currencyservice
+          - file: ./src/emailservice/Dockerfile
+            tag_suffix: emailservice
+            context: ./src/emailservice
+          - file: ./src/featureflagservice/Dockerfile
+            tag_suffix: featureflagservice
+            context: ./
+          - file: ./src/frontend/Dockerfile
+            tag_suffix: frontend
+            context: ./
+          - file: ./src/frontendproxy/Dockerfile
+            tag_suffix: frontendproxy
+            context: ./
+          - file: ./src/loadgenerator/Dockerfile
+            tag_suffix: loadgenerator
+            context: ./
+          - file: ./src/paymentservice/Dockerfile
+            tag_suffix: paymentservice
+            context: ./
+          - file: ./src/productcatalogservice/Dockerfile
+            tag_suffix: productcatalogservice
+            context: ./
+          - file: ./src/quoteservice/Dockerfile
+            tag_suffix: quoteservice
+            context: ./
+          - file: ./src/shippingservice/Dockerfile
+            tag_suffix: shippingservice
+            context: ./
+          - file: ./src/recommendationservice/Dockerfile
+            tag_suffix: recommendationservice
+            context: ./
+          - file: ./src/kafka/Dockerfile
+            tag_suffix: kafka
+            context: ./
+          - file: ./src/accountingservice/Dockerfile
+            tag_suffix: accountingservice
+            context: ./
+          - file: ./src/frauddetectionservice/Dockerfile
+            tag_suffix: frauddetectionservice
+            context: ./
+          - file: ./src/frontend/Dockerfile.cypress
+            tag_suffix: frontend-tests
+            context: ./
+          - file: ./test/Dockerfile
+            tag_suffix: integrationTests
+            context: ./
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      # - name: Log in to the Container registry
+      #   uses: docker/login-action@v2
+      #   with:
+      #     registry: ghcr.io
+      #     username: ${{ github.repository_owner }}
+      #     password: ${{ secrets.GITHUB_TOKEN }}
+      #   if: github.event_name != 'pull_request'
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: github.event_name != 'pull_request'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config-inline: |
+            [worker.oci]
+              max-parallelism = 2
+
+      - name: Matrix Build and push demo images
+        uses: docker/build-push-action@v3.3.0
+        with:
+          context: ${{ matrix.file_tag.context }}
+          file: ${{ matrix.file_tag.file }}
+          platforms: linux/amd64
+          push: ${{ github.event_name != 'pull_request' }}
+          # tags: |
+          #   ${{ env.DOCKERHUB_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{matrix.file_tag.tag_suffix }}
+          #   ${{ env.GHCR_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{ matrix.file_tag.tag_suffix }}
+          tags: |
+            ${{ env.DOCKERHUB_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{matrix.file_tag.tag_suffix }}
+          build-args: |
+            INSTANA_AGENT_KEY=${{ secrets.INSTANA_AGENT_KEY }}
+            INSTANA_DOWNLOAD_KEY=${{ secrets.INSTANA_DOWNLOAD_KEY }}
+          cache-from: type=gha
+          cache-to: type=gha

Makefile

@@ -86,6 +86,9 @@ build-and-push-ghcr:
 	docker compose --env-file .ghcr.env -f docker-compose.yml build
 	docker compose --env-file .ghcr.env -f docker-compose.yml push
 
+.PHONY: push
+	docker compose --env-file .env -f docker-compose.yml push
+
 .PHONY: build-env-file
 build-env-file:
 	cp .env .dockerhub.env