Skip to content

Conversation

@aws-application-signals-bot
Copy link
Collaborator

This PR prepares the main branch for the next development cycle by updating the version to 2.20.0-SNAPSHOT and updating the image version to be scanned to the latest released.

This PR should only be merge when release for version v2.20.0 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.

This PR updates the version to 2.20.0.

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 <[email protected]>
*Issue #, if available:*

*Description of changes:*
The workflow `application-signals-e2e-test.yml` assumes the version
contains -SNAPSHOT. In release branches, we update `version.gradle.kts`
to drop the -SNAPSHOT suffix to prepare for the release, so
`upload-main-build` fails. See

https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18921541300/job/54022142576

This PR modifies the job to match any artifact with the name
`aws-opentelemetry-agent-*.jar`, with or without the SNAPSHOT suffix.

tested by manually triggering main build in this branch:
1. adotVersion = 2.20.0-SNAPSHOT:
https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18925772853/job/54034432606
`upload: ./aws-opentelemetry-agent-2.20.0-SNAPSHOT.jar to
s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar`
2. adotVersion = 2.20.0:
https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18927001060
`upload: ./aws-opentelemetry-agent-2.20.0.jar to
s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar`

Both runs are successful.

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

*Issue #, if available:*

*Description of changes:*


By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
*Issue #, if available:*

*Description of changes:*
The 2.20.0 release build failed with at the step "Build and Publish
release with Gradle":

```
org.gradle.api.GradleException: version should not be set in build file when using nebula-release plugin. Instead use `-Prelease.version` parameter
```

The following PR fixes version.gradle.kts to not touch project.version
at all if the `-Prelease.version` flag is passed in to an environment.
It also creates a copy of the release build workflow that only re-runs
the failed Sonatype step in publish-sdk (did 2PR with @jj22ee to
confirm).

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
*Issue #, if available:*

*Description of changes:*
In #1255, after making a fix to the version file, we re-ran the workflow
with the already-successful "Build and push image" step commented out.
This PR uncomments the step again for future patch releases on the
v2.20.x branch.

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
@aws-application-signals-bot aws-application-signals-bot requested a review from a team as a code owner November 18, 2025 18:55
@lukeina2z lukeina2z merged commit 2bde6be into main Nov 18, 2025
7 checks passed
@lukeina2z lukeina2z deleted the prepare-main-for-next-dev-cycle-2.20.0 branch November 18, 2025 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants