.devcontainer/Dockerfile

@@ -1,46 +1,11 @@
-# Build stage
+# Not actually used by the devcontainer, but it is used by gitpod
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest as builder
+ARG VARIANT=17-bullseye
-
+FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
-# Install required packages
+ARG NODE_VERSION="none"
-USER root
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-RUN microdnf install -y tar gzip
+ARG USER=vscode
-
+VOLUME /home/$USER/.m2
-# Switch back to default user
+VOLUME /home/$USER/.gradle
-USER 1001
+ARG JAVA_VERSION=17.0.7-ms
-
+RUN sudo mkdir /home/$USER/.m2 /home/$USER/.gradle && sudo chown $USER:$USER /home/$USER/.m2 /home/$USER/.gradle
-WORKDIR /app
+RUN bash -lc '. /usr/local/sdkman/bin/sdkman-init.sh && sdk install java $JAVA_VERSION && sdk use java $JAVA_VERSION'
-
-# Copy Maven wrapper and POM
-COPY --chown=1001:0 .mvn/ .mvn/
-COPY --chown=1001:0 mvnw pom.xml ./
-RUN chmod +x mvnw
-
-# Create Checkstyle suppressions file
-RUN echo '<?xml version="1.0"?>' > checkstyle-suppressions.xml && \
-    echo '<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">' >> checkstyle-suppressions.xml && \
-    echo '<suppressions>' >> checkstyle-suppressions.xml && \
-    echo '    <suppress files=".*\.jar" checks="NoHttp"/>' >> checkstyle-suppressions.xml && \
-    echo '    <suppress files=".*\.pom" checks="NoHttp"/>' >> checkstyle-suppressions.xml && \
-    echo '</suppressions>' >> checkstyle-suppressions.xml
-# Download dependencies
-RUN ./mvnw dependency:go-offline -Dcheckstyle.suppressions.location=checkstyle-suppressions.xml
-
-# Copy source code
-COPY --chown=1001:0 src ./src
-
-# Build the application
-RUN ./mvnw package -DskipTests -Dcheckstyle.suppressions.location=checkstyle-suppressions.xml
-
-# Run stage
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
-
-WORKDIR /app
-
-# Copy the built artifact from builder stage
-COPY --from=builder /app/target/*.jar app.jar
-
-# Container runs on port 8080
-EXPOSE 8080
-
-# Set the startup command
-ENTRYPOINT ["java", "-jar", "app.jar"]

.github/workflows/pipeline.yml

@@ -2,66 +2,59 @@ name: Enhanced Java Application Pipeline with Metrics
 
 on:
   push:
-    branches: [ pipeline-optimization ]
+    branches: [ main ]
   pull_request:
-    branches: [ pipeline-optimization ]
+    branches: [ main ]
 
 jobs:
   build-with-metrics:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
 
     services:
       prometheus:
         image: prom/prometheus:latest
         ports:
           - 9090:9090
-        options: >-
+        healthcheck:
-          --health-cmd "wget -q -O- http://localhost:9090/-/healthy || exit 1"
+          test: ["CMD", "wget", "-q", "--spider", "http://localhost:9090/-/healthy"]
-          --health-interval 10s
+          interval: 10s
-          --health-timeout 5s
+          timeout: 5s
-          --health-retries 3
+          retries: 3
 
       pushgateway:
         image: prom/pushgateway:latest
         ports:
           - 9091:9091
-        options: >-
+        healthcheck:
-          --health-cmd "wget -q -O- http://localhost:9091/-/healthy || exit 1"
+          test: ["CMD", "wget", "-q", "--spider", "http://localhost:9091/-/healthy"]
-          --health-interval 10s
+          interval: 10s
-          --health-timeout 5s
+          timeout: 5s
-          --health-retries 3
+          retries: 3
 
     steps:
       - uses: actions/checkout@v4
 
+      # Installation and setup of monitoring tools
       - name: Setup monitoring tools
-        id: setup-monitoring
-        timeout-minutes: 5
         run: |
-          set -eo pipefail
+          sudo apt-get update
-          
+          sudo apt-get install -y powerstat linux-tools-common linux-tools-generic
-          echo "::group::Installing system packages"
+          sudo snap install powerapi
-          sudo apt-get update || (echo "Failed to update package lists" && exit 1)
+          curl -L https://github.com/prometheus/node_exporter/releases/download/v1.3.1/node_exporter-1.3.1.linux-amd64.tar.gz -o node_exporter.tar.gz
-          sudo apt-get install -y powerstat linux-tools-common linux-tools-generic || (echo "Failed to install powerstat and linux tools" && exit 1)
+          tar xvfz node_exporter.tar.gz
-          echo "::endgroup::"
-          
-          echo "::group::Setting up node exporter"
-          curl -L --retry 3 https://github.com/prometheus/node_exporter/releases/download/v1.3.1/node_exporter-1.3.1.linux-amd64.tar.gz -o node_exporter.tar.gz || (echo "Failed to download node exporter" && exit 1)
-          tar xvfz node_exporter.tar.gz || (echo "Failed to extract node exporter" && exit 1)
-          echo "::endgroup::"
 
+      # Start monitoring tools with improved configuration
       - name: Start monitoring
-        id: start-monitoring
-        timeout-minutes: 2
         run: |
-          set -eo pipefail
+          # Start PowerAPI with Prometheus output
+          sudo powerapi --pid $$ --frequency 1000 --output prometheus --pushgateway-url http://localhost:9091/metrics/job/powerapi &
+          echo "POWERAPI_PID=$!" >> $GITHUB_ENV
           
+          # Start node exporter
           ./node_exporter-*/node_exporter --web.listen-address=":9100" &
           echo "NODE_EXPORTER_PID=$!" >> $GITHUB_ENV
           
