Skip to content

Commit a10672d

Browse files
lauritlaurit
committed
Merge branch 'main' into sqlcommenter
2 parents 7e223e3 + 62175ca commit a10672d

File tree

760 files changed

+26059
-8018
lines changed

Some content is hidden

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

760 files changed

+26059
-8018
lines changed

‎.fossa.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,9 @@ targets:
766766
- type: gradle
767767
path: ./
768768
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
769+
- type: gradle
770+
path: ./
771+
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
769772
- type: gradle
770773
path: ./
771774
target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'
@@ -955,9 +958,6 @@ targets:
955958
- type: gradle
956959
path: ./
957960
target: ':instrumentation:vertx:vertx-rx-java-3.5:javaagent'
958-
- type: gradle
959-
path: ./
960-
target: ':instrumentation:vertx:vertx-sql-client-4.0:javaagent'
961961
- type: gradle
962962
path: ./
963963
target: ':instrumentation:vertx:vertx-web-3.0:javaagent'
@@ -1111,9 +1111,21 @@ targets:
11111111
- type: gradle
11121112
path: ./
11131113
target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent'
1114+
- type: gradle
1115+
path: ./
1116+
target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-5.0:javaagent'
11141117
- type: gradle
11151118
path: ./
11161119
target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent'
1120+
- type: gradle
1121+
path: ./
1122+
target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent'
1123+
- type: gradle
1124+
path: ./
1125+
target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent'
1126+
- type: gradle
1127+
path: ./
1128+
target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common:javaagent'
11171129

11181130
experimental:
11191131
gradle:

‎.github/graal-native-docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
mongodb:
3-
image: mongo:4.0
3+
image: mongo:4.2
44
ports:
55
- "27017:27017"
66

‎.github/repository-settings.md‎

Lines changed: 3 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,8 @@
11
# Repository settings
22

33
This document describes any changes that have been made to the
4-
settings for this repository beyond the [OpenTelemetry default repository
5-
settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#repository-settings).
6-
7-
## General > Pull Requests
8-
9-
- Allow squash merging > Default to pull request title
10-
11-
- Allow auto-merge
12-
13-
## Actions > General
14-
15-
- Fork pull request workflows from outside collaborators:
16-
"Require approval for first-time contributors who are new to GitHub"
17-
18-
(To reduce friction for new contributors,
19-
as the default is "Require approval for first-time contributors")
20-
21-
- Workflow permissions
22-
- Default permissions granted to the `GITHUB_TOKEN` when running workflows in this repository:
23-
Read repository contents and packages permissions
24-
- Allow GitHub Actions to create and approve pull requests: UNCHECKED
25-
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-
106-
## Branch protections
107-
108-
### `main`, `release/*`, `cloudfoundry`
109-
110-
- Restrict who can push to matching branches: CHECKED
111-
112-
## Code security and analysis
113-
114-
- Secret scanning: Enabled
4+
settings in this repository outside the settings tracked in the
5+
private admin repo.
1156

1167
## Secrets and variables > Actions
1178

@@ -132,6 +23,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
13223

13324
- `FOSSA_API_KEY`
13425
- `OTELBOT_PRIVATE_KEY`
26+
- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
13527

13628
### Organization variables
13729

‎.github/scripts/dependencies.dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# this file exists so that Renovate can auto-update docker image versions that are then used elsewhere
2+
3+
FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee

‎.github/scripts/link-check.sh‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
export MSYS_NO_PATHCONV=1 # for Git Bash on Windows
6+
7+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
8+
LYCHEE_CONFIG="$SCRIPT_DIR/../../.lychee.toml"
9+
DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.dockerfile"
10+
11+
# Extract lychee version from dependencies.dockerfile
12+
LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/')
13+
14+
# Build the lychee command with optional GitHub token
15+
CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --config $(basename "$LYCHEE_CONFIG")"
16+
17+
# Add GitHub token if available
18+
if [[ -n "$GITHUB_TOKEN" ]]; then
19+
CMD="$CMD --github-token $GITHUB_TOKEN"
20+
fi
21+
22+
# Add the target directory
23+
CMD="$CMD ."
24+
25+
# Determine if we should allocate a TTY
26+
DOCKER_FLAGS="--rm --init"
27+
if [[ -t 0 ]]; then
28+
DOCKER_FLAGS="$DOCKER_FLAGS -it"
29+
else
30+
DOCKER_FLAGS="$DOCKER_FLAGS -i"
31+
fi
32+
33+
# Run lychee with proper signal handling
34+
# shellcheck disable=SC2086
35+
exec docker run $DOCKER_FLAGS -v "$(dirname "$LYCHEE_CONFIG")":/data -w /data $CMD

‎.github/workflows/auto-license-report.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Auto license report
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
check:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
21+
- name: Free disk space
22+
run: .github/scripts/gha-free-disk-space.sh
23+
24+
- name: Set up JDK for running Gradle
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
with:
27+
distribution: temurin
28+
java-version-file: .java-version
29+
30+
- name: Set up gradle
31+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
32+
with:
33+
cache-read-only: true
34+
35+
- name: Check out PR branch
36+
env:
37+
GH_TOKEN: ${{ github.token }}
38+
run: gh pr checkout ${{ github.event.pull_request.number }}
39+
40+
- name: Update license report
41+
run: ./gradlew generateLicenseReport --no-build-cache
42+
43+
- id: create-patch
44+
name: Create patch file
45+
run: |
46+
git add -N licenses
47+
git diff > patch
48+
if [ -s patch ]; then
49+
echo "exists=true" >> "$GITHUB_OUTPUT"
50+
fi
51+
52+
- name: Upload patch file
53+
if: steps.create-patch.outputs.exists == 'true'
54+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
55+
with:
56+
path: patch
57+
name: patch

‎.github/workflows/auto-spotless.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Auto spotless
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
check:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
21+
- name: Free disk space
22+
run: .github/scripts/gha-free-disk-space.sh
23+
24+
- name: Set up JDK for running Gradle
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
with:
27+
distribution: temurin
28+
java-version-file: .java-version
29+
30+
- name: Set up gradle
31+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
32+
with:
33+
cache-read-only: true
34+
35+
- name: Check out PR branch
36+
env:
37+
GH_TOKEN: ${{ github.token }}
38+
run: gh pr checkout ${{ github.event.pull_request.number }}
39+
40+
- name: Spotless
41+
run: ./gradlew spotlessApply
42+
43+
- id: create-patch
44+
name: Create patch file
45+
run: |
46+
git diff > patch
47+
if [ -s patch ]; then
48+
echo "exists=true" >> "$GITHUB_OUTPUT"
49+
fi
50+
51+
- name: Upload patch file
52+
if: steps.create-patch.outputs.exists == 'true'
53+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
with:
55+
path: patch
56+
name: patch

‎.github/workflows/auto-update-otel-sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
75+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport

0 commit comments

Comments
 (0)