iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13540 from saikatcse03/master 

Dependencies version update
This commit is contained in:
Loredana Crusoveanu 2023-03-02 18:16:17 +02:00 committed by GitHub
parent a290b5862e db1e483c24
commit 7d99684471
5 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
View File

@ -20,7 +20,7 @@ services:
- "14250" - "14250"
collector: collector:
image: otel/opentelemetry-collector:0.47.0 image: otel/opentelemetry-collector:0.72.0
command: [ "--config=/etc/otel-collector-config.yml" ] command: [ "--config=/etc/otel-collector-config.yml" ]
volumes: volumes:
- ./otel-config.yml:/etc/otel-collector-config.yml - ./otel-config.yml:/etc/otel-collector-config.yml

2
spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
View File

@ -9,7 +9,7 @@ processors:
exporters: exporters:
logging: logging:
logLevel: debug loglevel: debug
jaeger: jaeger:
endpoint: jaeger-service:14250 endpoint: jaeger-service:14250
tls: tls:

2
spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
View File

@ -2,6 +2,6 @@ FROM adoptopenjdk/openjdk11:alpine
COPY target/spring-cloud-open-telemetry1-1.0.0-SNAPSHOT.jar spring-cloud-open-telemetry.jar 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"] ENTRYPOINT ["java","-jar","/spring-cloud-open-telemetry.jar"]

29
spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
View File

@ -62,12 +62,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.opentelemetry</groupId> <groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp-trace</artifactId> <artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency> <version>${otel-exporter-otlp.version}</version>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-okhttp</artifactId>
<version>${grpc-okhttp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
@ -93,24 +89,11 @@
</plugins> </plugins>
</build> </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> <properties>
<spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version> <spring-boot-dependencies.version>2.7.9</spring-boot-dependencies.version>
<release.train.version>2020.0.4</release.train.version> <release.train.version>2021.0.5</release.train.version>
<spring-cloud-sleuth-otel.version>1.0.0-M12</spring-cloud-sleuth-otel.version> <spring-cloud-sleuth-otel.version>1.1.2</spring-cloud-sleuth-otel.version>
<grpc-okhttp.version>1.42.1</grpc-okhttp.version> <otel-exporter-otlp.version>1.23.1</otel-exporter-otlp.version>
</properties> </properties>
</project> </project>

29
spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
View File

@ -61,12 +61,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.opentelemetry</groupId> <groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp-trace</artifactId> <artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency> <version>${otel-exporter-otlp.version}</version>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-okhttp</artifactId>
<version>${grpc-okhttp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
@ -92,24 +88,11 @@
</plugins> </plugins>
</build> </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> <properties>
<spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version> <spring-boot-dependencies.version>2.7.9</spring-boot-dependencies.version>
<release.train.version>2020.0.4</release.train.version> <release.train.version>2021.0.5</release.train.version>
<spring-cloud-sleuth-otel.version>1.0.0-M12</spring-cloud-sleuth-otel.version> <spring-cloud-sleuth-otel.version>1.1.2</spring-cloud-sleuth-otel.version>
<grpc-okhttp.version>1.42.1</grpc-okhttp.version> <otel-exporter-otlp.version>1.23.1</otel-exporter-otlp.version>
</properties> </properties>
</project> </project>