Skip to content

Commit e986018

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into config-provider
2 parents a624c70 + dc4cc27 commit e986018

File tree

149 files changed

+1988
-983
lines changed

Some content is hidden

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

149 files changed

+1988
-983
lines changed

.github/workflows/benchmark-tags.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
distribution: temurin
5151
java-version: 17
5252

53-
- uses: gradle/actions/setup-gradle@v3
54-
with:
55-
arguments: |
56-
jmhJar
53+
- name: Set up gradle
54+
uses: gradle/actions/setup-gradle@v4
55+
- name: Run jmh
56+
run: ./gradlew jmhJar
5757
env:
5858
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5959

.github/workflows/benchmark.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
distribution: temurin
2121
java-version: 17
2222

23-
- uses: gradle/actions/setup-gradle@v3
24-
with:
25-
arguments: |
26-
jmhJar
23+
- name: Set up gradle
24+
uses: gradle/actions/setup-gradle@v4
25+
- name: Run jmh
26+
run: ./gradlew jmhJar
2727
env:
2828
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2929

.github/workflows/build.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ jobs:
6161
distribution: temurin
6262
java-version: 17
6363

64-
- uses: gradle/actions/setup-gradle@v3
65-
with:
66-
arguments: |
67-
build
64+
- name: Set up gradle
65+
uses: gradle/actions/setup-gradle@v4
66+
- name: Build
67+
run: >
68+
./gradlew build
6869
${{ matrix.coverage && 'jacocoTestReport' || '' }}
6970
-PtestJavaVersion=${{ matrix.test-java-version }}
7071
-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
@@ -134,12 +135,16 @@ jobs:
134135
distribution: temurin
135136
java-version: 17
136137

137-
- uses: gradle/actions/setup-gradle@v3
138+
- name: Set up gradle
139+
uses: gradle/actions/setup-gradle@v4
140+
# skipping release branches because the versions in those branches are not snapshots
141+
# (also this skips pull requests)
142+
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}
143+
- name: Publish to Sonatype
144+
run: ./gradlew assemble publishToSonatype
138145
# skipping release branches because the versions in those branches are not snapshots
139146
# (also this skips pull requests)
140147
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}
141-
with:
142-
arguments: assemble publishToSonatype
143148
env:
144149
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
145150
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}

.github/workflows/codeql-daily.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
2828
tools: latest
2929

30-
- uses: gradle/actions/setup-gradle@v3
31-
with:
32-
# skipping build cache is needed so that all modules will be analyzed
33-
arguments: assemble --no-build-cache
30+
- name: Set up gradle
31+
uses: gradle/actions/setup-gradle@v4
32+
- name: Assemble
33+
# skipping build cache is needed so that all modules will be analyzed
34+
run: ./gradlew assemble --no-build-cache
3435

3536
- name: Perform CodeQL analysis
3637
uses: github/codeql-action/analyze@v3

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- uses: gradle/actions/wrapper-validation@v3.5.0
16+
- uses: gradle/actions/wrapper-validation@v4.0.0

.github/workflows/owasp-dependency-check-daily.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ jobs:
1919
distribution: temurin
2020
java-version: 17
2121

22-
- uses: gradle/actions/setup-gradle@v3
23-
with:
24-
arguments: "dependencyCheckAnalyze"
22+
- name: Set up gradle
23+
uses: gradle/actions/setup-gradle@v4
24+
- name: Check dependencies
25+
run: ./gradlew dependencyCheckAnalyze
2526

2627
- name: Upload report
2728
if: always()

.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ jobs:
2121
distribution: temurin
2222
java-version: 17
2323

24+
- name: Set up gradle
25+
uses: gradle/actions/setup-gradle@v4
26+
2427
- name: Build and publish artifacts
25-
uses: gradle/actions/setup-gradle@v3
26-
with:
27-
arguments: assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
28+
run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
2829
env:
2930
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
3031
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}

CHANGELOG.md

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

33
## Unreleased
44

5+
## Version 1.41.0 (2024-08-09)
6+
7+
### API
8+
9+
* Move experimental suppress instrumentation context key to api internal package
10+
([#6546](https://github.com/open-telemetry/opentelemetry-java/pull/6546))
11+
12+
#### Incubator
13+
14+
* Fix bug in `ExtendedContextPropagators` preventing context extraction when case is incorrect.
15+
([#6569](https://github.com/open-telemetry/opentelemetry-java/pull/6569))
16+
17+
### SDK
18+
19+
* Extend `CompletableResultCode` with `failExceptionally(Throwable)`.
20+
([#6348](https://github.com/open-telemetry/opentelemetry-java/pull/6348))
21+
22+
#### Metrics
23+
24+
* Avoid allocations when experimental advice doesn't remove any attributes.
25+
([#6629](https://github.com/open-telemetry/opentelemetry-java/pull/6629))
26+
27+
#### Exporter
28+
29+
* Enable retry by default for OTLP exporters.
30+
([#6588](https://github.com/open-telemetry/opentelemetry-java/pull/6588))
31+
* Retry ConnectException, add retry logging.
32+
([#6614](https://github.com/open-telemetry/opentelemetry-java/pull/6614))
33+
* Extend `PrometheusHttpServer` with ability to configure default aggregation as function of
34+
instrument kind, including experimental env var support.
35+
([#6541](https://github.com/open-telemetry/opentelemetry-java/pull/6541))
36+
* Add exporter data model impl for profiling signal type.
37+
([#6498](https://github.com/open-telemetry/opentelemetry-java/pull/6498))
38+
* Add Marshalers for profiling signal type.
39+
([#6565](https://github.com/open-telemetry/opentelemetry-java/pull/6565))
40+
* Use generateCertificates() of CertificateFactory to process certificates.
41+
([#6579](https://github.com/open-telemetry/opentelemetry-java/pull/6579))
42+
43+
#### Extensions
44+
45+
* Add file configuration ComponentProvider support for exporters.
46+
([#6493](https://github.com/open-telemetry/opentelemetry-java/pull/6493))
47+
* Remove nullable from file config Factory contract.
48+
([#6612](https://github.com/open-telemetry/opentelemetry-java/pull/6612))
49+
550
## Version 1.40.0 (2024-07-05)
651

752
### API

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Welcome to OpenTelemetry Java repository!
44

55
Before you start - see OpenTelemetry general
6-
[contributing](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
6+
[contributing](https://github.com/open-telemetry/community/blob/main/guides/contributor/README.md)
77
requirements and recommendations.
88

99
If you want to add new features or change behavior, please make sure your changes follow the

0 commit comments

Comments
 (0)