last updates for swat

Author: hagen-p

kubernetes/opentelemetry-demo.yaml

@@ -1368,7 +1368,8 @@ spec:
       serviceAccountName: opentelemetry-demo
       containers:
         - name: fraud-detection
-          image: 'ghcr.io/open-telemetry/demo:2.1.3-fraud-detection'
+          #image: 'ghcr.io/open-telemetry/demo:2.1.3-fraud-detection'
+          image: ghcr.io/splunk/opentelemetry-demo/otel-fraud-detection:2.1.0
           imagePullPolicy: IfNotPresent
           env:
             - name: OTEL_SERVICE_NAME
@@ -1860,8 +1861,9 @@ spec:
       containers:
         - name: payment
           #image: 'ghcr.io/open-telemetry/demo:2.1.3-payment'
-          image: ghcr.io/splunk/opentelemetry-demo/otel-payment:2.1.3
+          image: ghcr.io/splunk/opentelemetry-demo/otel-payment:2.1.3amd
           imagePullPolicy: Always
+
           ports:        
             - containerPort: 8080
               name: service
@@ -1877,14 +1879,16 @@ spec:
                   fieldPath: status.hostIP
             - name: OTEL_COLLECTOR_NAME
               value: $(NODE_IP)
+            - name: OTEL_EXPORTER_OTLP_PROTOCOL
+              value: grpc  
             - name: OTEL_TRACES_EXPORTER
               value: otlp
             - name: OTEL_METRICS_EXPORTER
               value: otlp
             - name: OTEL_LOGS_EXPORTER
               value: otlp
             - name: SPLUNK_OTEL_LOG_CORRELATION_ENABLED
-              value: "true"
+              value: "true"  
             - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
               value: cumulative
             - name: PAYMENT_PORT
@@ -1894,20 +1898,24 @@ spec:
             - name: FLAGD_PORT
               value: "8013"
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: http://$(OTEL_COLLECTOR_NAME):4317
+              value: http://$(NODE_IP):4317
+            - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+              value: http://$(NODE_IP):4317
             - name: OTEL_RESOURCE_ATTRIBUTES
               value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.1.3
             - name: OTEL_PROFILER_LOGS_ENDPOINT
-              value: http://$(OTEL_COLLECTOR_NAME):4317
+              value: http://$(OTEL_COLLECTOR_NAME):4318
             - name: SPLUNK_PROFILER_CALL_STACK_INTERVAL
               value: "750"
             - name: SPLUNK_PROFILER_ENABLED
               value: "true"
             - name: SPLUNK_PROFILER_MEMORY_ENABLED
-              value: "true"   
+              value: "false"   
+            - name: OTEL_LOG_LEVEL
+              value: "info"  
           resources:
             limits:
-              memory: 120Mi
+              memory: 320Mi
           securityContext:
             runAsGroup: 1000
             runAsNonRoot: true
@@ -2354,7 +2362,7 @@ spec:
               #   secretKeyRef:
               #     name: workshop-secret
               #     key: url
-              value: 192.168.3.26
+              value:  192.168.3.214
           volumeMounts:
             - name: puppeteer
               subPath: local-file
@@ -2478,4 +2486,4 @@ data:
         cycle += 1;
         await delay(5000); // wait 5 seconds before next cycle
       }
-    })();
+    })();

src/fraud-detection/Dockerfile

@@ -15,11 +15,11 @@ RUN gradle shadowJar
 
 FROM gcr.io/distroless/java17-debian12:nonroot
 
-ARG OTEL_JAVA_AGENT_VERSION
+ARG SPLUNK_OTEL_JAVA_VERSION=2.20.1
 WORKDIR /usr/src/app/
 
-ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$OTEL_JAVA_AGENT_VERSION/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
-ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
+ADD --chmod=644 https://github.com/signalfx/splunk-otel-java/releases/download/v${SPLUNK_OTEL_JAVA_VERSION}/splunk-otel-javaagent.jar /usr/src/app/splunk-otel-javaagent.jar
+ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/splunk-otel-javaagent.jar
 
 COPY --from=builder /usr/src/app/build/libs/fraud-detection-1.0-all.jar fraud-detection-1.0-all.jar
 

src/fraud-detection/build-fraud-detection.sh

@@ -0,0 +1,61 @@
+#!/bin/bash -e
+
+# Usage:
+#   ./build-fraud-detection.sh <version> [-cc]
+
+if [ -z "$1" ]; then
+  echo "❌ Error: No version provided."
+  echo "Usage: $0 <version> [-cc]"
+  exit 1
+fi
+
+VERSION="$1"
+CACHE_OPTION=""
+
+# Check if the second arg is -cc
+if [[ "$2" == "-cc" ]]; then
+  CACHE_OPTION="--no-cache"
+fi
+
+# Move two directories up from src/fraud-detection
+cd "$(dirname "$0")/../.."
+
+echo "Building fraud-detection service version: $VERSION"
+echo "Build options: ${CACHE_OPTION:-default caching enabled}"
+
+# Build without push first
+DOCKER_CMD=(
+  docker buildx build
+  --platform=linux/amd64,linux/arm64
+  $CACHE_OPTION
+  --build-arg SPLUNK_OTEL_JAVA_VERSION=2.20.1
+  -t ghcr.io/splunk/opentelemetry-demo/otel-fraud-detection:"$VERSION"
+  --load
+  -f src/fraud-detection/Dockerfile
+  .
+)
+
+echo "Executing build command..."
+if ! "${DOCKER_CMD[@]}"; then
+  echo "❌ Error: Docker build failed"
+  exit 1
+fi
+
+echo "✅ Build successful"
+
+# Verify image exists locally
+if ! docker image inspect ghcr.io/splunk/opentelemetry-demo/otel-fraud-detection:"$VERSION" > /dev/null 2>&1; then
+  echo "❌ Error: Built image not found locally"
+  exit 1
+fi
+
+echo "✅ Image verified locally"
+
+# Push the image
+echo "Pushing image to registry..."
+if ! docker push ghcr.io/splunk/opentelemetry-demo/otel-fraud-detection:"$VERSION"; then
+  echo "❌ Error: Push failed. Check your registry authentication."
+  exit 1
+fi
+
+echo "✅ Successfully pushed ghcr.io/splunk/opentelemetry-demo/otel-fraud-detection:$VERSION"