Fix otlp.grpc issue

jd-opensource · Dec 26, 2024 · 5dc497f · 5dc497f
1 parent 995a1ff
commit 5dc497f
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/joylive-implement/joylive-event/joylive-event-opentelemetry/pom.xml b/joylive-implement/joylive-event/joylive-event-opentelemetry/pom.xml
@@ -12,10 +12,10 @@
     <artifactId>joylive-event-opentelemetry</artifactId>
 
     <properties>
-        <grpc.version>1.63.0</grpc.version>
-        <opentelemetry-sdk.version>1.38.0</opentelemetry-sdk.version>
-        <opentelemetry-exporter-prometheus.version>1.38.0-alpha</opentelemetry-exporter-prometheus.version>
-        <protobuf-java.version>4.27.5</protobuf-java.version>
+        <grpc.version>1.69.0</grpc.version>
+        <opentelemetry-sdk.version>1.45.0</opentelemetry-sdk.version>
+        <opentelemetry-exporter-prometheus.version>1.45.0-alpha</opentelemetry-exporter-prometheus.version>
+        <protobuf-java.version>4.29.2</protobuf-java.version>
         <gson.version>2.11.0</gson.version>
         <annotations.version>4.1.1.4</annotations.version>
         <animal-sniffer-annotations.version>1.23</animal-sniffer-annotations.version>
@@ -26,8 +26,8 @@
         <checker-qual.version>3.42.0</checker-qual.version>
         <jsr305.version>3.0.2</jsr305.version>
         <error_prone_annotations.version>2.18.0</error_prone_annotations.version>
-        <proto-google-common-protos.version>2.29.0</proto-google-common-protos.version>
-        <perfmark-api.version>0.26.0</perfmark-api.version>
+        <proto-google-common-protos.version>2.50.0</proto-google-common-protos.version>
+        <perfmark-api.version>0.27.0</perfmark-api.version>
         <prometheus.version>1.3.4</prometheus.version>
     </properties>
 
@@ -86,13 +86,23 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-sender-jdk</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-exporter-sender-grpc-managed-channel</artifactId>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>opentelemetry-exporter-sender-okhttp</artifactId>
+                    <groupId>io.opentelemetry</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
@@ -318,9 +328,6 @@
                                     <include>com.google.protobuf:*</include>
                                     <include>org.codehaus.mojo:*</include>
                                     <include>org.checkerframework:*</include>
-                                    <include>com.squareup.okhttp3:*</include>
-                                    <include>com.squareup.okio:*</include>
-                                    <include>org.jetbrains.kotlin:*</include>
                                 </includes>
                             </artifactSet>
                             <transformers>
@@ -376,18 +383,6 @@
                                     <pattern>org.checkerframework</pattern>
                                     <shadedPattern>com.jd.live.agent.shaded.org.checkerframework</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>okhttp3</pattern>
-                                    <shadedPattern>com.jd.live.agent.shaded.okhttp3</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>okio</pattern>
-                                    <shadedPattern>com.jd.live.agent.shaded.okio</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>kotlin</pattern>
-                                    <shadedPattern>com.jd.live.agent.shaded.kotlin</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.slf4j</pattern>
                                     <shadedPattern>com.jd.live.agent.shaded.org.slf4j</shadedPattern>