Merge branch 'main' into currencyservice-1.12.0

.github/workflows/run-integration-tests.yml

@@ -0,0 +1,50 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: Integration Tests
+
+on:
+  pull_request_target:
+    branches:
+      - main
+    types: [closed]
+
+jobs:
+  build_runner:
+    runs-on: ubuntu-latest
+    name: "Build Runner"
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: metal-runner-action
+        uses: equinix-labs/metal-action-runner@v0.1.1
+        with:
+          github_token: ${{ secrets.GH_CI_SECRET }}
+          metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}
+          metal_project_id: ${{ secrets.METAL_PROJECT_ID }}
+          metro: "da"
+          plan: "c3.small.x86"
+          os: "ubuntu_20_04"
+  run_tests:
+    needs: build_runner
+    runs-on: self-hosted
+    name: "Run CI"
+    steps:
+      - name: check out code
+        uses: actions/checkout@v3
+      - name: install docker
+        run: |
+          curl -fsSL https://get.docker.com -o get-docker.sh
+          sudo sh get-docker.sh
+      - name: run tracetesting
+        run: |
+          make build && make run-tracetesting
+  destroy:
+    needs: [build_runner, run_tests]
+    runs-on: ubuntu-latest
+    name: "Cleanup"
+    steps:
+      - name: metal-sweeper-action
+        uses: equinix-labs/metal-sweeper-action@v0.6.1
+        with:
+          authToken: ${{ secrets.METAL_AUTH_TOKEN }}
+          projectID: ${{ secrets.METAL_PROJECT_ID }}
+          keepProject: true

README.md

@@ -6,6 +6,7 @@
 [![Commits](https://img.shields.io/github/commits-since/open-telemetry/opentelemetry-demo/latest?color=ff69b4&include_prereleases)](https://github.com/open-telemetry/opentelemetry-demo/graphs/commit-activity)
 [![Downloads](https://img.shields.io/docker/pulls/otel/demo)](https://hub.docker.com/r/otel/demo)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg?color=red)](https://github.com/open-telemetry/opentelemetry-demo/blob/main/LICENSE)
+[![Integration Tests](https://github.com/open-telemetry/opentelemetry-demo/actions/workflows/run-integration-tests.yml/badge.svg)](https://github.com/open-telemetry/opentelemetry-demo/actions/workflows/run-integration-tests.yml)
 
 ## Welcome to the OpenTelemetry Astronomy Shop Demo
 

src/frauddetectionservice/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     id("java")
     id("idea")
     id("com.google.protobuf") version "0.9.4"
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 group = "io.opentelemetry"

src/paymentservice/Dockerfile

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-FROM node:18-alpine AS build
+FROM node:21-alpine AS build
 
 WORKDIR /usr/src/app/
 
@@ -12,7 +12,7 @@ RUN apk add --no-cache python3 make g++ && npm ci --omit=dev
 
 # -----------------------------------------------------------------------------
 
-FROM node:18-alpine
+FROM node:21-alpine
 
 USER node
 WORKDIR /usr/src/app/