Skip to content

Commit 655bcbf

Browse files
authored
Merge branch 'main' into dev/add_removeIf
2 parents f39d2c8 + 6233e14 commit 655bcbf

File tree

292 files changed

+171334
-7917
lines changed

Some content is hidden

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

292 files changed

+171334
-7917
lines changed

.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,15 @@ root = true
44
max_line_length = 100
55
indent_size = 2
66

7+
[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mise.lock,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore}]
8+
max_line_length = 200
9+
10+
[{grafana-dashboard-*.json,.editorconfig}]
11+
max_line_length = 300
12+
713
[pom.xml]
14+
max_line_length = 110
15+
16+
[*.py]
17+
# checked by black
818
indent_size = 4

.github/dependabot.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1+
---
12
version: 2
23
updates:
34
- package-ecosystem: "github-actions"
45
directory: "/"
56
schedule:
67
interval: weekly
78
- package-ecosystem: maven
8-
# excluding simpleclient_archive from the update is not possible, only includes are supported
9-
# when we use includes, we run into https://github.com/dependabot/dependabot-core/issues/10415 -
9+
# excluding simpleclient_archive from the update is not possible,
10+
# only includes are supported
11+
# when we use includes,
12+
# we run into https://github.com/dependabot/dependabot-core/issues/10415
1013
# even if we limit to 1 PR at a time
1114
# therefore we just rename pom.xml in simpleclient_archive for now
1215
# if this becomes a problem, we can move to renovate

.github/release.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# .github/release.yml
2+
3+
changelog:
4+
categories:
5+
- title: 🏕 Features
6+
labels:
7+
- "*"
8+
exclude:
9+
labels:
10+
- chore
11+
- dependencies
12+
- title: 🧹 Chore
13+
labels:
14+
- chore
15+
- title: 👒 Dependencies
16+
labels:
17+
- dependencies

.github/super-linter.env

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*|keystore.pkcs12|.*.java|prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
2+
IGNORE_GITIGNORED_FILES=true
3+
JAVA_FILE_NAME=google_checks.xml
4+
# disable kubernetes linter - complains about resource limits, etc
5+
VALIDATE_CHECKOV=false
6+
VALIDATE_CSS=false
7+
VALIDATE_CSS_PRETTIER=false
8+
VALIDATE_DOCKERFILE_HADOLINT=false
9+
VALIDATE_GIT_COMMITLINT=false
10+
# done by maven
11+
VALIDATE_GOOGLE_JAVA_FORMAT=false
12+
# times out
13+
VALIDATE_GO_MODULES=false
14+
VALIDATE_HTML=false
15+
# done by checkstyle
16+
VALIDATE_JAVA=false
17+
# contradicting with prettier
18+
VALIDATE_JAVASCRIPT_STANDARD=false
19+
# we have many duplicate code in our codebase for demo purposes
20+
VALIDATE_JSCPD=false
21+
VALIDATE_PYTHON_PYLINT=false
22+
23+
FIX_ENV=true
24+
FIX_GO=true
25+
FIX_JAVASCRIPT_PRETTIER=true
26+
FIX_JSON=true
27+
FIX_JSONC=true
28+
FIX_JSONC_PRETTIER=true
29+
FIX_JSON_PRETTIER=true
30+
FIX_MARKDOWN=true
31+
FIX_MARKDOWN_PRETTIER=true
32+
FIX_PYTHON_BLACK=true
33+
FIX_SHELL_SHFMT=true
34+
FIX_YAML_PRETTIER=true

.github/workflows/acceptance-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
---
12
name: OpenTelemetry Acceptance Tests
23

34
on:
45
push:
5-
branches: [ "main" ]
6+
branches: ["main"]
67
pull_request:
7-
branches: [ "main" ]
8+
branches: ["main"]
89

910
permissions: {}
1011

@@ -16,6 +17,6 @@ jobs:
1617
with:
1718
persist-credentials: false
1819
uses: actions/checkout@v4
19-
- uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
20+
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
2021
- name: Run acceptance tests
2122
run: mise run acceptance-test

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
---
12
name: Build
23

