Skip to content

Commit 6e7ab4a

Browse files
aws-application-signals-botgithub-actionssrprashezhang6811wangzlei
authored
Post release 2.26.2: Update version to 2.26.2-SNAPSHOT (#1373)
This PR prepares the main branch for the next development cycle by updating the version to 2.26.2-SNAPSHOT and updating the image version to be scanned to the latest released. This PR should only be merge when release for version v2.26.2 is success. By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Prashant Srivastava <50466688+srprash@users.noreply.github.com> Co-authored-by: Eric Zhang <eric.zhang6811@gmail.com> Co-authored-by: Eric Zhang <zhaez@amazon.com> Co-authored-by: Lei Wang <66336933+wangzlei@users.noreply.github.com>
1 parent 9463913 commit 6e7ab4a

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/daily-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
id: high_scan_v2
9595
uses: ./.github/actions/image_scan
9696
with:
97-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.26.1"
97+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.26.2"
9898
severity: 'CRITICAL,HIGH'
9999
logout: 'false'
100100
trivyignore-file: .github/trivy/daily-scan.trivyignore.yaml
@@ -104,7 +104,7 @@ jobs:
104104
id: low_scan_v2
105105
uses: ./.github/actions/image_scan
106106
with:
107-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.26.1"
107+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.26.2"
108108
severity: 'MEDIUM,LOW,UNKNOWN'
109109
logout: 'false'
110110
trivyignore-file: .github/trivy/daily-scan.trivyignore.yaml

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
1515

1616
- Bump Netty to 4.1.133.Final to fix CVE-2026-41417
1717
([#1374](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1374))
18+
- Support environment-configured endpoint visibility for HTTP operation names
19+
([#1352](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1352))
20+
21+
## v2.26.2 - 2026-04-20
22+
1823
- Support environment-configured endpoint visibility for HTTP operation names
1924
([#1352](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1352))
2025
- Bump Netty to 4.1.132.Final to fix CVE-2026-33870 and CVE-2026-33871

version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
val adotVersion = "2.26.1-SNAPSHOT"
16+
val adotVersion = "2.26.2-SNAPSHOT"
1717

1818
allprojects {
1919
if (!project.hasProperty("release.version")) {

0 commit comments

Comments
 (0)