diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 024cef746b..6fdbea53fb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin - name: Cache local Maven repository diff --git a/.github/workflows/docker-build-smoke-tests-fake-backend.yml b/.github/workflows/docker-build-smoke-tests-fake-backend.yml index 5cd5f2956c..b9b04543c6 100644 --- a/.github/workflows/docker-build-smoke-tests-fake-backend.yml +++ b/.github/workflows/docker-build-smoke-tests-fake-backend.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - uses: gradle/wrapper-validation-action@v1 - name: Configure AWS Credentials diff --git a/.github/workflows/e2e-tests-app-with-java-agent.yml b/.github/workflows/e2e-tests-app-with-java-agent.yml index b2c4d744bf..d8e5956646 100644 --- a/.github/workflows/e2e-tests-app-with-java-agent.yml +++ b/.github/workflows/e2e-tests-app-with-java-agent.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin # cache local patch outputs @@ -83,7 +83,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -114,7 +114,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -145,7 +145,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/e2e-tests-with-operator.yml b/.github/workflows/e2e-tests-with-operator.yml index ffacf0c74c..461757f21c 100644 --- a/.github/workflows/e2e-tests-with-operator.yml +++ b/.github/workflows/e2e-tests-with-operator.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin # cache local patch outputs diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 8248c3d26f..f136e0c3db 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -4,6 +4,7 @@ on: branches: - main - "release/v*" + - version-upgrade-v1 env: AWS_DEFAULT_REGION: us-east-1 STAGING_ECR_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com @@ -25,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin # vaadin 14 tests fail with node 18 - name: Set up Node @@ -59,7 +60,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin # cache local patch outputs @@ -194,7 +195,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - uses: gradle/wrapper-validation-action@v1 diff --git a/.github/workflows/nightly-upstream-snapshot-build.yml b/.github/workflows/nightly-upstream-snapshot-build.yml index ec7c607354..2f86e91a7e 100644 --- a/.github/workflows/nightly-upstream-snapshot-build.yml +++ b/.github/workflows/nightly-upstream-snapshot-build.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - uses: gradle/wrapper-validation-action@v1 @@ -120,7 +120,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - uses: gradle/wrapper-validation-action@v1 diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml index fc7a030473..ce48e9fdfd 100644 --- a/.github/workflows/owasp.yml +++ b/.github/workflows/owasp.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Java for dependency scan uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: Configure AWS credentials for dependency scan diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml index c56255204e..f508a861b0 100644 --- a/.github/workflows/patch-release-build.yml +++ b/.github/workflows/patch-release-build.yml @@ -63,7 +63,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 38989dc65c..3187b28571 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -8,35 +8,35 @@ env: TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test jobs: - testpatch: - name: Test patches applied to dependencies - runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - # vaadin 14 tests fail with node 18 - - name: Set up Node - uses: actions/setup-node@v4 - with: - node-version: 16 - - # vaadin tests use pnpm - - name: Cache pnpm modules - uses: actions/cache@v3 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-test-cache-pnpm-modules - - - uses: gradle/wrapper-validation-action@v1 - - - uses: ./.github/actions/patch-dependencies - with: - run_tests: "true" - +# testpatch: +# name: Test patches applied to dependencies +# runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core +# steps: +# - uses: actions/checkout@v4 +# +# - uses: actions/setup-java@v4 +# with: +# java-version: 21 +# distribution: temurin +# # vaadin 14 tests fail with node 18 +# - name: Set up Node +# uses: actions/setup-node@v4 +# with: +# node-version: 16 +# +# # vaadin tests use pnpm +# - name: Cache pnpm modules +# uses: actions/cache@v3 +# with: +# path: ~/.pnpm-store +# key: ${{ runner.os }}-test-cache-pnpm-modules +# +# - uses: gradle/wrapper-validation-action@v1 +# +# - uses: ./.github/actions/patch-dependencies +# with: +# run_tests: "true" +# build: name: Build on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -58,7 +58,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin - uses: gradle/wrapper-validation-action@v1 @@ -71,9 +71,9 @@ jobs: ~/.m2/repository/io/opentelemetry/ key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }} - - name: Publish patched dependencies to maven local - uses: ./.github/actions/patch-dependencies - if: ${{ matrix.os != 'windows-latest' }} # Skip patch on windows as it is not possible to build opentelemetry-java on windows +# - name: Publish patched dependencies to maven local +# uses: ./.github/actions/patch-dependencies +# if: ${{ matrix.os != 'windows-latest' }} # Skip patch on windows as it is not possible to build opentelemetry-java on windows - name: Build with Gradle with Integration tests uses: gradle/gradle-build-action@v3 diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 5ddb016af7..e74eaf6a92 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - uses: gradle/wrapper-validation-action@v1 diff --git a/appsignals-tests/contract-tests/build.gradle.kts b/appsignals-tests/contract-tests/build.gradle.kts index 70780d767c..a57b2ebea1 100644 --- a/appsignals-tests/contract-tests/build.gradle.kts +++ b/appsignals-tests/contract-tests/build.gradle.kts @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { java - kotlin("jvm") version "1.8.22" + kotlin("jvm") version "2.1.0-RC2" } java { @@ -98,8 +98,8 @@ tasks { dependsOn(":appsignals-tests:images:http-clients:spring-mvc-client:jibDockerBuild") dependsOn(":appsignals-tests:images:http-clients:apache-http-client:jibDockerBuild") dependsOn(":appsignals-tests:images:http-clients:netty-http-client:jibDockerBuild") - dependsOn(":appsignals-tests:images:aws-sdk:aws-sdk-v1:jibDockerBuild") - dependsOn(":appsignals-tests:images:aws-sdk:aws-sdk-v2:jibDockerBuild") +// dependsOn(":appsignals-tests:images:aws-sdk:aws-sdk-v1:jibDockerBuild") +// dependsOn(":appsignals-tests:images:aws-sdk:aws-sdk-v2:jibDockerBuild") dependsOn(":appsignals-tests:images:grpc:grpc-client:jibDockerBuild") dependsOn(":appsignals-tests:images:grpc:grpc-server:jibDockerBuild") dependsOn(":appsignals-tests:images:jdbc:jibDockerBuild") diff --git a/appsignals-tests/images/grpc/grpc-base/build.gradle.kts b/appsignals-tests/images/grpc/grpc-base/build.gradle.kts index b945d29474..a2f441eec2 100644 --- a/appsignals-tests/images/grpc/grpc-base/build.gradle.kts +++ b/appsignals-tests/images/grpc/grpc-base/build.gradle.kts @@ -18,6 +18,11 @@ plugins { id("com.google.protobuf") version "0.9.4" } +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + group = "software.amazon.opentelemetry" dependencies { diff --git a/awsagentprovider/build.gradle.kts b/awsagentprovider/build.gradle.kts index e052e5eb47..3d3b76a15b 100644 --- a/awsagentprovider/build.gradle.kts +++ b/awsagentprovider/build.gradle.kts @@ -51,8 +51,8 @@ dependencies { testRuntimeOnly("io.opentelemetry:opentelemetry-exporter-otlp-common") compileOnly("com.google.code.findbugs:jsr305:3.0.2") - testImplementation("org.mockito:mockito-core:5.3.1") - testImplementation("org.mockito:mockito-junit-jupiter:5.8.0") + testImplementation("org.mockito:mockito-core:5.14.2") + testImplementation("org.mockito:mockito-junit-jupiter:5.14.2") } tasks { diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java index 1494b30c98..2a1cea7106 100644 --- a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java +++ b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java @@ -129,7 +129,9 @@ private SpanData buildSpanDataMock() { when(mockSpanData.getParentSpanContext()).thenReturn(parentSpanContextMock); SpanContext spanContextMock = mock(SpanContext.class); + TraceFlags spanContextTraceFlagsMock = mock(TraceFlags.class); when(spanContextMock.isValid()).thenReturn(true); + when(spanContextMock.getTraceFlags()).thenReturn(spanContextTraceFlagsMock); when(mockSpanData.getSpanContext()).thenReturn(spanContextMock); TraceState traceState = TraceState.builder().build(); diff --git a/build.gradle.kts b/build.gradle.kts index ed2ff0c9d3..d4660c8158 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,8 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat plugins { java + kotlin("jvm") version "2.1.0-RC2" +// id("com.diffplug.spotless") version "6.25.0" id("com.diffplug.spotless") id("com.github.jk1.dependency-license-report") id("io.github.gradle-nexus.publish-plugin") @@ -68,7 +70,7 @@ allprojects { spotless { kotlinGradle { - ktlint("0.48.0").userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2")) + ktlint("1.4.0").editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2")) // Doesn't support pluginManagement block targetExclude("settings.gradle.kts") @@ -81,8 +83,8 @@ allprojects { plugins.withId("java") { java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 withJavadocJar() withSourcesJar() diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 590ea7f35f..f5da7c299a 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -24,16 +24,16 @@ plugins { data class DependencySet(val group: String, val version: String, val modules: List) -val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true" +val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true" // This is the version of the upstream instrumentation BOM -val otelVersion = "1.32.1-adot2" -val otelSnapshotVersion = "1.33.0" -val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT" -val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT" +val otelVersion = "1.33.6" +val otelSnapshotVersion = "1.33.6" +val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT" +val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT" // All versions below are only used in testing and do not affect the released artifact. -val DEPENDENCY_BOMS = listOf( +val dependencyBoms = listOf( "com.amazonaws:aws-java-sdk-bom:1.12.599", "com.fasterxml.jackson:jackson-bom:2.16.0", "com.google.guava:guava-bom:33.0.0-jre", @@ -48,7 +48,7 @@ val DEPENDENCY_BOMS = listOf( "software.amazon.awssdk:bom:2.21.33", ) -val DEPENDENCY_SETS = listOf( +val dependencySets = listOf( DependencySet( "org.assertj", "3.24.2", @@ -69,14 +69,15 @@ val DEPENDENCY_SETS = listOf( ), ) -val DEPENDENCIES = listOf( +val dependencyLists = listOf( "commons-logging:commons-logging:1.2", "com.sparkjava:spark-core:2.9.4", "com.squareup.okhttp3:okhttp:4.12.0", - "io.opentelemetry.contrib:opentelemetry-aws-xray:1.32.0", - "io.opentelemetry.contrib:opentelemetry-aws-resources:1.32.0-alpha", + "io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0", + "io.opentelemetry.contrib:opentelemetry-aws-resources:1.39.0-alpha", "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha", "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion", + "io.opentelemetry:opentelemetry-extension-aws:1.20.1", "net.bytebuddy:byte-buddy:1.14.10", ) @@ -85,17 +86,17 @@ javaPlatform { } dependencies { - for (bom in DEPENDENCY_BOMS) { + for (bom in dependencyBoms) { api(platform(bom)) } constraints { - for (set in DEPENDENCY_SETS) { + for (set in dependencySets) { for (module in set.modules) { api("${set.group}:$module:${set.version}") } } - for (dependency in DEPENDENCIES) { + for (dependency in dependencyLists) { api(dependency) } } @@ -104,7 +105,7 @@ dependencies { rootProject.allprojects { plugins.withId("com.github.jk1.dependency-license-report") { configure { - val bomExcludes = DEPENDENCY_BOMS.stream() + val bomExcludes = dependencyBoms.stream() .map { it.substring(0, it.lastIndexOf(':')) } .toArray { length -> arrayOfNulls(length) } excludes = bomExcludes diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3..a4b76b9530 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c9..9355b41557 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1339..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbde..9d21a21834 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/instrumentation/log4j-2.13.2/build.gradle.kts b/instrumentation/log4j-2.13.2/build.gradle.kts index a6c273ac66..78060403ab 100644 --- a/instrumentation/log4j-2.13.2/build.gradle.kts +++ b/instrumentation/log4j-2.13.2/build.gradle.kts @@ -21,8 +21,8 @@ plugins { base.archivesBaseName = "aws-instrumentation-log4j-2.13.2" dependencies { - compileOnly("io.opentelemetry:opentelemetry-api") - compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") + compileOnly("io.opentelemetry:opentelemetry-api:1.44.1") + compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:2.10.0-alpha") compileOnly("net.bytebuddy:byte-buddy") compileOnly("org.apache.logging.log4j:log4j-core:2.22.1") diff --git a/instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java b/instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java index 13152b569d..3ffb46c427 100644 --- a/instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java +++ b/instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java @@ -79,14 +79,19 @@ public static void onExit( SpanContext spanContext = Java8BytecodeBridge.spanFromContext(context).getSpanContext(); + // Using StringBuilder instead of + for string concatenation avoids generating invokedynamic + // instructions introduced in Java 9+, ensuring compatibility with Java 6 class files. + // This approach explicitly constructs the string, producing bytecode compatible with older + // versions. if (spanContext.isValid()) { - String value = - "1-" - + spanContext.getTraceId().substring(0, 8) - + "-" - + spanContext.getTraceId().substring(8) - + "@" - + spanContext.getSpanId(); + StringBuilder valueBuilder = new StringBuilder("1-"); + valueBuilder + .append(spanContext.getTraceId().substring(0, 8)) + .append("-") + .append(spanContext.getTraceId().substring(8)) + .append("@") + .append(spanContext.getSpanId()); + String value = valueBuilder.toString(); spanContextData.put(TRACE_ID_KEY, value); } diff --git a/otelagent/build.gradle.kts b/otelagent/build.gradle.kts index 2027a56bbf..2c614f882b 100644 --- a/otelagent/build.gradle.kts +++ b/otelagent/build.gradle.kts @@ -25,8 +25,8 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } base { @@ -136,8 +136,8 @@ tasks { jib { configureImages( - "gcr.io/distroless/java17-debian11:debug", - "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha", + "gcr.io/distroless/java21-debian12:debug", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha", localDocker = false, multiPlatform = !rootProject.property("localDocker")!!.equals("true"), ) @@ -145,9 +145,10 @@ jib { container { appRoot = "/aws-observability" setEntrypoint("INHERIT") - environment = mapOf( - "JAVA_TOOL_OPTIONS" to "-javaagent:/aws-observability/classpath/aws-opentelemetry-agent-$version.jar", - ) + environment = + mapOf( + "JAVA_TOOL_OPTIONS" to "-javaagent:/aws-observability/classpath/aws-opentelemetry-agent-$version.jar", + ) } containerizingMode = "packaged" } diff --git a/sample-apps/spark-awssdkv1/build.gradle.kts b/sample-apps/spark-awssdkv1/build.gradle.kts index 5139528a60..3418e6c394 100644 --- a/sample-apps/spark-awssdkv1/build.gradle.kts +++ b/sample-apps/spark-awssdkv1/build.gradle.kts @@ -22,8 +22,8 @@ application { jib { configureImages( - "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha", - "public.ecr.aws/aws-otel-test/aws-otel-java-spark-awssdkv1", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark-awssdkv1", localDocker = rootProject.property("localDocker")!!.equals("true"), multiPlatform = !rootProject.property("localDocker")!!.equals("true"), tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"), diff --git a/sample-apps/spark/build.gradle.kts b/sample-apps/spark/build.gradle.kts index 47ee944a4f..2dba0278d5 100644 --- a/sample-apps/spark/build.gradle.kts +++ b/sample-apps/spark/build.gradle.kts @@ -28,8 +28,8 @@ application { jib { configureImages( - "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha", - "public.ecr.aws/aws-otel-test/aws-otel-java-spark", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark", localDocker = rootProject.property("localDocker")!!.equals("true"), multiPlatform = !rootProject.property("localDocker")!!.equals("true"), tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"), @@ -37,9 +37,10 @@ jib { container { appRoot = "/aws-observability" - environment = mapOf( - "OTEL_LOGS_EXPORTER" to "otlp", - ) + environment = + mapOf( + "OTEL_LOGS_EXPORTER" to "otlp", + ) } } diff --git a/sample-apps/springboot/build.gradle.kts b/sample-apps/springboot/build.gradle.kts index d06f816ce2..882d446c10 100644 --- a/sample-apps/springboot/build.gradle.kts +++ b/sample-apps/springboot/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { jib { configureImages( - "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha", - "public.ecr.aws/aws-otel-test/aws-otel-java-springboot", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-springboot", rootProject.property("localDocker")!!.equals("true"), !rootProject.property("localDocker")!!.equals("true"), tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"), diff --git a/settings.gradle.kts b/settings.gradle.kts index f4ec99f115..ea23e0b64f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ pluginManagement { plugins { - id("com.diffplug.spotless") version "6.22.0" + id("com.diffplug.spotless") version "6.25.0" id("com.github.ben-manes.versions") version "0.50.0" id("com.github.jk1.dependency-license-report") version "2.5" id("com.github.johnrengelman.shadow") version "8.1.1" @@ -62,9 +62,9 @@ include("appsignals-tests:images:http-clients:native-http-client") include("appsignals-tests:images:http-clients:spring-mvc-client") include("appsignals-tests:images:http-clients:apache-http-client") include("appsignals-tests:images:http-clients:netty-http-client") -include("appsignals-tests:images:aws-sdk:aws-sdk-base") -include("appsignals-tests:images:aws-sdk:aws-sdk-v1") -include("appsignals-tests:images:aws-sdk:aws-sdk-v2") +//include("appsignals-tests:images:aws-sdk:aws-sdk-base") +//include("appsignals-tests:images:aws-sdk:aws-sdk-v1") +//include("appsignals-tests:images:aws-sdk:aws-sdk-v2") include("appsignals-tests:images:grpc:grpc-base") include("appsignals-tests:images:grpc:grpc-server") include("appsignals-tests:images:grpc:grpc-client") diff --git a/smoke-tests/fakebackend/build.gradle.kts b/smoke-tests/fakebackend/build.gradle.kts index 7f1365027b..6a08fefa32 100644 --- a/smoke-tests/fakebackend/build.gradle.kts +++ b/smoke-tests/fakebackend/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { jib { to { - image = "public.ecr.aws/u0d6r4y4/aws-otel-java-test-fakebackend:alpha" + image = "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-test-fakebackend:alpha" } from { image = "gcr.io/distroless/java17-debian11:debug" diff --git a/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/LogInjectionTest.java b/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/LogInjectionTest.java index e6058a6053..0e64f921af 100644 --- a/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/LogInjectionTest.java +++ b/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/LogInjectionTest.java @@ -40,7 +40,7 @@ class LogInjectionTest { @Container private static final GenericContainer log4jApp = - new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest") + new GenericContainer<>("public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark:latest") .withExposedPorts(4567) .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("log4j"))) .withLogConsumer(log4jString) @@ -54,7 +54,8 @@ class LogInjectionTest { @Container private static final GenericContainer logbackApp = - new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-springboot:latest") + new GenericContainer<>( + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-springboot:latest") .withExposedPorts(8080) .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("logback"))) .withLogConsumer(logbackString) diff --git a/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java b/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java index b4740eb8d3..bed12f73b3 100644 --- a/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java +++ b/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java @@ -108,7 +108,7 @@ public ExportTraceServiceRequest deserialize( @Container private static final GenericContainer application = new GenericContainer<>( - "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:latest") + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot:latest") .dependsOn(backend) .withExposedPorts(8080) .withNetwork(network) @@ -124,7 +124,7 @@ public ExportTraceServiceRequest deserialize( @Container private static final GenericContainer applicationXraySampler = new GenericContainer<>( - "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:latest") + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot:latest") .dependsOn(backend) .withExposedPorts(8080) .withNetwork(network) diff --git a/smoke-tests/spring-boot/build.gradle.kts b/smoke-tests/spring-boot/build.gradle.kts index d58e020b4b..9f2028e85f 100644 --- a/smoke-tests/spring-boot/build.gradle.kts +++ b/smoke-tests/spring-boot/build.gradle.kts @@ -47,9 +47,9 @@ dependencies { jib { configureImages( - "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha", - "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot", - localDocker = rootProject.property("localDocker")!!.equals("true"), + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha", + "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot", + localDocker = false, multiPlatform = false, ) }