revert to io.novatec

lftraining · Oct 24, 2024 · 48231d9 · 48231d9
1 parent 53498ec
commit 48231d9
Show file tree

Hide file tree

Showing 29 changed files with 31 additions and 31 deletions.
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","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml b/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-automatic</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-automatic</name>

diff --git a/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java b/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;

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 com.example.todobackend;
+package io.novatec.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","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml b/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-automatic-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-automatic-solution</name>

diff --git a/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java b/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;

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 com.example.todobackend;
+package io.novatec.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","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.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,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-manual</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-manual</name>

diff --git a/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java b/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;

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 com.example.todobackend;
+package io.novatec.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", "com.example.todoui.TodouiApplication"]
-#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
+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"]
 
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>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todoui-manual</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>

diff --git a/...le/todoui/OpenTelemetryConfiguration.java → ...ec/todoui/OpenTelemetryConfiguration.java b/...le/todoui/OpenTelemetryConfiguration.java → ...ec/todoui/OpenTelemetryConfiguration.java
@@ -1,4 +1,4 @@
-package com.example.todoui;
+package io.novatec.todoui;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...com/example/todoui/TodouiApplication.java → .../io/novatec/todoui/TodouiApplication.java b/...com/example/todoui/TodouiApplication.java → .../io/novatec/todoui/TodouiApplication.java
@@ -1,4 +1,4 @@
-package com.example.todoui;
+package io.novatec.todoui;
 
 import java.util.ArrayList;
 import java.util.List;

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","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.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,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-manual-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-manual-solution</name>

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

diff --git a/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java b/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.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 com.example.todobackend;
+package io.novatec.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 com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
diff --git a/exercises/otel-in-action/todobackend-springboot/pom.xml b/exercises/otel-in-action/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend</name>

diff --git a/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java b/...e/todobackend/TodobackendApplication.java → ...c/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;

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 com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/exercises/otel-in-action/todoui-thymeleaf/Dockerfile b/exercises/otel-in-action/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", "com.example.todoui.TodouiApplication"]
-#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
+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"]
 
diff --git a/exercises/otel-in-action/todoui-thymeleaf/pom.xml b/exercises/otel-in-action/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>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todoui</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>

diff --git a/...com/example/todoui/TodouiApplication.java → .../io/novatec/todoui/TodouiApplication.java b/...com/example/todoui/TodouiApplication.java → .../io/novatec/todoui/TodouiApplication.java
@@ -1,4 +1,4 @@
-package com.example.todoui;
+package io.novatec.todoui;
 
 import javax.annotation.PostConstruct;
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","com.example.todobackend.TodobackendApplication"]
		ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*", "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]