diff --git a/CHANGELOG.md b/CHANGELOG.md index 36033f5b7b..0fcd0ea666 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ the release. ([#1670](https://github.com/open-telemetry/opentelemetry-demo/pull/1670)) * [otel-col] Add host metrics receiver ([#1675](https://github.com/open-telemetry/opentelemetry-demo/pull/1675)) +* [adservice] bump dependencies & gradle version + ([#1681](https://github.com/open-telemetry/opentelemetry-demo/pull/1681)) ## 1.11.0 diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile index a13d2b7736..97c2ebd1ed 100644 --- a/src/adservice/Dockerfile +++ b/src/adservice/Dockerfile @@ -20,7 +20,7 @@ RUN ./gradlew installDist -PprotoSourceDir=./proto FROM eclipse-temurin:21-jre -ARG version=2.3.0 +ARG version=2.6.0 WORKDIR /usr/src/app/ COPY --from=builder /usr/src/app/ ./ diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle index 97193e9ac2..3fe9cb7681 100644 --- a/src/adservice/build.gradle +++ b/src/adservice/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.github.sherter.google-java-format' version '0.9' id 'idea' id 'application' - id 'com.github.ben-manes.versions' version '0.49.0' + id 'com.github.ben-manes.versions' version '0.51.0' } repositories { @@ -16,11 +16,11 @@ description = 'Ad Service' group = "adservice" version = "0.1.0-SNAPSHOT" -def opentelemetryVersion = "1.38.0" -def opentelemetryInstrumentationVersion = "2.4.0" -def grpcVersion = "1.59.0" -def jacksonVersion = "2.15.3" -def protocVersion = "3.25.0" +def opentelemetryVersion = "1.40.0" +def opentelemetryInstrumentationVersion = "2.6.0" +def grpcVersion = "1.65.1" +def jacksonVersion = "2.17.2" +def protocVersion = "3.25.3" tasks.withType(JavaCompile).configureEach { sourceCompatibility = JavaVersion.VERSION_21 @@ -40,7 +40,7 @@ dependencies { implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}") implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${opentelemetryInstrumentationVersion}") - implementation "com.google.api.grpc:proto-google-common-protos:2.28.0", + implementation "com.google.api.grpc:proto-google-common-protos:2.41.0", "javax.annotation:javax.annotation-api:1.3.2", "io.grpc:grpc-protobuf:${grpcVersion}", "io.grpc:grpc-stub:${grpcVersion}", @@ -49,13 +49,13 @@ dependencies { "io.opentelemetry:opentelemetry-api", "io.opentelemetry:opentelemetry-sdk", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations", - "org.apache.logging.log4j:log4j-core:2.21.1", - "dev.openfeature.contrib.providers:flagd:0.7.0", - 'dev.openfeature:sdk:1.7.4' + "org.apache.logging.log4j:log4j-core:2.23.1", + "dev.openfeature.contrib.providers:flagd:0.8.4", + 'dev.openfeature:sdk:1.9.0' runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}", "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}", - "io.netty:netty-tcnative-boringssl-static:2.0.62.Final" + "io.netty:netty-tcnative-boringssl-static:2.0.65.Final" } } diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.jar b/src/adservice/gradle/wrapper/gradle-wrapper.jar index 033e24c4cd..d64cd49177 100644 Binary files a/src/adservice/gradle/wrapper/gradle-wrapper.jar and b/src/adservice/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.properties b/src/adservice/gradle/wrapper/gradle-wrapper.properties index 1af9e0930b..09523c0e54 100644 --- a/src/adservice/gradle/wrapper/gradle-wrapper.properties +++ b/src/adservice/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/adservice/gradlew b/src/adservice/gradlew index fcb6fca147..1aa94a4269 100755 --- a/src/adservice/gradlew +++ b/src/adservice/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/adservice/src/main/resources/log4j2.xml b/src/adservice/src/main/resources/log4j2.xml index 470129edec..db5cb39e96 100644 --- a/src/adservice/src/main/resources/log4j2.xml +++ b/src/adservice/src/main/resources/log4j2.xml @@ -1,32 +1,18 @@ - - - - - - - - - - - - - + + + + + + + + + +