Skip to content

Commit 25b8268

Browse files
lauritlaurit
authored
Merge branch 'main' into convert-groovy-cache-provider
2 parents 4916cf6 + 4ccb595 commit 25b8268

File tree

125 files changed

+3407
-893
lines changed

Some content is hidden

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

125 files changed

+3407
-893
lines changed

‎.fossa.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@ targets:
136136
- type: gradle
137137
path: ./
138138
target: ':instrumentation:gwt-2.0:javaagent'
139+
- type: gradle
140+
path: ./
141+
target: ':instrumentation:helidon-4.3:javaagent'
142+
- type: gradle
143+
path: ./
144+
target: ':instrumentation:helidon-4.3:library'
139145
- type: gradle
140146
path: ./
141147
target: ':instrumentation:hikaricp-3.0:javaagent'
@@ -751,6 +757,9 @@ targets:
751757
- type: gradle
752758
path: ./
753759
target: ':instrumentation:openai:openai-java-1.1:library'
760+
- type: gradle
761+
path: ./
762+
target: ':instrumentation:opensearch:opensearch-java-3.0:javaagent'
754763
- type: gradle
755764
path: ./
756765
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'

‎.lychee.toml‎ renamed to ‎.github/config/lychee.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ exclude = [
2121
'^http://code.google.com/p/concurrentlinkedhashmap$',
2222
'^https://softwareengineering.stackexchange.com/questions/29727.*',
2323
'^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
24+
# new artifact, remove after 2.21.0 release
25+
'^https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-helidon-4.3$',
2426
]

‎.github/renovate.json5‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,12 @@
351351
customType: 'regex',
352352
datasourceTemplate: 'java-version',
353353
managerFilePatterns: [
354-
'.github/workflows/**'
354+
'.github/workflows/**',
355+
'**/*.gradle.kts'
355356
],
356357
matchStrings: [
357358
'(?<currentValue>\\d+) # renovate: datasource=java-version',
359+
'"(?<currentValue>\\d+)" // renovate: datasource=java-version',
358360
],
359361
depNameTemplate: 'java',
360362
extractVersionTemplate: '^(?<version>\\d+)',

‎.github/scripts/dependencies.dockerfile‎

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

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

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

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,18 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14+
with:
15+
fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
1416

15-
- name: Link check
17+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
18+
19+
- name: Link check - relative links (all files)
20+
if: github.event_name == 'pull_request'
21+
env:
22+
GITHUB_TOKEN: ${{ github.token }}
23+
run: mise run lint:local-links
24+
25+
- name: Link check (modified files only)
1626
env:
1727
GITHUB_TOKEN: ${{ github.token }}
18-
run: ./.github/scripts/link-check.sh
28+
run: mise run lint:links-in-modified-files --base origin/${{ github.base_ref }} --head ${{ github.event.pull_request.head.sha }} --event ${{ github.event_name }}

‎.github/workflows/reusable-pr-smoke-test-images.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,15 @@ on:
2222
skip-java-11:
2323
type: boolean
2424
required: false
25-
skip-java-17:
26-
type: boolean
27-
required: false
28-
skip-java-21:
29-
type: boolean
30-
required: false
3125

3226
permissions:
3327
contents: read
3428

3529
jobs:
3630
build:
3731
runs-on: ubuntu-latest
32+
env:
33+
LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
3834
steps:
3935
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4036

@@ -64,13 +60,10 @@ jobs:
6460
run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
6561

6662
- name: Build Java 17 Docker image
67-
if: "!inputs.skip-java-17"
6863
run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
6964

7065
- name: Build Java 21 Docker image
71-
if: "!inputs.skip-java-21"
7266
run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=21 -Djib.httpTimeout=120000 -Djib.console=plain
7367

74-
- name: Build Java 23 Docker image
75-
if: "!inputs.skip-java-23"
76-
run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=23 -Djib.httpTimeout=120000 -Djib.console=plain
68+
- name: Build Java ${{ env.LATEST_JAVA_VERSION }} Docker image
69+
run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=${{ env.LATEST_JAVA_VERSION }} -Djib.httpTimeout=120000 -Djib.console=plain

‎.github/workflows/reusable-publish-smoke-test-images.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ on:
2222
skip-java-11:
2323
type: boolean
2424
required: false
25-
skip-java-17:
26-
type: boolean
27-
required: false
28-
skip-java-21:
29-
type: boolean
30-
required: false
3125

3226
permissions:
3327
contents: read
@@ -38,6 +32,8 @@ jobs:
3832
permissions:
3933
contents: read
4034
packages: write
35+
env:
36+
LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
4137
steps:
4238
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4339

@@ -74,13 +70,10 @@ jobs:
7470
run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
7571

7672
- name: Build Java 17 Docker image
77-
if: "!inputs.skip-java-17"
7873
run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
7974

8075
- name: Build Java 21 Docker image
81-
if: "!inputs.skip-java-21"
8276
run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=21 -Djib.httpTimeout=120000 -Djib.console=plain
8377

84-
- name: Build Java 23 Docker image
85-
if: "!inputs.skip-java-23"
86-
run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=23 -Djib.httpTimeout=120000 -Djib.console=plain
78+
- name: Build Java ${{ env.LATEST_JAVA_VERSION }} Docker image
79+
run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=${{ env.LATEST_JAVA_VERSION }} -Djib.httpTimeout=120000 -Djib.console=plain

‎benchmark-overhead/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
testImplementation("org.testcontainers:postgresql:1.21.3")
2323
testImplementation("org.junit.jupiter:junit-jupiter-api")
2424
testImplementation("org.junit.jupiter:junit-jupiter-params")
25-
testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
25+
testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
2626
testImplementation("org.jooq:joox:2.0.1")
2727
testImplementation("com.jayway.jsonpath:json-path:2.9.0")
2828
testImplementation("org.slf4j:slf4j-simple:2.0.17")

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222

2323
buildscript {
2424
dependencies {
25-
classpath("com.squareup.okhttp3:okhttp:5.2.0")
25+
classpath("com.squareup.okhttp3:okhttp:5.2.1")
2626
}
2727
}
2828

0 commit comments

Comments
 (0)