updated package names, image names and added github action to pull an…

…d retag images
NovatecConsulting · Oct 24, 2024 · 47ce51b · 47ce51b
1 parent 8f43985
commit 47ce51b
Show file tree

Hide file tree

Showing 37 changed files with 172 additions and 128 deletions.
diff --git a/.github/workflows/provide-docker-images.yml b/.github/workflows/provide-docker-images.yml
@@ -0,0 +1,41 @@
+name: Provide needed docker images in ghcr.io
+
+on:
+  workflow_dispatch:
+
+env:
+  REGISTRY_IMAGE: ghcr.io/novatecconsulting/opentelemetry-training
+
+jobs:
+  retag_and_push:
+    name: Provide docker image ${{ matrix.image }} on ghcr.io
+    runs-on: [ubuntu-latest]
+    strategy:
+      matrix:
+        image:
+          - ghcr.io/novatecconsulting/openteleemetry-training-todobackend-springboot:v2404
+          - ghcr.io/novatecconsulting/openteleemetry-training-todoui-thymeleaf:v2404
+          - ghcr.io/novatecconsulting/openteleemetry-training-todoui-flask:v2404
+          - ghcr.io/novatecconsulting/openteleemetry-training-simple-generator:v2404
+    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 }}
+
+      - name: Retag the image for GitHub Container Registry
+        run: |
+          docker tag ${{ matrix.image }} ${{ env.REGISTRY_IMAGE }}-${{ matrix.image }}
+
+      - name: Push image to GitHub Container Registry
+        run: |
+          docker push ${{ env.REGISTRY_IMAGE }}-${{ matrix.image }}
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,7 @@
 *.jar
 
 settings.json
+
+.direnv
+.devenv
+.envrc
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,13 +1,12 @@
 # Image of workspace. Learn more: https://www.gitpod.io/docs/configure/workspaces/workspace-image
 image: maeddes/gitpod:full
-workspaceLocation: '/workspace/opentelemetry-training/exercises'
+workspaceLocation: "/workspace/opentelemetry-training/exercises"
 
 tasks:
   - name: Set environment variable
     command: eval $(gp env -e EXERCISES=/workspace/opentelemetry-training/exercises)
   - name: Add Python Otel libs
     command: pip3 install requests flask Faker opentelemetry-api opentelemetry-sdk opentelemetry-exporter-prometheus opentelemetry-exporter-otlp
-
 #  - name: Start httpbin
 #    command: docker run -p 6000:80 ealen/echo-server:0.9.2
 #  - name: Enable httpbin

diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile b/exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml b/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>io.novatec</groupId>
+	<groupId>com.example</groupId>
 	<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>

diff --git a/...l/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java b/...l/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -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;
 
 	}

diff --git a/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile b/exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml b/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>io.novatec</groupId>
+	<groupId>com.example</groupId>
 	<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>

diff --git a/...n/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java b/...n/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -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;
 
 	}

diff --git a/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/exercises/manual-instrumentation-java/initial/todobackend-springboot/Dockerfile b/exercises/manual-instrumentation-java/initial/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
diff --git a/exercises/manual-instrumentation-java/initial/todobackend-springboot/pom.xml b/exercises/manual-instrumentation-java/initial/todobackend-springboot/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>io.novatec</groupId>
+	<groupId>com.example</groupId>
 	<artifactId>todobackend-manual</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-manual</name>
-	<description>Novatec Demo Application</description>
+	<description>Demo Application</description>
 
 	<properties>
 		<java.version>21</java.version>

diff --git a/...l/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java b/...l/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -82,25 +82,25 @@ String addTodo(HttpServletRequest request, HttpServletResponse response, @PathVa
 
 		return todo;
 
-	} 
+	}
 
 	String someInternalMethod(String todo){
 
 		todoRepository.save(new Todo(todo));
-		
+
 		if(todo.equals("slow")){
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
-		} 		
+		}
 		if(todo.equals("fail")){
 
 			System.out.println("Failing ...");
 			throw new RuntimeException();
-			
-		} 
+
+		}
 
 		return todo;
 

diff --git a/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/Dockerfile b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/Dockerfile
@@ -21,6 +21,6 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todoui/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todoui
 
-ENTRYPOINT ["java","-cp","/opt/todoui/app:/opt/todoui/app/lib/*", "-javaagent:/opt/todoui/opentelemetry-javaagent.jar", "io.novatec.todoui.TodouiApplication"]
-#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java","-cp","/opt/todoui/app:/opt/todoui/app/lib/*", "-javaagent:/opt/todoui/opentelemetry-javaagent.jar", "com.example.todoui.TodouiApplication"]
+#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
 
