From 297f96fdcb7954ffbe860eae97cf02c4a29b2bcd Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Fri, 8 Sep 2023 09:56:19 +0530
Subject: [PATCH 1/4] Bump zipkin reporter versions

---
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml | 5 +++--
 pom.xml                                                  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index effc25c34172..907402f5c624 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -134,8 +134,8 @@
                             io.opentracing.*; version="${jaeger.client.version}",
                             io.opentracing.*; version="${jaeger.client.version}",
                             io.opentelemetry.*; version="${opentelemetry.all.version}",
-                            zipkin2.reporter.*; version="${zipkin.reporter.version}",
-                            zipkin2.reporter.okhttp3.*; version="${zipkin.sender.okhttp3.version}",
+                            zipkin2.reporter.*; version="${zipkin.reporter.version.range}",
+                            zipkin2.reporter.okhttp3.*; version="${zipkin.reporter.version.range}",
                             org.apache.commons.logging.*; version="${import.package.version.commons.logging}",
                             org.wso2.carbon.apimgt.impl.*; version="${carbon.apimgt.imp.pkg.version}",
                             org.wso2.carbon.utils.*,
@@ -145,6 +145,7 @@
                             *;resolution:=optional
                         </Import-Package>
                         <Export-Package>
+                            zipkin2.reporter.*; version="${zipkin.reporter.version}",
                             !org.wso2.carbon.apimgt.tracing.internal.*,
                             org.wso2.carbon.apimgt.tracing.*;version="${carbon.apimgt.version}"
                         </Export-Package>
diff --git a/pom.xml b/pom.xml
index 42e40a258611..aa444e4b1a7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2177,8 +2177,9 @@
         <swagger3.core.version>2.2.8</swagger3.core.version>
         <javax.enterprise.version>2.0</javax.enterprise.version>
         <jaeger.client.version>1.8.0.wso2v1</jaeger.client.version>
-        <zipkin.sender.okhttp3.version>2.16.3</zipkin.sender.okhttp3.version>
-        <zipkin.reporter.version>2.16.3</zipkin.reporter.version>
+        <zipkin.sender.okhttp3.version>2.16.4</zipkin.sender.okhttp3.version>
+        <zipkin.reporter.version>2.16.4</zipkin.reporter.version>
+        <zipkin.reporter.version.range>[2.16.4,3)</zipkin.reporter.version.range>
         <brave.opentracing.version>0.32.0</brave.opentracing.version>
         <opentracing.api.version>0.31.0</opentracing.api.version>
         <opentracing.mock.version>0.31.0</opentracing.mock.version>

From 634397e3bce6c1ca741b8fb465e4489f40bf36f4 Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Fri, 8 Sep 2023 09:56:38 +0530
Subject: [PATCH 2/4] Bump opentelemetry version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa444e4b1a7d..2c1b6924bd02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2183,7 +2183,7 @@
         <brave.opentracing.version>0.32.0</brave.opentracing.version>
         <opentracing.api.version>0.31.0</opentracing.api.version>
         <opentracing.mock.version>0.31.0</opentracing.mock.version>
-        <opentelemetry.all.version>1.11.0.wso2v3</opentelemetry.all.version>
+        <opentelemetry.all.version>1.11.0.wso2v4</opentelemetry.all.version>
         <aspectj.version>1.9.5</aspectj.version>
         <everit.version>1.5.0.wso2.v2</everit.version>
         <json.orbit.version>3.0.0.wso2v1</json.orbit.version>

From 081d704acb0374f16d5a54e14b3dc4c476bbc47f Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Mon, 11 Sep 2023 10:52:55 +0530
Subject: [PATCH 3/4] Bump okio version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2c1b6924bd02..30c34cb2415a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2206,7 +2206,7 @@
 
         <zipkin.version>2.23.2</zipkin.version>
         <okhttp.wso2.version>4.9.3.wso2v2</okhttp.wso2.version>
-        <okio.wso2.version>2.8.0.wso2v2</okio.wso2.version>
+        <okio.wso2.version>3.5.0.wso2v1</okio.wso2.version>
 
         <openfeign.version>11.0</openfeign.version>
         <maven.spotbugsplugin.version>4.1.4</maven.spotbugsplugin.version>

From 8172ffb8fb86d04d7df7d62a70fd0858c1d73434 Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Mon, 11 Sep 2023 10:53:20 +0530
Subject: [PATCH 4/4] Bump okhttp version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 30c34cb2415a..cb087d8e402f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2205,7 +2205,7 @@
         <org.wso2.orbit.com.amazonaws.version>1.11.1034.wso2v2</org.wso2.orbit.com.amazonaws.version>
 
         <zipkin.version>2.23.2</zipkin.version>
-        <okhttp.wso2.version>4.9.3.wso2v2</okhttp.wso2.version>
+        <okhttp.wso2.version>4.11.0.wso2v1</okhttp.wso2.version>
         <okio.wso2.version>3.5.0.wso2v1</okio.wso2.version>
 
         <openfeign.version>11.0</openfeign.version>