Skip to content

Commit 2b6f87b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into suppress-snapshot-updates
2 parents f5cf2bd + d1a65ae commit 2b6f87b

File tree

11 files changed

+37
-153
lines changed

11 files changed

+37
-153
lines changed

.github/workflows/auto-spotless-apply.yml

Lines changed: 0 additions & 94 deletions
This file was deleted.

.github/workflows/auto-spotless-check.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/workflows/build-common.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
run: ./gradlew build -x spotlessCheck -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
6060
env:
6161
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
62+
GITHUB_TOKEN: ${{ github.token }}
6263

6364
- name: Check for jApiCmp diffs
6465
# The jApiCmp diff compares current to latest, which isn't appropriate for release branches
@@ -123,6 +124,7 @@ jobs:
123124
${{ inputs.no-build-cache && '--no-build-cache' || '' }}
124125
env:
125126
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
127+
GITHUB_TOKEN: ${{ github.token }}
126128

127129
- name: Build scan
128130
if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ jobs:
4646
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
4747
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
4848
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
49+
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
run: ./gradlew assemble --no-build-cache --no-daemon
6666
env:
6767
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
68+
GITHUB_TOKEN: ${{ github.token }}
6869

6970
- name: Perform CodeQL analysis
7071
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ jobs:
3434
run: ./gradlew build -x test
3535
env:
3636
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
37+
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
101101
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
102102
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
103+
GITHUB_TOKEN: ${{ github.token }}
103104

104105
- name: Download artifacts from Maven Central (when already published)
105106
if: ${{ inputs.already-published }}
@@ -244,6 +245,7 @@ jobs:
244245
VERSION: ${{ needs.release.outputs.version }}
245246
PRIOR_VERSION: ${{ needs.release.outputs.prior-version }}
246247
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
248+
GITHUB_TOKEN: ${{ github.token }}
247249
run: |
248250
./gradlew japicmp -PapiBaseVersion=$PRIOR_VERSION -PapiNewVersion=$VERSION
249251
./gradlew --refresh-dependencies japicmp

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22

33
## Unreleased
44

5+
## Version 1.52.0 (2025-11-20)
6+
7+
### AWS X-Ray propagator
8+
9+
- Update xray lambda component provider name
10+
([#2423](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2423))
11+
12+
### Inferred spans
13+
14+
- Add declarative config support.
15+
([#2030](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2030))
16+
- Fix occasional/sporadic NPE.
17+
([#2443](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2443))
18+
19+
### Span stack traces
20+
21+
- Fix stacktrace processor name for declarative config.
22+
([#2415](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2415))
23+
524
## Version 1.51.0 (2025-10-20)
625

726
### AWS X-Ray SDK support and propagator
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-aws-xray-1.52.0-SNAPSHOT.jar against opentelemetry-aws-xray-1.51.0.jar
1+
Comparing source compatibility of opentelemetry-aws-xray-1.53.0-SNAPSHOT.jar against opentelemetry-aws-xray-1.51.0.jar
22
No changes.

opamp-client/build.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,14 @@ abstract class DownloadAndExtractOpampProtos @Inject constructor(
6767
val url = URI.create(zipUrl.get()).toURL()
6868
downloadedZipFile.get().asFile.parentFile.mkdirs()
6969

70-
url.openStream().use { input: InputStream ->
70+
val connection = url.openConnection()
71+
// Use GitHub token if available to avoid rate limiting
72+
val githubToken = System.getenv("GITHUB_TOKEN")
73+
if (githubToken != null && githubToken.isNotEmpty()) {
74+
connection.setRequestProperty("Authorization", "Bearer $githubToken")
75+
}
76+
77+
connection.getInputStream().use { input: InputStream ->
7178
downloadedZipFile.get().asFile.outputStream().use { output: FileOutputStream ->
7279
input.copyTo(output)
7380
}

0 commit comments

Comments
 (0)