-          timeout 30s bash -c 'until curl -s http://localhost:9100/metrics > /dev/null; do sleep 1; done' || (echo "Node exporter failed to start" && exit 1)
+          # Create start timestamp file
-          
           date +%s%N > pipeline_start_time.txt
 
       - name: Set up JDK 17
@@ -72,188 +65,88 @@ jobs:
           cache: maven
 
       - name: Build with Maven
-        id: build
-        timeout-minutes: 15
-        env:
-          MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
         run: |
-          set -eo pipefail
-          
-          echo "Creating checkstyle suppressions file..."
-          cat > checkstyle-suppressions.xml << 'EOF'
-          <?xml version="1.0"?>
-          <!DOCTYPE suppressions PUBLIC
-            "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-            "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-          <suppressions>
-            <suppress files="node_exporter.*" checks="NoHttp"/>
-          </suppressions>
-          EOF
-          
-          echo "Modifying checkstyle configuration..."
-          if [ -f "src/checkstyle/nohttp-checkstyle.xml" ]; then
-            sed -i '/<module name="Checker">/a \    <module name="SuppressionFilter">\n      <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>\n    </module>' src/checkstyle/nohttp-checkstyle.xml
-          fi
-          
-          echo "Starting Maven build..."
           start_time=$(date +%s%N)
-          
+          ./mvnw -B verify
-          ./mvnw -B verify \
-            -Dcheckstyle.config.location=src/checkstyle/nohttp-checkstyle.xml \
-            -Dcheckstyle.suppressions.location=checkstyle-suppressions.xml
-          
-          build_status=$?
           end_time=$(date +%s%N)
           echo "BUILD_TIME=$((($end_time - $start_time)/1000000))" >> $GITHUB_ENV
-          
-          if [ $build_status -ne 0 ]; then
-            echo "::error::Maven build failed with status $build_status"
-            exit $build_status
-          fi
 
       - name: Run tests
-        id: test
-        if: success() || failure()
-        timeout-minutes: 20
         run: |
-          set -eo pipefail
           start_time=$(date +%s%N)
           ./mvnw test
-          test_status=$?
           end_time=$(date +%s%N)
           echo "TEST_TIME=$((($end_time - $start_time)/1000000))" >> $GITHUB_ENV
-          exit $test_status
 
       - name: Build Docker image
-        id: docker-build
-        if: success()
-        timeout-minutes: 10
         run: |
-          set -eo pipefail
           start_time=$(date +%s%N)
-          
+          docker build -t app:latest .
-          docker build -t app:latest -f .devcontainer/Dockerfile . --no-cache
-          build_status=$?
           end_time=$(date +%s%N)
           echo "DOCKER_BUILD_TIME=$((($end_time - $start_time)/1000000))" >> $GITHUB_ENV
-          exit $build_status
 
       - name: Setup Kubernetes
-        id: k8s-setup
-        if: success()
         uses: helm/kind-action@v1
-        with:
-          wait: 120s
 
       - name: Deploy to Kubernetes
-        id: deploy
-        if: success()
-        timeout-minutes: 10
         run: |
-          set -eo pipefail
           start_time=$(date +%s%N)
-          kubectl apply -f k8s/ || (echo "Failed to apply Kubernetes manifests" && exit 1)
+          kubectl apply -f k8s/
-          
+          kubectl wait --for=condition=ready pod -l app=petclinic --timeout=180s
-          if ! kubectl wait --for=condition=ready pod -l app=petclinic --timeout=180s; then
-            echo "::error::Deployment failed - collecting debug information"
-            kubectl describe pods -l app=petclinic
-            kubectl logs -l app=petclinic --all-containers=true
-            exit 1
-          fi
-          
           end_time=$(date +%s%N)
           echo "DEPLOY_TIME=$((($end_time - $start_time)/1000000))" >> $GITHUB_ENV
 
+      # Export metrics with improved labeling and job naming
       - name: Export metrics to Prometheus
-        if: always()
-        timeout-minutes: 5
         run: |
