Skip to content

Commit 18744f3

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into kotlin-version
2 parents e0a542d + 00b61a2 commit 18744f3

File tree

258 files changed

+3353
-1502
lines changed

Some content is hidden

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

258 files changed

+3353
-1502
lines changed

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
},
1818
{
1919
"matchPackageNames": [
20+
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
2021
"io.opentelemetry.proto:opentelemetry-proto",
2122
"io.opentelemetry.semconv:opentelemetry-semconv-incubating"
2223
],

.github/workflows/build-tracecontext-testsuite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Build and push
32-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
32+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
3333
with:
3434
context: integration-tests/tracecontext/docker
3535
push: true

.github/workflows/build.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
exit 1
100100
fi
101101
102-
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
102+
- uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
103103
if: ${{ matrix.coverage }}
104104
env:
105105
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -161,13 +161,19 @@ jobs:
161161
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
162162

163163
build-graal:
164+
name: Build GraalVM
164165
runs-on: ubuntu-latest
166+
strategy:
167+
fail-fast: false
168+
matrix:
169+
test-graal-version:
170+
- 21
171+
- 23
165172
steps:
166173
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
167-
- uses: graalvm/setup-graalvm@b0cb26a8da53cb3e97cdc0c827d8e3071240e730 # v1.3.1
174+
- uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
168175
with:
169-
# TODO(jack-berg): Which versions do we need to test? Should we use a matrix scheme?
170-
java-version: '21'
176+
java-version: ${{ matrix.test-graal-version }}
171177
distribution: 'graalvm'
172178
components: 'native-image'
173179
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
40+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
4141
with:
4242
languages: java, actions
4343
# using "latest" helps to keep up with the latest Kotlin support
@@ -51,4 +51,4 @@ jobs:
5151
run: ./gradlew assemble --no-build-cache --no-daemon
5252

5353
- name: Perform CodeQL analysis
54-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
54+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11

.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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
45+
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
4646
with:
4747
sarif_file: results.sarif

CHANGELOG.md

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

33
## Unreleased
44

5+
## Version 1.49.0 (2025-04-04)
6+
7+
### SDK
8+
9+
#### Trace
10+
11+
* Avoid linear queue.size() calls in span producers by storing queue size separately
12+
([#7141](https://github.com/open-telemetry/opentelemetry-java/pull/7141))
13+
14+
#### Exporters
15+
16+
* OTLP: Add support for setting exporter executor service
17+
([#7152](https://github.com/open-telemetry/opentelemetry-java/pull/7152))
18+
* OTLP: Refine delay jitter for exponential backoff
19+
([#7206](https://github.com/open-telemetry/opentelemetry-java/pull/7206))
20+
21+
#### Extensions
22+
23+
* Autoconfigure: Remove support for otel.experimental.exporter.otlp.retry.enabled
24+
([#7200](https://github.com/open-telemetry/opentelemetry-java/pull/7200))
25+
* Autoconfigure: Add stable cardinality limit property otel.java.metrics.cardinality.limit
26+
([#7199](https://github.com/open-telemetry/opentelemetry-java/pull/7199))
27+
* Incubator: Add declarative config model customizer SPI
28+
([#7118](https://github.com/open-telemetry/opentelemetry-java/pull/7118))
29+
30+
## Version 1.48.0 (2025-03-07)
31+
32+
### API
33+
34+
* Add some helpful logging attribute methods to `LogRecordBuilder`
35+
([#7089](https://github.com/open-telemetry/opentelemetry-java/pull/7089))
36+
37+
#### Incubator
38+
39+
* Introduce ConfigProvider API. Rename `StructuredConfigProperties` to `DeclarativeConfigProperties`
40+
and move to `opentelemetry-api-incubator`. Rename `FileConfiguration`
41+
to `DeclarativeConfiguration`.
42+
([#6549](https://github.com/open-telemetry/opentelemetry-java/pull/6549))
43+
44+
### SDK
45+
46+
* Log warning and adjust when BatchLogRecordProcessor, BatchSpanProcessor `maxExportBatchSize`
47+
exceeds `maxQueueSize`.
48+
([#7045](https://github.com/open-telemetry/opentelemetry-java/pull/7045),
49+
[#7148](https://github.com/open-telemetry/opentelemetry-java/pull/7148))
50+
* Fix bug causing `ThrottlingLogger` to log more than once per minute
51+
([#7156](https://github.com/open-telemetry/opentelemetry-java/pull/7156))
52+
53+
#### Metrics
54+
55+
* Remove obsolete `SdkMeterProviderUtil#setCardinalitylimit` API
56+
([#7169](https://github.com/open-telemetry/opentelemetry-java/pull/7169))
57+
58+
#### Traces
59+
60+
* Fix bug preventing accurate reporting of span event dropped attribute count
61+
([#7142](https://github.com/open-telemetry/opentelemetry-java/pull/7142))
62+
63+
#### Exporters
64+
65+
* OTLP: remove support for `otel.java.experimental.exporter.memory_mode`
66+
which was previously replaced by `otel.java.exporter.memory_mode`
67+
([#7127](https://github.com/open-telemetry/opentelemetry-java/pull/7127))
68+
* OTLP: Extract sender parameters to config carrier class
69+
(incubating API)
70+
([#7151](https://github.com/open-telemetry/opentelemetry-java/pull/7151))
71+
* OTLP: Add support for setting OTLP exporter service class loader
72+
([#7150](https://github.com/open-telemetry/opentelemetry-java/pull/7150))
73+
74+
### Tooling
75+
76+
* Update android animalsniffer min API version to 23
77+
([#7153](https://github.com/open-telemetry/opentelemetry-java/pull/7153))
78+
579
## Version 1.47.0 (2025-02-07)
680

781
### API

0 commit comments

Comments
 (0)