Skip to content

Commit 3a36466

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-contrib into scraper-connect
2 parents edb3d6e + 71ea1d5 commit 3a36466

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ val DEPENDENCY_BOMS = listOf(
1313
"com.fasterxml.jackson:jackson-bom:2.18.0",
1414
"com.google.guava:guava-bom:33.3.1-jre",
1515
"com.linecorp.armeria:armeria-bom:1.30.1",
16-
"org.junit:junit-bom:5.11.1",
16+
"org.junit:junit-bom:5.11.2",
1717
"io.grpc:grpc-bom:1.68.0",
1818
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",
1919
"org.testcontainers:testcontainers-bom:1.20.1"
2020
)
2121

2222
val autoServiceVersion = "1.1.1"
2323
val autoValueVersion = "1.11.0"
24-
val errorProneVersion = "2.32.0"
24+
val errorProneVersion = "2.33.0"
2525
val prometheusVersion = "0.16.0"
2626
val mockitoVersion = "4.11.0"
2727
val slf4jVersion = "2.0.16"

gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import java.util.Optional;
6262
import java.util.logging.Logger;
6363

64+
@SuppressWarnings("MemberName")
6465
public class GCPResourceProvider implements ConditionalResourceProvider {
6566

6667
private static final Logger LOGGER = Logger.getLogger(GCPResourceProvider.class.getSimpleName());

jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderMXBeanConnection.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*
2929
* @see FlightRecorderConnection#connectToFlightRecorderMXBean(MBeanServerConnection)
3030
*/
31+
@SuppressWarnings("MemberName")
3132
final class FlightRecorderMXBeanConnection implements FlightRecorderConnection {
3233

3334
private static final String JFR_OBJECT_NAME = "jdk.management.jfr:type=FlightRecorder";

micrometer-meter-provider/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ dependencies {
2020
annotationProcessor("com.google.auto.value:auto-value")
2121
compileOnly("com.google.auto.value:auto-value-annotations")
2222

23-
testImplementation("io.micrometer:micrometer-core:1.13.4")
23+
testImplementation("io.micrometer:micrometer-core:1.13.5")
2424
}
2525

2626
testing {
2727
suites {
2828
val integrationTest by registering(JvmTestSuite::class) {
2929
dependencies {
30-
implementation("io.micrometer:micrometer-registry-prometheus:1.13.4")
30+
implementation("io.micrometer:micrometer-registry-prometheus:1.13.5")
3131
}
3232
}
3333
}

0 commit comments

Comments
 (0)