Skip to content

Commit f813978

Browse files
authored
Merge branch 'main' into azure-resource-provider
2 parents 0bf1b43 + 6ff8600 commit f813978

File tree

115 files changed

+4481
-1778
lines changed

Some content is hidden

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

115 files changed

+4481
-1778
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ components:
2222
azure-resources:
2323
- trask
2424
- zeitlinger
25-
baggage-procesor:
25+
baggage-processor:
2626
- mikegoldsmith
2727
- zeitlinger
2828
compressors:
@@ -36,6 +36,9 @@ components:
3636
gcp-resources:
3737
- jsuereth
3838
- psx95
39+
gcp-auth-extension:
40+
- jsuereth
41+
- psx95
3942
jfr-connection:
4043
- breedx-splk
4144
- jeanbisutti

.github/config/markdown-link-check-config.json

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

.github/renovate.json5

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
"packageRules": [
77
{
88
"matchPackageNames": [
9-
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha",
10-
"io.opentelemetry.semconv:opentelemetry-semconv",
11-
"io.opentelemetry.semconv:opentelemetry-semconv-incubating",
12-
"io.opentelemetry.proto:opentelemetry-proto"
9+
"io.opentelemetry:**",
10+
"io.opentelemetry.instrumentation:**",
11+
"io.opentelemetry.semconv:**",
12+
"io.opentelemetry.proto:**"
1313
],
1414
// Renovate's default behavior is only to update from unstable -> unstable if it's for the
1515
// major.minor.patch, under the assumption that you would want to update to the stable version
1616
// of that release instead of the unstable version for a future release
17-
// (TODO remove once the artifacts above release stable versions)
1817
"ignoreUnstable": false
1918
},
2019
{
@@ -25,10 +24,6 @@
2524
"matchPackagePrefixes": ["io.micrometer:"],
2625
"groupName": "micrometer packages"
2726
},
28-
{
29-
"matchPackagePrefixes": ["com.gradle.enterprise"],
30-
"groupName": "gradle enterprise packages"
31-
},
3227
{
3328
// prevent 3.0.1u2 -> 3.0.1
3429
"matchPackageNames": ["com.google.code.findbugs:annotations"],
@@ -92,6 +87,17 @@
9287
"matchPackagePrefixes": ["jakarta.servlet:"],
9388
"matchCurrentVersion": "5.0.0",
9489
"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,
95101
}
96102
]
97103
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ component_names["compressors/"]="Compressors"
3232
component_names["consistent-sampling/"]="Consistent sampling"
3333
component_names["disk-buffering/"]="Disk buffering"
3434
component_names["gcp-resources/"]="GCP Resources"
35+
component_names["gcp-auth-extension/"]="GCP authentication extension"
3536
component_names["inferred-spans/"]="Inferred spans"
3637
component_names["jfr-connection/"]="JFR connection"
3738
component_names["jfr-events/"]="JFR events"

.github/scripts/get-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash -e
22

3-
grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.[0-9]+" version.gradle.kts
3+
grep "val stableVersion = " version.gradle.kts | grep -Eo "[0-9]+.[0-9]+.[0-9]+"

.github/scripts/markdown-link-check-with-retry.sh

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

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ jobs:
3030
cache-read-only: ${{ github.event_name == 'pull_request' }}
3131
- name: Gradle build and test
3232
run: ./gradlew build -x test
33-
env:
34-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3533

3634
test:
3735
name: test (${{ matrix.test-java-version }})
@@ -71,8 +69,6 @@ jobs:
7169
-PtestJavaVersion=${{ matrix.test-java-version }}
7270
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
7371
-Porg.gradle.java.installations.auto-download=false
74-
env:
75-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
7672
7773
integration-test:
7874
runs-on: ubuntu-latest
@@ -89,10 +85,9 @@ jobs:
8985
uses: gradle/actions/setup-gradle@v4
9086
with:
9187
cache-read-only: ${{ github.event_name == 'pull_request' }}
88+
9289
- name: Integration test
9390
run: ./gradlew integrationTest
94-
env:
95-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
9691

9792
- name: Save integration test results
9893
uses: actions/upload-artifact@v4

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111

12-
- name: Install markdown-link-check
13-
# TODO(jack-berg): use latest when config file reading bug is fixed: https://github.com/tcort/markdown-link-check/issues/246
14-
run: npm install -g [email protected]
15-
16-
- name: Run markdown-link-check
17-
run: |
18-
find . -type f \
19-
-name '*.md' \
20-
-not -path './CHANGELOG.md' \
21-
| xargs .github/scripts/markdown-link-check-with-retry.sh
12+
- uses: lycheeverse/lychee-action@v2
13+
with:
14+
# remove version after next release of lychee-action
15+
lycheeVersion: latest
16+
# excluding links to pull requests and issues is done for performance
17+
args: >
18+
--include-fragments
19+
--exclude "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issue|pull)/\\d+$"
20+
--max-retries 6
21+
.

0 commit comments

Comments
 (0)