Skip to content

Commit eccd941

Browse files
authored
Merge branch 'main' into low-allocation-marshalers-for-json-exporter
2 parents 09915eb + 40f71ed commit eccd941

File tree

166 files changed

+2580
-650
lines changed

Some content is hidden

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

166 files changed

+2580
-650
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
- 23
172172
steps:
173173
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
174-
- uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
174+
- uses: graalvm/setup-graalvm@e1df20a713a4cc6ab5b0eb03f0e0dcdc0199b805 # v1.3.4
175175
with:
176176
java-version: ${{ matrix.test-graal-version }}
177177
distribution: 'graalvm'

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
48+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4949
with:
5050
languages: ${{ matrix.language }}
5151
# using "latest" helps to keep up with the latest Kotlin support
@@ -60,6 +60,6 @@ jobs:
6060
run: ./gradlew assemble --no-build-cache --no-daemon
6161

6262
- name: Perform CodeQL analysis
63-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
63+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
6464
with:
6565
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
45+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4646
with:
4747
sarif_file: results.sarif

.github/workflows/release.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
echo "version=$VERSION" >> $GITHUB_OUTPUT
134134
echo "prior-version=$PRIOR_VERSION" >> $GITHUB_OUTPUT
135135
136-
update-apidiff-baseline-to-released-version:
136+
update-apidiff-baseline-and-docs-to-released-version:
137137
permissions:
138138
contents: write # for git push to PR branch
139139
runs-on: ubuntu-latest
@@ -187,6 +187,13 @@ jobs:
187187
./gradlew --refresh-dependencies japicmp
188188
git add docs/apidiffs
189189
190+
- name: Update versions in README.md
191+
env:
192+
VERSION: ${{ needs.release.outputs.version }}
193+
run: |
194+
./gradlew updateVersionInDocs -Prelease.version=$VERSION
195+
git add README.md
196+
190197
- name: Use CLA approved bot
191198
run: .github/scripts/use-cla-approved-github-bot.sh
192199

@@ -202,9 +209,9 @@ jobs:
202209
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
203210
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
204211
run: |
205-
message="Update apidiff baseline to released version $VERSION"
206-
body="Update apidiff baseline to released version \`$VERSION\`."
207-
branch="otelbot/update-apidiff-baseline-to-released-version-${VERSION}"
212+
message="Update apidiff baseline and documentation versions to released version $VERSION"
213+
body="Update apidiff baseline and documentation versions to released version \`$VERSION\`."
214+
branch="otelbot/update-apidiff-baseline-and-documentation-to-released-version-${VERSION}"
208215
209216
git checkout -b $branch
210217
git commit -m "$message"

CHANGELOG.md

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

33
## Unreleased
44

5+
## Version 1.52.0 (2025-07-11)
6+
7+
### API
8+
9+
#### Common
10+
11+
* Promote `ComponentLoader` to new `opentelemetry-common` artifact,
12+
standardize SPI loading
13+
([#7446](https://github.com/open-telemetry/opentelemetry-java/pull/7446))
14+
15+
#### Context
16+
17+
* LazyStorage passes its ClassLoader when loading ContextStorageProvider SPI
18+
([#7424](https://github.com/open-telemetry/opentelemetry-java/pull/7424))
19+
20+
#### Incubator
21+
22+
* Add context and severity params to ExtendedLogger#isEnabled
23+
([#7268](https://github.com/open-telemetry/opentelemetry-java/pull/7268))
24+
* Add new convenience methods for converting DeclarativeConfigProperties to config model
25+
([#7453](https://github.com/open-telemetry/opentelemetry-java/pull/7453))
26+
27+
### SDK
28+
29+
* Add custom stacktrace renderer which is length limit aware
30+
([#7281](https://github.com/open-telemetry/opentelemetry-java/pull/7281))
31+
32+
#### Metrics
33+
34+
* Propagate flush to PeriodicMetricReader's metricExporter.
35+
([#7410](https://github.com/open-telemetry/opentelemetry-java/pull/7410))
36+
37+
#### Exporters
38+
39+
* OTLP - JdkHttpSender: ensure proper closure of HttpClient in shutdown method
40+
([#7390](https://github.com/open-telemetry/opentelemetry-java/pull/7390))
41+
* OTLP: profile exporters fix and test improvements
42+
([#7442](https://github.com/open-telemetry/opentelemetry-java/pull/7442))
43+
* OTLP: Loading Compressor SPI via ComponentLoader configured through setComponentLoader
44+
([#7428](https://github.com/open-telemetry/opentelemetry-java/pull/7428))
45+
* Prometheus: add scope schema URL and attributes
46+
([#7356](https://github.com/open-telemetry/opentelemetry-java/pull/7356))
47+
* Prometheus: extend prometheus declarative config support to include without_scope_info,
48+
with_resource_constant_labels
49+
([#6840](https://github.com/open-telemetry/opentelemetry-java/pull/6840))
50+
51+
#### Extensions
52+
53+
* Autoconfigure: fix race condition of `GlobalOpenTelemetry` initialization with
54+
`AutoConfiguredOpenTelemetrySdkBuilder`
55+
([#7365](https://github.com/open-telemetry/opentelemetry-java/pull/7365))
56+
* Declarative config: update to declarative config 1.0-rc.1
57+
([#7436](https://github.com/open-telemetry/opentelemetry-java/pull/7436))
58+
* Declarative config: resolve environment variable substitution for mixed quotes
59+
([#7433](https://github.com/open-telemetry/opentelemetry-java/pull/7433))
60+
561
## Version 1.51.0 (2025-06-06)
662

763
### API

0 commit comments

Comments
 (0)