From d737a0b06846581aff5017f0ed0d68cb1c2ca46f Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Wed, 19 Jul 2023 14:05:54 -0400 Subject: [PATCH 1/2] update dependencies --- src/adservice/Dockerfile | 2 +- src/adservice/build.gradle | 17 ++++++------- .../gradle/wrapper/gradle-wrapper.properties | 5 ++-- .../src/main/java/oteldemo/AdService.java | 24 +++++++++---------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile index 0916232f7a..108f130469 100644 --- a/src/adservice/Dockerfile +++ b/src/adservice/Dockerfile @@ -20,7 +20,7 @@ RUN ./gradlew installDist -PprotoSourceDir=./proto FROM eclipse-temurin:17-jre -ARG version=1.24.0 +ARG version=1.28.0 WORKDIR /usr/src/app/ COPY --from=builder /usr/src/app/ ./ diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle index 8997ccdc8d..4caf44c265 100644 --- a/src/adservice/build.gradle +++ b/src/adservice/build.gradle @@ -1,9 +1,10 @@ plugins { - id 'com.google.protobuf' version '0.8.18' + id 'com.google.protobuf' version '0.9.4' id 'com.github.sherter.google-java-format' version '0.9' id 'idea' id 'application' + id 'com.github.ben-manes.versions' version '0.47.0' } repositories { @@ -15,10 +16,10 @@ description = 'Ad Service' group = "adservice" version = "0.1.0-SNAPSHOT" -def opentelemetryVersion = "1.19.0" -def opentelemetryInstrumentationAlphaVersion = "1.19.1-alpha" -def grpcVersion = "1.45.1" -def jacksonVersion = "2.13.2" +def opentelemetryVersion = "1.28.0" +def opentelemetryInstrumentationAlphaVersion = "1.28.0-alpha" +def grpcVersion = "1.56.1" +def jacksonVersion = "2.15.2" def protocVersion = "3.20.0" tasks.withType(JavaCompile) { @@ -38,7 +39,7 @@ dependencies { implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}") implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${opentelemetryInstrumentationAlphaVersion}") - implementation "com.google.api.grpc:proto-google-common-protos:2.8.0", + implementation "com.google.api.grpc:proto-google-common-protos:2.22.0", "javax.annotation:javax.annotation-api:1.3.2", "io.grpc:grpc-protobuf:${grpcVersion}", "io.grpc:grpc-stub:${grpcVersion}", @@ -47,11 +48,11 @@ dependencies { "io.opentelemetry:opentelemetry-api", "io.opentelemetry:opentelemetry-sdk", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations", - "org.apache.logging.log4j:log4j-core:2.17.2" + "org.apache.logging.log4j:log4j-core:3.0.0-alpha1" runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}", "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}", - "io.netty:netty-tcnative-boringssl-static:2.0.51.Final" + "io.netty:netty-tcnative-boringssl-static:2.0.61.Final" } } diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.properties b/src/adservice/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..165b5020b0 100644 --- a/src/adservice/gradle/wrapper/gradle-wrapper.properties +++ b/src/adservice/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Jul 19 11:27:42 EDT 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/src/adservice/src/main/java/oteldemo/AdService.java b/src/adservice/src/main/java/oteldemo/AdService.java index 549c84ffa6..b12cd58346 100644 --- a/src/adservice/src/main/java/oteldemo/AdService.java +++ b/src/adservice/src/main/java/oteldemo/AdService.java @@ -1,17 +1,12 @@ /* -* Copyright The OpenTelemetry Authors -* SPDX-License-Identifier: Apache-2.0 -*/ + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ package oteldemo; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Iterables; -import oteldemo.Demo.Ad; -import oteldemo.Demo.AdRequest; -import oteldemo.Demo.AdResponse; -import oteldemo.Demo.GetFlagResponse; -import oteldemo.FeatureFlagServiceGrpc.FeatureFlagServiceBlockingStub; import io.grpc.*; import io.grpc.health.v1.HealthCheckResponse.ServingStatus; import io.grpc.protobuf.services.*; @@ -36,6 +31,11 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import oteldemo.Demo.Ad; +import oteldemo.Demo.AdRequest; +import oteldemo.Demo.AdResponse; +import oteldemo.Demo.GetFlagResponse; +import oteldemo.FeatureFlagServiceGrpc.FeatureFlagServiceBlockingStub; public final class AdService { @@ -73,12 +73,12 @@ private void start() throws IOException { healthMgr = new HealthStatusManager(); String featureFlagServiceAddr = - Optional.ofNullable(System.getenv("FEATURE_FLAG_GRPC_SERVICE_ADDR")) - .orElse(""); + Optional.ofNullable(System.getenv("FEATURE_FLAG_GRPC_SERVICE_ADDR")).orElse(""); FeatureFlagServiceBlockingStub featureFlagServiceStub = null; if (!featureFlagServiceAddr.isEmpty()) { - featureFlagServiceStub = oteldemo.FeatureFlagServiceGrpc.newBlockingStub( - ManagedChannelBuilder.forTarget(featureFlagServiceAddr).usePlaintext().build()); + featureFlagServiceStub = + oteldemo.FeatureFlagServiceGrpc.newBlockingStub( + ManagedChannelBuilder.forTarget(featureFlagServiceAddr).usePlaintext().build()); } server = From 5c52a11581119d19b3f14b6be2f6d5c7d070238a Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Thu, 20 Jul 2023 08:38:12 +0200 Subject: [PATCH 2/2] Update log4j version --- src/adservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle index 4caf44c265..811efe79b3 100644 --- a/src/adservice/build.gradle +++ b/src/adservice/build.gradle @@ -48,7 +48,7 @@ dependencies { "io.opentelemetry:opentelemetry-api", "io.opentelemetry:opentelemetry-sdk", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations", - "org.apache.logging.log4j:log4j-core:3.0.0-alpha1" + "org.apache.logging.log4j:log4j-core:2.20.0" runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}", "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",