Skip to content

Commit 5d00eb2

Browse files
fix(deps): update errorprone packages to v2.43.0 (#2393)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 064dae6 commit 5d00eb2

File tree

17 files changed

+48
-28
lines changed

17 files changed

+48
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2323
with:
2424
distribution: temurin
25-
java-version: 17
25+
java-version: 21
2626

2727
- name: Set up gradle
2828
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/build-common.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2828
with:
2929
distribution: temurin
30-
java-version: 17
30+
java-version: 21
3131

3232
- name: Set up Gradle
3333
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4949
with:
5050
distribution: temurin
51-
java-version: 17
51+
java-version: 21
5252

5353
- name: Set up Gradle
5454
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
107107
with:
108108
distribution: temurin
109-
java-version: 17
109+
java-version: 21
110110

111111
- name: Set up Gradle
112112
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3333
with:
3434
distribution: temurin
35-
java-version: 17
35+
java-version: 21
3636

3737
- name: Set up gradle
3838
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
steps:
3939
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040

41-
- name: Set up Java 17
41+
- name: Set up Java
4242
if: matrix.language == 'java'
4343
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4444
with:
4545
distribution: temurin
46-
java-version: 17
46+
java-version: 21
4747

4848
- name: Set up gradle
4949
if: matrix.language == 'java'

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
28-
java-version: 17
28+
java-version: 21
2929

3030
- name: Set up gradle
3131
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/owasp-dependency-check-daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2222
with:
2323
distribution: temurin
24-
java-version: 17
24+
java-version: 21
2525

2626
- name: Increase gradle daemon heap size
2727
run: |

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
8787
with:
8888
distribution: temurin
89-
java-version: 17
89+
java-version: 21
9090

9191
- name: Set up gradle
9292
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
@@ -234,7 +234,7 @@ jobs:
234234
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
235235
with:
236236
distribution: temurin
237-
java-version: 17
237+
java-version: 21
238238

239239
- name: Set up Gradle
240240
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Pull requests for bug fixes are always welcome!
1717

1818
## Building and Testing
1919

20-
While most modules target Java 8, building this project requires Java 17 or higher.
20+
While most modules target Java 8, building this project requires Java 21 or higher.
2121

2222
To build the project:
2323

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClient.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import okhttp3.Request;
2828
import okhttp3.RequestBody;
2929
import okhttp3.Response;
30-
import okhttp3.ResponseBody;
3130

3231
/** A simple HTTP client based on OkHttp. Not meant for high throughput. */
3332
final class SimpleHttpClient {
@@ -83,8 +82,7 @@ public String fetchString(
8382
+ response.message());
8483
return "";
8584
}
86-
ResponseBody body = response.body();
87-
return body != null ? body.string() : "";
85+
return response.body().string();
8886
} catch (IOException e) {
8987
logger.log(FINE, "SimpleHttpClient fetch string failed.", e);
9088
}

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XraySamplerClient.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import okhttp3.Request;
4747
import okhttp3.RequestBody;
4848
import okhttp3.Response;
49-
import okhttp3.ResponseBody;
5049

5150
final class XraySamplerClient {
5251

@@ -125,11 +124,7 @@ private static String readResponse(Response response, String endpoint) throws IO
125124
return "";
126125
}
127126

128-
ResponseBody body = response.body();
129-
if (body != null) {
130-
return body.string();
131-
}
132-
return "";
127+
return response.body().string();
133128
}
134129

135130
// Visible for testing

0 commit comments

Comments
 (0)