Update package names

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3-eclipse-temurin-21  AS dind
+FROM maven:3-eclipse-temurin-21 AS dind
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PIP_ROOT_USER_ACTION=ignore

.github/workflows/provide-docker-images.yml

@@ -0,0 +1,50 @@
+name: Provide needed docker images in ghcr.io
+
+on:
+  workflow_dispatch:
+  push:
+
+env:
+  REGISTRY_IMAGE: ghcr.io/lftraining/lfs148-code
+
+jobs:
+  retag_and_push:
+    name: Provide docker image ${{ matrix.image.namespace }}/${{ matrix.image.name }}:${{ matrix.image.tag }} on ghcr.io
+    runs-on: [ubuntu-latest]
+    strategy:
+      matrix:
+        image:
+          - name: todobackend-springboot
+            tag: v2404
+            namespace: maeddes
+          - name: todoui-thymeleaf
+            tag: v2404
+            namespace: maeddes
+          - name: todoui-flask
+            tag: v2404
+            namespace: maeddes
+          - name: simple-generator
+            tag: v2404
+            namespace: maeddes
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull image from Docker Hub
+        run: |
+            docker pull docker.io/${{ matrix.image.namespace }}/${{ matrix.image.name }}:${{ matrix.image.tag }}
+
+      - name: Retag the image for GitHub Container Registry
+        run: |
+          docker tag ${{ matrix.image.namespace }}/${{ matrix.image.name }}:${{ matrix.image.tag }} ${{ env.REGISTRY_IMAGE }}-${{ matrix.image.name }}:${{ matrix.image.tag }}
+
+      - name: Push image to GitHub Container Registry
+        run: |
+          docker push ${{ env.REGISTRY_IMAGE }}-${{ matrix.image.name }}:${{ matrix.image.tag }}

.gitignore

@@ -4,3 +4,6 @@
 *.jar
 
 settings.json
+.envrc
+.direnv
+.devenv

exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/maven:3-eclipse-temurin-21 as build
+FROM docker.io/maven:3-eclipse-temurin-21 AS build
 WORKDIR /workspace/app
 
 COPY pom.xml .

exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml

@@ -15,7 +15,7 @@
 	<artifactId>todobackend-automatic</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-automatic</name>
-	<description>Novatec Demo Application</description>
+	<description>Demo Application</description>
 
 	<properties>
 		<java.version>21</java.version>
@@ -53,6 +53,20 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+                <exclusion>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy-agent</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 	</dependencies>
 

exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java

@@ -87,13 +87,13 @@ String someInternalMethod(String todo){
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
-		} 		
+		}
 		if(todo.equals("fail")){
 
 			System.out.println("Failing ...");
 			throw new RuntimeException();
-			
-		} 
+
+		}
 		return todo;
 
 	}

exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/maven:3-eclipse-temurin-21 as build
+FROM docker.io/maven:3-eclipse-temurin-21 AS build
 WORKDIR /workspace/app
 
 COPY pom.xml .

exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml

@@ -15,7 +15,7 @@
 	<artifactId>todobackend-automatic-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-automatic-solution</name>
-	<description>Novatec Demo Application</description>
+	<description>Demo Application</description>
 
 	<properties>
 		<java.version>21</java.version>
@@ -53,6 +53,20 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+                <exclusion>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy-agent</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.opentelemetry.instrumentation</groupId>

exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java

@@ -91,13 +91,13 @@ String someInternalMethod(@SpanAttribute String todo){
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
-		} 		
+		}
 		if(todo.equals("fail")){
 
 			System.out.println("Failing ...");
 			throw new RuntimeException();
-			
-		} 
+
+		}
 		return todo;
 
 	}