-          set -eo pipefail
+          # Export timing metrics with descriptive labels
+          echo "pipeline_build_duration_ms{stage=\"build\",project=\"petclinic\"} ${{ env.BUILD_TIME }}" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
+          echo "pipeline_test_duration_ms{stage=\"test\",project=\"petclinic\"} ${{ env.TEST_TIME }}" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
+          echo "pipeline_docker_build_duration_ms{stage=\"docker-build\",project=\"petclinic\"} ${{ env.DOCKER_BUILD_TIME }}" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
+          echo "pipeline_deploy_duration_ms{stage=\"deploy\",project=\"petclinic\"} ${{ env.DEPLOY_TIME }}" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
           
-          export_metric() {
+          # Export power consumption metrics
-            local metric_name=$1
+          while IFS=, read -r timestamp watts; do
-            local metric_value=$2
+            echo "power_consumption_watts{project=\"petclinic\"} $watts $timestamp" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
-            local stage=$3
+          done < energy_metrics.csv
-          
-            if [ -n "$metric_value" ]; then
-              echo "${metric_name}{stage=\"${stage}\",project=\"petclinic\"} ${metric_value}" | \
-                curl --retry 3 --retry-delay 2 --max-time 10 --silent --show-error \
-                  --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline || \
-                echo "::warning::Failed to export ${metric_name} for ${stage}"
-            fi
-          }
-          
-          export_metric "pipeline_build_duration_ms" "${BUILD_TIME}" "build"
-          export_metric "pipeline_test_duration_ms" "${TEST_TIME}" "test"
-          export_metric "pipeline_docker_build_duration_ms" "${DOCKER_BUILD_TIME}" "docker-build"
-          export_metric "pipeline_deploy_duration_ms" "${DEPLOY_TIME}" "deploy"
 
+      # Collect additional resource metrics
       - name: Collect resource metrics
-        if: always()
-        timeout-minutes: 2
         run: |
-          set -eo pipefail
+          # Memory usage metric
+          echo "pipeline_memory_usage_bytes{project=\"petclinic\"} $(free -b | grep Mem: | awk '{print $3}')" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
           
-          export_metric() {
+          # CPU usage metric
-            local metric_name=$1
+          echo "pipeline_cpu_usage_percent{project=\"petclinic\"} $(top -bn1 | grep "Cpu(s)" | awk '{print $2}')" | curl --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline
-            local metric_value=$2
-            local stage=$3
-          
-            if [ -n "$metric_value" ]; then
-              echo "${metric_name}{stage=\"${stage}\",project=\"petclinic\"} ${metric_value}" | \
-                curl --retry 3 --retry-delay 2 --max-time 10 --silent --show-error \
-                  --data-binary @- http://localhost:9091/metrics/job/petclinic-pipeline || \
-                echo "::warning::Failed to export ${metric_name} for ${stage}"
-            fi
-          }
-          
-          mem_usage=$(free -b | grep Mem: | awk '{print $3}') || echo "::warning::Failed to collect memory usage"
-          if [ -n "$mem_usage" ]; then
-            export_metric "pipeline_memory_usage_bytes" "$mem_usage" "memory"
-          fi
-          
-          cpu_usage=$(top -bn1 | grep "Cpu(s)" | awk '{print $2}') || echo "::warning::Failed to collect CPU usage"
-          if [ -n "$cpu_usage" ]; then
-            export_metric "pipeline_cpu_usage_percent" "$cpu_usage" "cpu"
-          fi
 
-      - name: Collect final metrics
+      # Stop monitoring tools and collect metrics
+      - name: Collect metrics
         if: always()
-        timeout-minutes: 5
         run: |
-          set -eo pipefail
+          # End timestamp
-          
           date +%s%N > pipeline_end_time.txt
           
-          if [ -n "$NODE_EXPORTER_PID" ]; then
+          # Stop PowerAPI
-            kill $NODE_EXPORTER_PID || echo "::warning::Failed to stop node exporter"
+          sudo kill ${{ env.POWERAPI_PID }}
-          fi
           
-          {
+          # Stop node exporter
-            echo "=== System Resources ===" > system_metrics.txt
+          kill ${{ env.NODE_EXPORTER_PID }}
-            top -b -n 1 >> system_metrics.txt
-          } || echo "::warning::Failed to collect top metrics"
           
-          {
+          # Collect system metrics
-            echo "=== Memory Usage ===" > memory_metrics.txt
+          top -b -n 1 > system_metrics.txt
-            free -m >> memory_metrics.txt
+          free -m > memory_metrics.txt
-          } || echo "::warning::Failed to collect memory metrics"
+          df -h > disk_metrics.txt
-          
-          {
-            echo "=== Disk Usage ===" > disk_metrics.txt
-            df -h >> disk_metrics.txt
-          } || echo "::warning::Failed to collect disk metrics"
 
+      # Save metrics as artifacts
       - name: Save metrics
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: pipeline-metrics
           path: |
+            energy_metrics.csv
             system_metrics.txt
             memory_metrics.txt
             disk_metrics.txt
             pipeline_start_time.txt
             pipeline_end_time.txt
-          retention-days: 90
-          if-no-files-found: warn