diff --git a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/pom.xml b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>io.novatec</groupId>
+	<groupId>com.example</groupId>
 	<artifactId>todoui-manual</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>

diff --git a/.../initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/OpenTelemetryConfiguration.java b/.../initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/OpenTelemetryConfiguration.java
@@ -1,4 +1,4 @@
-package io.novatec.todoui;
+package com.example.todoui;
 
 import java.util.concurrent.TimeUnit;
 
@@ -45,8 +45,8 @@ public OpenTelemetry openTelemetry(){
 			.addSpanProcessor(SimpleSpanProcessor.create(jaegerOtlpExporter))
     //      .addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build()) // same results for now
 			.setResource(resource)
-			.build();	
-	//		.buildAndRegisterGlobal();	
+			.build();
+	//		.buildAndRegisterGlobal();
 
 
 		OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()

diff --git a/...tion-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java b/...tion-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
@@ -1,4 +1,4 @@
-package io.novatec.todoui;
+package com.example.todoui;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -122,7 +122,7 @@ public String addItem(String toDo){
 
 		template.postForEntity(endpoint+"/todos/"+toDo, null, String.class);
 
-		
+
 
 		span.end();
 

diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/Dockerfile b/exercises/manual-instrumentation-java/solution/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/pom.xml b/exercises/manual-instrumentation-java/solution/todobackend-springboot/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>io.novatec</groupId>
+	<groupId>com.example</groupId>
 	<artifactId>todobackend-manual-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-manual-solution</name>
-	<description>Novatec Demo Application</description>
+	<description>Demo Application</description>
 
 	<properties>
 		<java.version>21</java.version>

diff --git a/...dobackend-springboot/src/main/java/io/novatec/todobackend/OpenTelemetryConfiguration.java b/...dobackend-springboot/src/main/java/io/novatec/todobackend/OpenTelemetryConfiguration.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import java.time.Duration;
 

diff --git a/...n/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java b/...n/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 

diff --git a/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/...ringboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/exercises/manual-instrumentation-java/steps b/exercises/manual-instrumentation-java/steps
@@ -105,7 +105,7 @@ export BACKEND_URL=http://localhost:8080
 
 Put everything in own Config class:
 
-package io.novatec.todobackend;
+package com.example.todobackend;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/exercises/otel-in-action/docker-compose.yaml b/exercises/otel-in-action/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
       - POSTGRES_DB=mydb
 
   todobackend-springboot:
-    image: maeddes/todobackend-springboot:v2404
+    image: ghcr.io/novatecconsulting/openteleemetry-training-todobackend-springboot:v2404
     networks:
       - todonet
     build:
@@ -37,7 +37,7 @@ services:
       - postgresdb
 
   todoui-thymeleaf:
-    image: maeddes/todoui-thymeleaf:v2404
+    image: ghcr.io/novatecconsulting/openteleemetry-training-todoui-thymeleaf:v2404
     build:
       context: ./todoui-thymeleaf
       dockerfile: Dockerfile #-multistage
@@ -56,7 +56,7 @@ services:
       - OTEL_LOGS_EXPORTER=none
 
   todoui-flask:
-    image: maeddes/todoui-flask:v2404
+    image: ghcr.io/novatecconsulting/openteleemetry-training-todoui-flask:v2404
     build:
       context: ./todoui-flask
     networks:
@@ -70,7 +70,7 @@ services:
       - OTEL_METRICS_EXPORTER=otlp
 
   loadgenerator:
-    image: maeddes/simple-generator:v2404
+    image: ghcr.io/novatecconsulting/openteleemetry-training-simple-generator:v2404
     build:
       context: ./loadgenerator
     networks:

diff --git a/exercises/otel-in-action/todobackend-springboot/Dockerfile b/exercises/otel-in-action/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
diff --git a/exercises/otel-in-action/todobackend-springboot/pom.xml b/exercises/otel-in-action/todobackend-springboot/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>io.novatec</groupId>
+	<groupId>com.example</groupId>
 	<artifactId>todobackend</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend</name>
-	<description>Novatec Demo Application</description>
+	<description>Demo Application</description>
 
 	<properties>
 		<java.version>21</java.version>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,7 @@ @@
     *.jar
     settings.json
+    .direnv
+    .devenv
+    .envrc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app

		ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend

		ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*", "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
		ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*", "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]