Skip to content

Commit f51096a

Browse files
authored
Run tests with 26-ea (open-telemetry#16289)
1 parent b1aa533 commit f51096a

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/build-common.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ jobs:
248248
- 21
249249
- 25 # renovate(java-version)
250250
- 25-deny-unsafe
251+
- 26-ea
251252
vm:
252253
- hotspot
253254
- openj9
@@ -263,6 +264,8 @@ jobs:
263264
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
264265
- test-java-version: 25-deny-unsafe
265266
vm: openj9
267+
- test-java-version: 26-ea
268+
vm: openj9
266269
fail-fast: false
267270
steps:
268271
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualified.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static com.google.errorprone.util.ASTHelpers.getGeneratedBy;
2828
import static com.google.errorprone.util.ASTHelpers.getSymbol;
2929
import static com.google.errorprone.util.ASTHelpers.getType;
30+
import static com.google.errorprone.util.ASTHelpers.hasExplicitSource;
3031
import static com.google.errorprone.util.ASTHelpers.isGeneratedConstructor;
3132
import static com.google.errorprone.util.FindIdentifiers.findIdent;
3233
import static com.sun.tools.javac.code.Kinds.KindSelector.VAL_TYP;
@@ -64,7 +65,6 @@
6465
import com.sun.tools.javac.code.Symbol.PackageSymbol;
6566
import com.sun.tools.javac.code.Symbol.TypeSymbol;
6667
import com.sun.tools.javac.code.Type;
67-
import com.sun.tools.javac.util.Position;
6868
import java.util.ArrayList;
6969
import java.util.HashSet;
7070
import java.util.List;
@@ -235,7 +235,7 @@ private void handle(TreePath path) {
235235
if (isDeprecatedForRemoval(symbol)) {
236236
return;
237237
}
238-
if (state.getEndPosition(tree) == Position.NOPOS) {
238+
if (!hasExplicitSource(tree, state)) {
239239
return;
240240
}
241241
List<TreePath> treePaths = table.get(tree.getIdentifier(), symbol.type.tsym);

custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelDeprecatedApiUsageTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ void positiveCases_externalDeprecatedApi() {
161161
"ExternalDeprecated.java",
162162
"package test;",
163163
"public class ExternalDeprecated {",
164-
" void method(Thread t) {",
164+
" void method() {",
165165
" // BUG: Diagnostic contains: Use of deprecated API",
166-
" t.stop();",
166+
" new Boolean(false);",
167167
" }",
168168
"}")
169169
.doTest();

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/internal/WrapperTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
import java.sql.ResultSet;
1616
import java.sql.Statement;
1717
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.condition.EnabledForJreRange;
19+
import org.junit.jupiter.api.condition.JRE;
1820

1921
class WrapperTest {
2022

23+
// we don't implement methods introduced in jdbc 4.5 (added in java 26) yet
24+
@EnabledForJreRange(max = JRE.JAVA_25)
2125
@Test
2226
void wrapperImplementsAllMethods() throws Exception {
2327
validate(Statement.class, OpenTelemetryStatement.class);

0 commit comments

Comments
 (0)