Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ dependencies {
implementation("com.squareup:javapoet:1.13.0")
implementation("com.squareup.wire:wire-compiler")
implementation("com.squareup.wire:wire-gradle-plugin")
implementation("com.google.protobuf:protobuf-gradle-plugin:0.10.0")
implementation("com.google.protobuf:protobuf-gradle-plugin:0.10.1")
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.4")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.1")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.2.0")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.3.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.21")
implementation("org.sonatype.gradle.plugins:scan-gradle-plugin:4.1.1-01")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ java {

checkstyle {
configDirectory.set(file("$rootDir/buildscripts/"))
toolVersion = "14.3.0"
toolVersion = "14.4.0"
isIgnoreFailures = false
configProperties["rootDir"] = rootDir
}
Expand Down
10 changes: 5 additions & 5 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions


val autoValueVersion = "1.11.1"
val errorProneVersion = "2.51.0"
val errorProneVersion = "2.52.0"
val jmhVersion = "1.37"
// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
val mockitoVersion = "4.11.0"
Expand All @@ -28,12 +28,12 @@ val DEPENDENCY_BOMS = listOf(
// by FOSSA for containing EPL-licensed)

"com.fasterxml.jackson:jackson-bom:2.22.4",
"com.google.guava:guava-bom:33.7.2-jre",
"com.google.guava:guava-bom:33.8.0-jre",
"com.google.protobuf:protobuf-bom:4.36.2",
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
"com.squareup.okio:okio-bom:3.18.2", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.85.1",
"io.netty:netty-bom:4.2.19.Final",
"io.netty:netty-bom:4.2.20.Final",
"org.assertj:assertj-bom:3.27.7",
"org.osgi:org.osgi.test.bom:1.3.0",
"org.testcontainers:testcontainers-bom:2.0.5",
Expand Down Expand Up @@ -84,8 +84,8 @@ val DEPENDENCIES = listOf(
"io.github.netmikey.logunit:logunit-jul:2.0.0",
"io.jaegertracing:jaeger-client:1.8.1",
"io.opentelemetry.instrumentation:opentelemetry-resources:2.28.1-alpha",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.61.0-alpha",
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.44.0-alpha",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.62.0-alpha",
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.45.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.11.1-alpha",
"io.opentracing:opentracing-api:0.33.0",
"io.opentracing:opentracing-noop:0.33.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private SemConvConstants() {}
public static final String OTEL_SDK_LOG_CREATED_NAME = "otel.sdk.log.created";
public static final String OTEL_SDK_LOG_CREATED_UNIT = "{log_record}";
public static final String OTEL_SDK_LOG_CREATED_DESCRIPTION =
"The number of logs submitted to enabled SDK Loggers.";
"The number of log records submitted to an enabled `Logger`.";

public static final String OTEL_SDK_PROCESSOR_LOG_PROCESSED_NAME =
"otel.sdk.processor.log.processed";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
class SemConvConstantsTest {

@Test
@SuppressWarnings("deprecation") // Retain rpc.response.status_code until a separate migration.
void attributeKeys() {
assertThat(SemConvConstants.SCHEMA_URL_V1_40_0).isEqualTo(SchemaUrls.V1_40_0);

Expand Down
Loading