open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run Gradle and compile code with Java 17 (#5623) 

* Run Gradle and compile code with Java 17

* Fix examples

* Update spotless version

* Add spotless Java 17 workaround

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
Anuraag Agrawal 2022-03-19 07:38:51 +09:00 committed by GitHub
parent 59b6ba72d5
commit cf805d87e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -103,11 +103,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Build and publish artifact snapshots
env:

4
.github/workflows/nightly-codeql-analysis.yml vendored
View File

@ -17,11 +17,11 @@ jobs:
with:
languages: java
- name: Setup Java 11
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Autobuild
uses: github/codeql-action/autobuild@v1

8
.github/workflows/pr-smoke-test-fake-backend-images.yml vendored
View File

@ -12,11 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Build Docker Image
uses: gradle/gradle-build-action@v2
@ -36,11 +36,11 @@ jobs:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Build Docker Image
uses: gradle/gradle-build-action@v2

4
.github/workflows/pr-smoke-test-play-images.yml vendored
View File

@ -22,11 +22,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Set up gradle cache
uses: gradle/gradle-build-action@v2

4
.github/workflows/pr-smoke-test-servlet-images.yml vendored
View File

@ -33,11 +33,11 @@ jobs:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Set up gradle cache
uses: gradle/gradle-build-action@v2

4
.github/workflows/publish-smoke-test-fake-backend-images.yml vendored
View File

@ -15,11 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Login to GitHub Package Registry
uses: docker/login-action@v1.10.0

4
.github/workflows/publish-smoke-test-play-images.yml vendored
View File

@ -25,11 +25,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Login to GitHub Package Registry
uses: docker/login-action@v1.10.0

4
.github/workflows/publish-smoke-test-servlet-images.yml vendored
View File

@ -39,11 +39,11 @@ jobs:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Login to GitHub Package Registry
uses: docker/login-action@v1.10.0

4
.github/workflows/release-gradle-plugins.yml vendored
View File

@ -38,11 +38,11 @@ jobs:
with:
ref: ${{ github.event.inputs.release-branch-name }}
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Build and publish gradle plugins
uses: gradle/gradle-build-action@v2

4
.github/workflows/release.yml vendored
View File

@ -32,11 +32,11 @@ jobs:
# tags are needed for the generate-release-contributors.sh script
fetch-depth: 0
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Build and publish artifacts
uses: gradle/gradle-build-action@v2

4
.github/workflows/reusable-build.yml vendored
View File

@ -23,11 +23,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Start deadlock detector
run: .github/scripts/deadlock-detector.sh

4
.github/workflows/reusable-examples.yml vendored
View File

@ -16,11 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Set up gradle cache
uses: gradle/gradle-build-action@v2

4
.github/workflows/reusable-muzzle.yml vendored
View File

@ -20,11 +20,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Run muzzle
uses: gradle/gradle-build-action@v2

4
.github/workflows/reusable-smoke-test-images.yml vendored
View File

@ -28,11 +28,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Login to GitHub Package Registry
if: ${{ inputs.publish }}

4
.github/workflows/reusable-smoke-test.yml vendored
View File

@ -49,11 +49,11 @@ jobs:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Test
env:

4
.github/workflows/reusable-test-latest-deps.yml vendored
View File

@ -33,12 +33,12 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
if: ${{ !inputs.skip }}
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
# vaadin tests use pnpm
- name: Cache pnpm modules

4
.github/workflows/reusable-test.yml vendored
View File

@ -40,11 +40,11 @@ jobs:
distribution: ${{ matrix.vm == 'hotspot' && 'temurin' || 'adopt-openj9'}}
java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
- name: Set up JDK for running Gradle
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
# vaadin tests use pnpm
- name: Cache pnpm modules

2
conventions/src/main/kotlin/otel.java-conventions.gradle.kts
View File

@ -27,7 +27,7 @@ afterEvaluate {
}
// Version to use to compile code and run tests.
val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_11
val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_17
java {
toolchain {

2
examples/distro/agent/build.gradle
View File

@ -1,5 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow") version "6.0.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
}
apply from: "$rootDir/gradle/shadow.gradle"

2
examples/distro/build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.1.2"
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0"
}
}

2
examples/distro/custom/build.gradle
View File

@ -1,6 +1,6 @@
plugins {
id "java"
id("com.github.johnrengelman.shadow") version "6.0.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
}
apply from: "$rootDir/gradle/shadow.gradle"

7
examples/distro/gradle.properties Normal file
View File

@ -0,0 +1,7 @@
# workaround for https://github.com/diffplug/spotless/issues/834
org.gradle.jvmargs=\
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

2
examples/distro/instrumentation/build.gradle
View File

@ -1,5 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow") version "6.0.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
}
apply from: "$rootDir/gradle/shadow.gradle"

4
examples/extension/build.gradle
View File

@ -10,8 +10,8 @@ plugins {
into a single jar.
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
*/
id "com.github.johnrengelman.shadow" version "6.1.0"
id "com.diffplug.spotless" version "6.1.2"
id "com.github.johnrengelman.shadow" version "7.1.2"
id "com.diffplug.spotless" version "6.3.0"
id "io.opentelemetry.instrumentation.muzzle-generation" version "1.13.0-alpha-SNAPSHOT"
id "io.opentelemetry.instrumentation.muzzle-check" version "1.13.0-alpha-SNAPSHOT"

7
examples/extension/gradle.properties Normal file
View File

@ -0,0 +1,7 @@
# workaround for https://github.com/diffplug/spotless/issues/834
org.gradle.jvmargs=\
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED