Skip to content

Commit 37839ba

Browse files
cuichenlicuichenli
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into add-logback-access-jetty12
2 parents cb17b11 + 9052ca9 commit 37839ba

File tree

54 files changed

+1660
-243
lines changed

Some content is hidden

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

54 files changed

+1660
-243
lines changed

‎.github/repository-settings.md‎

Lines changed: 44 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -23,91 +23,53 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
2323
Read repository contents and packages permissions
2424
- Allow GitHub Actions to create and approve pull requests: UNCHECKED
2525

26-
## Rules > Rulesets
27-
28-
### `main` and release branches
29-
30-
- Targeted branches:
31-
- `main`
32-
- `release/*`
33-
- Branch rules
34-
- Restrict deletions: CHECKED
35-
- Require a pull request before merging: CHECKED
36-
- Required approvals: 1
37-
- Require review from Code Owners: CHECKED
38-
- Allowed merge methods: Squash
39-
- Require status checks to pass
40-
- Do not require status checks on creation: CHECKED
41-
- Status checks that are required
42-
- EasyCLA
43-
- `required-status-check`
44-
- `gradle-wrapper-validation`
45-
- Block force pushes: CHECKED
46-
- Require code scanning results: CHECKED
47-
- CodeQL
48-
- Security alerts: High or higher
49-
- Alerts: Errors
50-
51-
> [!NOTE]
52-
> This repository can't "require linear history" because there is an old merge commit on `main`
53-
> (and so also on the release branches).
54-
55-
### `cloudfoundry` branch
56-
57-
- Targeted branches:
58-
- `cloudfoundry`
59-
- Branch rules
60-
- Restrict deletions: CHECKED
61-
- Require linear history: CHECKED
62-
- Require a pull request before merging: CHECKED
63-
- Required approvals: 1
64-
- Require review from Code Owners: CHECKED
65-
- Allowed merge methods: Squash
66-
- Require status checks to pass
67-
- EasyCLA
68-
- Block force pushes: CHECKED
69-
70-
### `gh-pages` branch
71-
72-
- Targeted branches:
73-
- `gh-pages`
74-
- Branch rules
75-
- Restrict deletions: CHECKED
76-
- Require linear history: CHECKED
77-
- Block force pushes: CHECKED
78-
79-
### Old-style release branches
80-
81-
- Targeted branches:
82-
- `v0.*`
83-
- `v1.*`
84-
- Branch rules
85-
- Restrict creations: CHECKED
86-
- Restrict updates: CHECKED
87-
- Restrict deletions: CHECKED
88-
89-
### Restrict branch creation
90-
91-
- Targeted branches
92-
- Exclude:
93-
- `release/*`
94-
- `renovate/**/*`
95-
- `otelbot/**/*`
96-
- `revert-*/**/*` (these are created when using the GitHub UI to revert a PR)
97-
- Restrict creations: CHECKED
98-
99-
### Restrict updating tags
100-
101-
- Targeted tags
102-
- All tags
103-
- Restrict updates: CHECKED
104-
- Restrict deletions: CHECKED
105-
10626
## Branch protections
10727

108-
### `main`, `release/*`, `cloudfoundry`
28+
The order of branch protection rules
29+
[can be important](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#about-branch-protection-rules).
30+
The branch protection rules below should be added before the `**/**` branch protection rule
31+
(this may require deleting the `**/**` rule and recreating it at the end).
32+
33+
### `main`
34+
35+
- Require branches to be up to date before merging: UNCHECKED
36+
37+
(PR jobs take too long, and leaving this unchecked has not been a significant problem)
38+
39+
- Status checks that are required:
40+
41+
- EasyCLA
42+
- required-status-check
43+
- gradle-wrapper-validation
44+
- CodeQL
45+
46+
### `release/*`
47+
48+
Same settings as above for [`main`](#main).
49+
50+
### `v0.*` and `v1.*` (old-style release branches)
51+
52+
- Lock branch: CHECKED
53+
54+
- Do not allow bypassing the above settings: CHECKED
55+
56+
### `cloudfoundry`
57+
58+
Same settings as above for [`main`](#main),
59+
except for the `required-status-check` required status check.
60+
61+
### `renovate/**/*` and `otelbot/**/*`
62+
63+
Same settings as
64+
for [`dependabot/**/*`](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot)
65+
66+
### `gh-pages`
67+
68+
- Everything UNCHECKED
10969

110-
- Restrict who can push to matching branches: CHECKED
70+
(This branch is currently only used for directly pushing benchmarking results from the
71+
[Nightly overhead benchmark](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/nightly-benchmark-overhead.yml)
72+
job)
11173

11274
## Code security and analysis
11375

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
26+
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
2727
with:
2828
results_file: results.sarif
2929
results_format: sarif

‎.github/workflows/publish-petclinic-benchmark-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: echo "TS=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
3333

3434
- name: Push to GitHub packages
35-
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
35+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
3636
with:
3737
push: true
3838
file: benchmark-overhead/Dockerfile.petclinic

‎benchmark-overhead/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616
}
1717

1818
dependencies {
19-
implementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
19+
implementation(enforcedPlatform("org.junit:junit-bom:5.13.0"))
2020

2121
testImplementation("org.testcontainers:testcontainers:1.21.1")
2222
testImplementation("org.testcontainers:postgresql:1.21.1")

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ dependencies {
7171
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
7272
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
7373

74-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
74+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.0"))
7575
testImplementation("org.junit.jupiter:junit-jupiter-api")
7676
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
7777
testImplementation("org.assertj:assertj-core:3.27.3")

‎conventions/src/main/kotlin/otel.java-conventions.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
143143
with(ctx.details) {
144144
if (id.group == "io.netty" && id.name != "netty") {
145145
if (id.version.startsWith("4.1.")) {
146-
belongsTo("io.netty:netty-bom:4.1.121.Final", false)
146+
belongsTo("io.netty:netty-bom:4.1.122.Final", false)
147147
} else if (id.version.startsWith("4.0.")) {
148148
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
149149
}
@@ -431,7 +431,7 @@ codenarc {
431431
checkstyle {
432432
configFile = rootProject.file("buildscripts/checkstyle.xml")
433433
// this version should match the version of google_checks.xml used as basis for above configuration
434-
toolVersion = "10.24.0"
434+
toolVersion = "10.25.0"
435435
maxWarnings = 0
436436
}
437437

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ val CORE_DEPENDENCIES = listOf(
8181
// There are dependencies included here that appear to have no usages, but are maintained at
8282
// this top level to help consistently satisfy large numbers of transitive dependencies.
8383
val DEPENDENCIES = listOf(
84-
"org.junit.jupiter:junit-jupiter-api:5.12.2",
84+
"org.junit.jupiter:junit-jupiter-api:5.13.0",
8585
"org.spockframework:spock-core:2.4-M6-groovy-4.0",
8686
"org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
8787

‎examples/distro/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ subprojects {
6969

7070
testImplementation("org.mockito:mockito-core:5.18.0")
7171

72-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
72+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.0"))
7373
testImplementation("org.junit.jupiter:junit-jupiter-api")
7474
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
7575
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

‎examples/extension/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dependencies {
104104
testImplementation("io.opentelemetry:opentelemetry-api")
105105
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
106106

107-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
107+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.0"))
108108
testImplementation("org.junit.jupiter:junit-jupiter-api")
109109
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
110110
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

‎gradle-plugins/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444

4545
testImplementation("org.assertj:assertj-core:3.27.3")
4646

47-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
47+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.0"))
4848
testImplementation("org.junit.jupiter:junit-jupiter-api")
4949
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
5050
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

0 commit comments

Comments
 (0)