Skip to content

Fix nullaway convention plugin #14811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
Merged

Fix nullaway convention plugin #14811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecc5f3e
fix nullable plugin
jaydeluca Sep 26, 2025
935dc03
use different approach to disabling nullaway
jaydeluca Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,16 @@ nullaway {

tasks {
withType<JavaCompile>().configureEach {
if (name.contains("test", ignoreCase = true)) {
options.errorprone.nullaway {
enabled = false
}
} else {
options.errorprone.nullaway {
severity.set(CheckSeverity.ERROR)
}
}
options.errorprone.nullaway {
if (name.contains("test", ignoreCase = true)) {
disable()
} else {
error()
}
customInitializerAnnotations.add("org.openjdk.jmh.annotations.Setup")
excludedFieldAnnotations.add("org.mockito.Mock")
excludedFieldAnnotations.add("org.mockito.InjectMocks")
}
}
}

34 changes: 3 additions & 31 deletions ...ntation-docs/src/test/java/io/opentelemetry/instrumentation/docs/ManualTelemetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.instrumentation.docs;

import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;

import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down Expand Up @@ -142,40 +143,11 @@ void testEmptyAdditionalTelemetry() throws JsonProcessingException {

InstrumentationMetadata actualMetadata = YamlHelper.metaDataParser(yamlContent);

ManualTelemetryEntry defaultEntry =
new ManualTelemetryEntry(
"default",
List.of(
new ManualTelemetryEntry.ManualMetric(
"system.disk.io",
"System disk IO",
"LONG_SUM",
"By",
List.of(
new TelemetryAttribute("device", "STRING"),
new TelemetryAttribute("direction", "STRING")))),
List.of(
new ManualTelemetryEntry.ManualSpan(
"CLIENT", List.of(new TelemetryAttribute("custom.operation", "STRING")))));

ManualTelemetryEntry experimentalEntry =
new ManualTelemetryEntry(
"experimental",
List.of(
new ManualTelemetryEntry.ManualMetric(
"experimental.feature.usage",
"Usage of experimental features",
"HISTOGRAM",
"s",
List.of(new TelemetryAttribute("feature.name", "STRING")))),
List.of());

InstrumentationMetadata expectedMetadata =
new InstrumentationMetadata.Builder()
.description("Example instrumentation with manual telemetry documentation")
.libraryLink("https://example.com/library")
.description("Example without manual telemetry")
.semanticConventions(List.of(SemanticConvention.HTTP_CLIENT_SPANS))
.additionalTelemetry(List.of(defaultEntry, experimentalEntry))
.additionalTelemetry(emptyList())
.overrideTelemetry(false)
.build();

Expand Down