diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 86a35f8ecf..b81f47db18 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -29,7 +29,7 @@ val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.18.3", "com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637 - "com.google.guava:guava-bom:33.4.0-jre", + "com.google.guava:guava-bom:33.4.5-jre", "org.apache.groovy:groovy-bom:${groovyVersion}", "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}", diff --git a/docs/contributing/style-guideline.md b/docs/contributing/style-guideline.md index 69f69da3fd..d8249cb657 100644 --- a/docs/contributing/style-guideline.md +++ b/docs/contributing/style-guideline.md @@ -108,18 +108,7 @@ All parameters and fields which can be `null` should be annotated with `@Nullabl (specifically `javax.annotation.Nullable`, which is included by the `otel.java-conventions` gradle plugin as a `compileOnly` dependency). -There is no need to use `@NonNull`, as this is the default, which should be declared in a -`package-info.java` file on the root package of each module, e.g. - -```java -@DefaultQualifier( - value = NonNull.class, - locations = {TypeUseLocation.FIELD, TypeUseLocation.PARAMETER, TypeUseLocation.RETURN}) -package io.opentelemetry.instrumentation.api; - -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.framework.qual.DefaultQualifier; -``` +There is no need to use `@NonNull`, as this is the default. Public APIs should still defensively check for `null` parameters, even if the parameter is not annotated with `@Nullable`. Internal APIs do not need to defensively check for `null` parameters. diff --git a/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/package-info.java b/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/package-info.java deleted file mode 100644 index d24bc3c32c..0000000000 --- a/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -@DefaultQualifier( - value = NonNull.class, - locations = {TypeUseLocation.FIELD, TypeUseLocation.PARAMETER, TypeUseLocation.RETURN}) -package io.opentelemetry.javaagent.instrumentation.zio.v2_0; - -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.framework.qual.DefaultQualifier; -import org.checkerframework.framework.qual.TypeUseLocation;