Skip to content

Commit 1cf8e5b

Browse files
authored
Merge branch 'open-telemetry:main' into integration-test-kafka
2 parents 65b4f3b + 782b540 commit 1cf8e5b

File tree

57 files changed

+2748
-65
lines changed

Some content is hidden

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

57 files changed

+2748
-65
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ body:
1414
- aws-xray-propagator
1515
- consistent-sampling
1616
- disk-buffering
17+
- gcp-auth-extension
18+
- gcp-resources
1719
- jfr-connection
1820
- jfr-events
1921
- jmx-metrics

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ body:
1414
- aws-xray-propagator
1515
- consistent-sampling
1616
- disk-buffering
17+
- gcp-auth-extension
18+
- gcp-resources
1719
- jfr-connection
1820
- jfr-events
1921
- jmx-metrics

.github/component_owners.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ components:
1919
aws-xray-propagator:
2020
- wangzlei
2121
- srprash
22+
azure-resources:
23+
- trask
24+
- zeitlinger
2225
baggage-processor:
2326
- mikegoldsmith
2427
- zeitlinger
@@ -33,6 +36,9 @@ components:
3336
gcp-resources:
3437
- jsuereth
3538
- psx95
39+
gcp-auth-extension:
40+
- jsuereth
41+
- psx95
3642
jfr-connection:
3743
- breedx-splk
3844
- jeanbisutti

.github/renovate.json5

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,17 @@
8787
"matchPackagePrefixes": ["jakarta.servlet:"],
8888
"matchCurrentVersion": "5.0.0",
8989
"enabled": false
90+
},
91+
{
92+
// intentionally using Spring Boot 2 in gcp-auth-extension in order to test with Java 8+
93+
"matchFileNames": [
94+
"gcp-auth-extension/build.gradle.kts"
95+
],
96+
"matchPackagePrefixes": [
97+
"org.springframework.boot"
98+
],
99+
"matchUpdateTypes": ["major"],
100+
"enabled": false,
90101
}
91102
]
92103
}

.github/scripts/draft-change-log-entries.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,18 @@ declare -A component_names=()
2727
component_names["aws-resources/"]="AWS resources"
2828
component_names["aws-xray/"]="AWS X-Ray SDK support"
2929
component_names["aws-xray-propagator/"]="AWS X-Ray propagator"
30+
component_names["azure-resources/"]="Azure resources"
3031
component_names["baggage-processor/"]="Baggage processor"
3132
component_names["compressors/"]="Compressors"
3233
component_names["consistent-sampling/"]="Consistent sampling"
3334
component_names["disk-buffering/"]="Disk buffering"
34-
component_names["gcp-resources/"]="GCP Resources"
35+
component_names["gcp-resources/"]="GCP resources"
36+
component_names["gcp-auth-extension/"]="GCP authentication extension"
3537
component_names["inferred-spans/"]="Inferred spans"
3638
component_names["jfr-connection/"]="JFR connection"
3739
component_names["jfr-events/"]="JFR events"
3840
component_names["jmx-metrics/"]="JMX metrics"
41+
component_names["jmx-scraper/"]="JMX scraper"
3942
component_names["kafka-exporter/"]="Kafka exporter"
4043
component_names["maven-extension/"]="Maven extension"
4144
component_names["micrometer-meter-provider/"]="Micrometer MeterProvider"

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,18 @@ jobs:
151151
if: github.event_name == 'pull_request' && always()
152152
needs:
153153
- build
154+
- test
154155
- integration-test
155156
- markdown-lint-check
156157
- misspell-check
157158
- shell-script-check
158159
runs-on: ubuntu-latest
159160
steps:
160-
# only the "build" and "integration-test" checks are required for release branch PRs in order
161+
# only the build and test checks are required for release branch PRs in order
161162
# to avoid any unnecessary release branch maintenance (especially for patches)
162163
- if: |
163164
needs.build.result != 'success' ||
165+
needs.test.result != 'success' ||
164166
needs.integration-test.result != 'success' ||
165167
(
166168
!startsWith(github.base_ref, 'release/') &&

.github/workflows/reusable-markdown-link-check.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111

1212
- uses: lycheeverse/lychee-action@v2
1313
with:
14-
# remove version after next release of lychee-action
15-
lycheeVersion: latest
1614
# excluding links to pull requests and issues is done for performance
1715
args: >
1816
--include-fragments

CHANGELOG.md

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

33
## Unreleased
44

5+
## Version 1.43.0 (2025-01-17)
6+
7+
### Azure resources - New 🌟
8+
9+
Azure resource detectors.
10+
11+
### Consistent sampling
12+
13+
- Improve interop with legacy samplers
14+
([#1629](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1629))
15+
16+
### GCP authentication extension - New 🌟
17+
18+
Allows users to export telemetry from their applications to Google Cloud using the built-in OTLP exporters.
19+
The extension takes care of the necessary configuration required to authenticate to GCP to successfully export telemetry.
20+
21+
### JMX scraper
22+
23+
- Add support for Solr
24+
([#1595](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1595))
25+
526
## Version 1.42.0 (2024-12-13)
627

728
### AWS X-Ray SDK support

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ feature or via instrumentation, this project is hopefully for you.
1818
| alpha | [zstd Compressor](./compressors/compressor-zstd/README.md) |
1919
| alpha | [Consistent Sampling](./consistent-sampling/README.md) |
2020
| alpha | [Disk Buffering](./disk-buffering/README.md) |
21+
| alpha | [GCP Authentication Extension](./gcp-auth-extension/README.md) |
2122
| beta | [GCP Resources](./gcp-resources/README.md) |
2223
| beta | [Inferred Spans](./inferred-spans/README.md) |
2324
| alpha | [JFR Connection](./jfr-connection/README.md) |
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
io.opentelemetry.contrib.awsxray.propagator.internal.AwsConfigurablePropagator
2+
io.opentelemetry.contrib.awsxray.propagator.internal.AwsXrayLambdaConfigurablePropagator

0 commit comments

Comments
 (0)