Skip to content

Commit 1681a5e

Browse files
harrryrharrryr
authored
Merge branch 'main' into add-checksum
2 parents e576d4d + 448d680 commit 1681a5e

File tree

104 files changed

+9186
-1362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+9186
-1362
lines changed

‎.github/patches/opentelemetry-java-instrumentation.patch‎

Lines changed: 213 additions & 918 deletions
Large diffs are not rendered by default.

‎.github/patches/versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.1
1+
OTEL_JAVA_INSTRUMENTATION_VERSION=v1.33.6

‎.github/workflows/main-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
fetch-depth: 0
195195
- uses: actions/setup-java@v4
196196
with:
197-
java-version: 17
197+
java-version: 21
198198
distribution: 'temurin'
199199
- uses: gradle/wrapper-validation-action@v1
200200

@@ -219,7 +219,7 @@ jobs:
219219
key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
220220

221221
- name: Pull base image of Contract Tests Sample Apps
222-
run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
222+
run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
223223

224224
- name: Build snapshot with Gradle
225225
uses: gradle/gradle-build-action@v3

‎.github/workflows/nightly-upstream-snapshot-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
fetch-depth: 0
121121
- uses: actions/setup-java@v4
122122
with:
123-
java-version: 17
123+
java-version: 21
124124
distribution: 'temurin'
125125
- uses: gradle/wrapper-validation-action@v1
126126

@@ -136,7 +136,7 @@ jobs:
136136
registry: public.ecr.aws
137137

138138
- name: Pull base image of Contract Tests Sample Apps
139-
run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
139+
run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
140140

141141
- name: Build snapshot with Gradle
142142
uses: gradle/gradle-build-action@v3

‎.github/workflows/owasp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ jobs:
7777
id: high_scan
7878
uses: ./.github/actions/image_scan
7979
with:
80-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
80+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.6"
8181
severity: 'CRITICAL,HIGH'
8282

8383
- name: Perform low image scan
8484
if: always()
8585
id: low_scan
8686
uses: ./.github/actions/image_scan
8787
with:
88-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
88+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.6"
8989
severity: 'MEDIUM,LOW,UNKNOWN'
9090

9191
- name: Configure AWS Credentials for emitting metrics

‎.github/workflows/pr-build.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,28 @@ jobs:
8181
with:
8282
arguments: build integrationTests --stacktrace -PenableCoverage=true -PlocalDocker=true
8383

84+
- name: Set up Java version for tests
85+
uses: actions/setup-java@v4
86+
with:
87+
java-version: 21
88+
distribution: temurin
89+
8490
- name: Pull base image of Contract Tests Sample Apps
8591
if: ${{ matrix.os == 'ubuntu-latest' }}
86-
run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
92+
run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
8793

8894
- name: Run contract tests
8995
uses: gradle/gradle-build-action@v3
9096
if: ${{ matrix.os == 'ubuntu-latest' }}
9197
with:
9298
arguments: contractTests -PlocalDocker=true -i
9399

100+
- name: Set up Java version for image build
101+
uses: actions/setup-java@v4
102+
with:
103+
java-version: 17
104+
distribution: temurin
105+
94106
- name: Get current version
95107
if: ${{ matrix.os == 'ubuntu-latest' }}
96108
shell: bash

‎appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v1/AwsSdkV1Test.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -246,35 +246,35 @@ void testBedrockAgentDataSourceId() {
246246
doTestBedrockAgentDataSourceId();
247247
}
248248

249-
@Test
250-
void testBedrockRuntimeAmazonTitan() {
251-
doTestBedrockRuntimeAmazonTitan();
252-
}
253-
254-
@Test
255-
void testBedrockRuntimeAi21Jamba() {
256-
doTestBedrockRuntimeAi21Jamba();
257-
}
258-
259-
@Test
260-
void testBedrockRuntimeAnthropicClaude() {
261-
doTestBedrockRuntimeAnthropicClaude();
262-
}
263-
264-
@Test
265-
void testBedrockRuntimeCohereCommandR() {
266-
doTestBedrockRuntimeCohereCommandR();
267-
}
268-
269-
@Test
270-
void testBedrockRuntimeMetaLlama() {
271-
doTestBedrockRuntimeMetaLlama();
272-
}
273-
274-
@Test
275-
void testBedrockRuntimeMistral() {
276-
doTestBedrockRuntimeMistral();
277-
}
249+
// @Test
250+
// void testBedrockRuntimeAmazonTitan() {
251+
// doTestBedrockRuntimeAmazonTitan();
252+
// }
253+
//
254+
// @Test
255+
// void testBedrockRuntimeAi21Jamba() {
256+
// doTestBedrockRuntimeAi21Jamba();
257+
// }
258+
//
259+
// @Test
260+
// void testBedrockRuntimeAnthropicClaude() {
261+
// doTestBedrockRuntimeAnthropicClaude();
262+
// }
263+
//
264+
// @Test
265+
// void testBedrockRuntimeCohereCommandR() {
266+
// doTestBedrockRuntimeCohereCommandR();
267+
// }
268+
//
269+
// @Test
270+
// void testBedrockRuntimeMetaLlama() {
271+
// doTestBedrockRuntimeMetaLlama();
272+
// }
273+
//
274+
// @Test
275+
// void testBedrockRuntimeMistral() {
276+
// doTestBedrockRuntimeMistral();
277+
// }
278278

