From e7bbfd4bf93b8d1e0c2637ca88d3dd2fe9a6cccc Mon Sep 17 00:00:00 2001
From: Saikat <saikatcse03@gmail.com>
Date: Sat, 25 Feb 2023 18:21:59 +0530
Subject: [PATCH 1/4] Dependencies Version update

---
 .../spring-cloud-open-telemetry1/pom.xml      | 29 ++++---------------
 .../src/main/resources/application.properties |  2 +-
 .../spring-cloud-open-telemetry2/pom.xml      | 29 ++++---------------
 3 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
index 5011590e73..3003113085 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
@@ -62,12 +62,8 @@
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-okhttp</artifactId>
-            <version>${grpc-okhttp.version}</version>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <version>${otel-exporter-otlp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -93,24 +89,11 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
-        <spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
-        <release.train.version>2020.0.4</release.train.version>
-        <spring-cloud-sleuth-otel.version>1.0.0-M12</spring-cloud-sleuth-otel.version>
-        <grpc-okhttp.version>1.42.1</grpc-okhttp.version>
+        <spring-boot-dependencies.version>2.7.9</spring-boot-dependencies.version>
+        <release.train.version>2021.0.5</release.train.version>
+        <spring-cloud-sleuth-otel.version>1.1.2</spring-cloud-sleuth-otel.version>
+        <otel-exporter-otlp.version>1.23.1</otel-exporter-otlp.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties
index 1645b6144d..22634c8a8e 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties
@@ -2,4 +2,4 @@ server.port= 8080
 spring.application.name=product-service
 priceClient.baseUrl=http://price-service:8081
 spring.sleuth.otel.config.trace-id-ratio-based=1.0
-spring.sleuth.otel.exporter.otlp.endpoint=http://collector:4317
\ No newline at end of file
+#spring.sleuth.otel.exporter.otlp.endpoint=http://collector:4317
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
index 2d7ac8204e..4f56cc717e 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
@@ -61,12 +61,8 @@
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-okhttp</artifactId>
-            <version>${grpc-okhttp.version}</version>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <version>${otel-exporter-otlp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -92,24 +88,11 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
-        <spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
-        <release.train.version>2020.0.4</release.train.version>
-        <spring-cloud-sleuth-otel.version>1.0.0-M12</spring-cloud-sleuth-otel.version>
-        <grpc-okhttp.version>1.42.1</grpc-okhttp.version>
+        <spring-boot-dependencies.version>2.7.9</spring-boot-dependencies.version>
+        <release.train.version>2021.0.5</release.train.version>
+        <spring-cloud-sleuth-otel.version>1.1.2</spring-cloud-sleuth-otel.version>
+        <otel-exporter-otlp.version>1.23.1</otel-exporter-otlp.version>
     </properties>
 
 </project>
\ No newline at end of file

From a849636d695f569c1f0ddbdd7d3f8c57021251a2 Mon Sep 17 00:00:00 2001
From: Saikat <saikatcse03@gmail.com>
Date: Sat, 25 Feb 2023 18:24:10 +0530
Subject: [PATCH 2/4] Dependencies Version update

---
 .../src/main/resources/application.properties                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties
index 22634c8a8e..1645b6144d 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/src/main/resources/application.properties
@@ -2,4 +2,4 @@ server.port= 8080
 spring.application.name=product-service
 priceClient.baseUrl=http://price-service:8081
 spring.sleuth.otel.config.trace-id-ratio-based=1.0
-#spring.sleuth.otel.exporter.otlp.endpoint=http://collector:4317
\ No newline at end of file
+spring.sleuth.otel.exporter.otlp.endpoint=http://collector:4317
\ No newline at end of file

From 0049c9f4ccdf417a2fc5c91098b0a6d7ad74d3ba Mon Sep 17 00:00:00 2001
From: Saikat <saikatcse03@gmail.com>
Date: Sat, 25 Feb 2023 18:41:35 +0530
Subject: [PATCH 3/4] OpenTelemetry docker version upgrade

---
 .../spring-cloud-open-telemetry/docker-compose.yml              | 2 +-
 .../spring-cloud-open-telemetry/otel-config.yml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml b/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
index 8a6833095c..7ee2f67c0f 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - "14250"
 
   collector:
-    image: otel/opentelemetry-collector:0.47.0
+    image: otel/opentelemetry-collector:0.72.0
     command: [ "--config=/etc/otel-collector-config.yml" ]
     volumes:
       - ./otel-config.yml:/etc/otel-collector-config.yml
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml b/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
index 886c10a1c3..4402603a85 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
@@ -9,7 +9,7 @@ processors:
 
 exporters:
   logging:
-    logLevel: debug
+    loglevel: debug
   jaeger:
     endpoint: jaeger-service:14250
     tls:

From 9ff279eb84da5bcd7b2dcb3c97ae322cbc721836 Mon Sep 17 00:00:00 2001
From: Saikat <saikatcse03@gmail.com>
Date: Sun, 26 Feb 2023 13:04:08 +0530
Subject: [PATCH 4/4] Port number corrected

---
 .../spring-cloud-open-telemetry1/Dockerfile                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
index 8bae52cec4..50cd35ed84 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
@@ -2,6 +2,6 @@ FROM adoptopenjdk/openjdk11:alpine
 
 COPY target/spring-cloud-open-telemetry1-1.0.0-SNAPSHOT.jar spring-cloud-open-telemetry.jar
 
-EXPOSE 8081
+EXPOSE 8080
 
 ENTRYPOINT ["java","-jar","/spring-cloud-open-telemetry.jar"]
\ No newline at end of file