34
on:
45
push:
5-
branches: [ "main" ]
6+
branches: ["main"]
67
pull_request:
7-
branches: [ "main" ]
8+
branches: ["main"]
89

910
permissions: {}
1011

@@ -15,7 +16,7 @@ jobs:
1516
- uses: actions/checkout@v4
1617
with:
1718
persist-credentials: false
18-
- uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
19+
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
1920
- name: Cache local Maven repository
2021
uses: actions/cache@v4
2122
with:
@@ -25,4 +26,3 @@ jobs:
2526
${{ runner.os }}-maven-
2627
- name: Run the Maven verify phase
2728
run: mise run ci
28-

.github/workflows/github-pages.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ on:
1313

1414
permissions: {}
1515

16-
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
17-
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
16+
# Allow only one concurrent deployment, skipping runs queued between
17+
# the run in-progress and latest queued.
18+
# However, do NOT cancel in-progress runs as we want to allow
19+
# these production deployments to complete.
1820
concurrency:
1921
group: "pages"
2022
cancel-in-progress: false
@@ -32,22 +34,18 @@ jobs:
3234
- uses: actions/checkout@v4
3335
with:
3436
persist-credentials: false
35-
fetch-tags: 'true'
37+
fetch-tags: "true"
3638
fetch-depth: 0
37-
- uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
39+
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
3840
with:
39-
cache: 'false'
41+
cache: "false"
4042
- name: Prepare GitHub Pages
4143
run: mise run prepare-gh-pages
42-
with:
43-
permissions: block
4444
- name: Setup Pages
4545
id: pages
4646
uses: actions/configure-pages@v5
4747
- name: Build GitHub Pages
4848
run: mise run build-gh-pages
49-
with:
50-
permissions: block
5149
- name: Upload artifact
5250
uses: actions/upload-pages-artifact@v3
5351
with:
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ on: [pull_request]
66
permissions: {}
77

88
jobs:
9-
acceptance-tests:
10-
permissions: {}
9+
lint:
1110
runs-on: ubuntu-24.04
1211
steps:
1312
- name: Check out
1413
with:
1514
persist-credentials: false
1615
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17-
- uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
16+
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
1817
- name: Lint
19-
run: mise run lint-all
20-
18+
run: mise run lint-rest

.github/workflows/native-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
---
12
name: GraalVM Native Tests
23

34
on:
45
push:
5-
branches: [ "main" ]
6+
branches: ["main"]
67
pull_request:
7-
branches: [ "main" ]
8+
branches: ["main"]
89

910
permissions: {}
1011

@@ -16,6 +17,6 @@ jobs:
1617
with:
1718
persist-credentials: false
1819
uses: actions/checkout@v4
19-
- uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
20+
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
2021
- name: Run native tests
2122
run: mise run native-test

.github/workflows/release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Deploy to Maven Central
23

34
on:
@@ -14,10 +15,10 @@ jobs:
1415
steps:
1516
- name: Debug gpg key - remove after debugging
1617
env:
17-
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
18+
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
1819
run: |
19-
echo "$GPG_SIGNING_KEY" | wc -c
20-
echo "$GPG_SIGNING_KEY" | gpg --batch --import-options import-show --import
20+
echo "${#GPG_SIGNING_KEY}"
21+
echo "${GPG_SIGNING_KEY}" | gpg --batch --import-options import-show --import
2122
- name: Checkout Plugin Repository
2223
uses: actions/checkout@v4
2324
with:
@@ -37,8 +38,8 @@ jobs:
3738
- name: Set up Apache Maven Central
3839
uses: actions/setup-java@v4
3940
with:
40-
distribution: 'temurin'
41-
java-version: '17'
41+
distribution: "temurin"
42+
java-version: "17"
4243
server-id: ossrh
4344
server-username: MAVEN_USERNAME
4445
server-password: MAVEN_CENTRAL_TOKEN

0 commit comments

Comments
 (0)