279279
@Test
280280
void testBedrockGuardrailId() {

‎appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v2/AwsSdkV2Test.java‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -249,35 +249,35 @@ void testBedrockAgentDataSourceId() {
249249
doTestBedrockAgentDataSourceId();
250250
}
251251

252-
@Test
253-
void testBedrockRuntimeAmazonTitan() {
254-
doTestBedrockRuntimeAmazonTitan();
255-
}
256-
257-
@Test
258-
void testBedrockRuntimeAi21Jamba() {
259-
doTestBedrockRuntimeAi21Jamba();
260-
}
261-
262-
@Test
263-
void testBedrockRuntimeAnthropicClaude() {
264-
doTestBedrockRuntimeAnthropicClaude();
265-
}
266-
267-
@Test
268-
void testBedrockRuntimeCohereCommandR() {
269-
doTestBedrockRuntimeCohereCommandR();
270-
}
271-
272-
@Test
273-
void testBedrockRuntimeMetaLlama() {
274-
doTestBedrockRuntimeMetaLlama();
275-
}
276-
277-
@Test
278-
void testBedrockRuntimeMistral() {
279-
doTestBedrockRuntimeMistral();
280-
}
252+
// @Test
253+
// void testBedrockRuntimeAmazonTitan() {
254+
// doTestBedrockRuntimeAmazonTitan();
255+
// }
256+
//
257+
// @Test
258+
// void testBedrockRuntimeAi21Jamba() {
259+
// doTestBedrockRuntimeAi21Jamba();
260+
// }
261+
//
262+
// @Test
263+
// void testBedrockRuntimeAnthropicClaude() {
264+
// doTestBedrockRuntimeAnthropicClaude();
265+
// }
266+
//
267+
// @Test
268+
// void testBedrockRuntimeCohereCommandR() {
269+
// doTestBedrockRuntimeCohereCommandR();
270+
// }
271+
//
272+
// @Test
273+
// void testBedrockRuntimeMetaLlama() {
274+
// doTestBedrockRuntimeMetaLlama();
275+
// }
276+
//
277+
// @Test
278+
// void testBedrockRuntimeMistral() {
279+
// doTestBedrockRuntimeMistral();
280+
// }
281281

282282
@Test
283283
void testBedrockGuardrailId() {
@@ -289,10 +289,10 @@ void testBedrockAgentRuntimeAgentId() {
289289
doTestBedrockAgentRuntimeAgentId();
290290
}
291291

292-
@Test
293-
void testBedrockAgentRuntimeKnowledgeBaseId() {
294-
doTestBedrockAgentRuntimeKnowledgeBaseId();
295-
}
292+
// @Test
293+
// void testBedrockAgentRuntimeKnowledgeBaseId() {
294+
// doTestBedrockAgentRuntimeKnowledgeBaseId();
295+
// }
296296

297297
@Test
298298
void testSecretsManagerDescribeSecret() throws Exception {

‎appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ tasks {
5757
}
5858
jib {
5959
configureImages(
60-
"public.ecr.aws/docker/library/amazoncorretto:17-alpine",
60+
"public.ecr.aws/docker/library/amazoncorretto:21-alpine",
6161
"aws-appsignals-tests-aws-sdk-v1",
6262
localDocker = rootProject.property("localDocker")!! == "true",
6363
multiPlatform = false,

‎appsignals-tests/images/aws-sdk/aws-sdk-v2/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ tasks {
5757
}
5858
jib {
5959
configureImages(
60-
"public.ecr.aws/docker/library/amazoncorretto:17-alpine",
60+
"public.ecr.aws/docker/library/amazoncorretto:21-alpine",
6161
"aws-appsignals-tests-aws-sdk-v2",
6262
localDocker = rootProject.property("localDocker")!! == "true",
6363
multiPlatform = false,

0 commit comments

Comments
 (0)