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: 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 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 @@ io.opentelemetry - opentelemetry-exporter-otlp-trace - - - io.grpc - grpc-okhttp - ${grpc-okhttp.version} + opentelemetry-exporter-otlp + ${otel-exporter-otlp.version} org.junit.jupiter @@ -93,24 +89,11 @@ - - - spring-milestones - https://repo.spring.io/milestone - - - - - spring-milestones - https://repo.spring.io/milestone - - - - 2.5.7 - 2020.0.4 - 1.0.0-M12 - 1.42.1 + 2.7.9 + 2021.0.5 + 1.1.2 + 1.23.1 \ 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 @@ io.opentelemetry - opentelemetry-exporter-otlp-trace - - - io.grpc - grpc-okhttp - ${grpc-okhttp.version} + opentelemetry-exporter-otlp + ${otel-exporter-otlp.version} org.junit.jupiter @@ -92,24 +88,11 @@ - - - spring-milestones - https://repo.spring.io/milestone - - - - - spring-milestones - https://repo.spring.io/milestone - - - - 2.5.7 - 2020.0.4 - 1.0.0-M12 - 1.42.1 + 2.7.9 + 2021.0.5 + 1.1.2 + 1.23.1 \ No newline at end of file