From 7ca901a5cb5a134f32963d1c593897898da311b4 Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <anuraaga@gmail.com>
Date: Fri, 3 Dec 2021 01:38:33 +0900
Subject: [PATCH] Update dependencies (#142)

* Update dependencies

* Apply spotless
---
 .../contrib/awsxray/SamplingRuleApplier.java  |  3 +-
 buildSrc/build.gradle.kts                     |  4 +--
 dependencyManagement/build.gradle.kts         | 32 +++++++++----------
 .../disruptor/trace/DisruptorEventQueue.java  |  6 ++--
 settings.gradle.kts                           |  2 +-
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java
index df5c19c2b..99876d5ba 100644
--- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java
+++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java
@@ -233,8 +233,7 @@ SamplingResult shouldSample(
     return result;
   }
 
-  @Nullable
-  SamplingStatisticsDocument snapshot(Date now) {
+  @Nullable SamplingStatisticsDocument snapshot(Date now) {
     if (clock.nanoTime() < nextSnapshotTimeNanos) {
       return null;
     }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 862dfdb07..31c7e7a54 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     `kotlin-dsl`
     // When updating, update below in dependencies too
-    id("com.diffplug.spotless") version "5.16.0"
+    id("com.diffplug.spotless") version "6.0.0"
 }
 
 repositories {
@@ -12,5 +12,5 @@ repositories {
 
 dependencies {
     // When updating, update above in plugins too
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
 }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 6ffd430f4..79a3dcdd4 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -12,41 +12,41 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 val DEPENDENCY_BOMS = listOf(
-    "com.fasterxml.jackson:jackson-bom:2.12.3",
-    "com.google.guava:guava-bom:30.1.1-jre",
-    "com.linecorp.armeria:armeria-bom:1.11.0",
-    "org.junit:junit-bom:5.7.2",
+    "com.fasterxml.jackson:jackson-bom:2.13.0",
+    "com.google.guava:guava-bom:31.0.1-jre",
+    "com.linecorp.armeria:armeria-bom:1.13.3",
+    "org.junit:junit-bom:5.8.2",
     "com.linecorp.armeria:armeria-bom:1.9.1",
-    "io.grpc:grpc-bom:1.39.0",
-    "io.opentelemetry:opentelemetry-bom:1.9.0",
-    "io.opentelemetry:opentelemetry-bom-alpha:1.9.0-alpha",
-    "org.testcontainers:testcontainers-bom:1.16.0"
+    "io.grpc:grpc-bom:1.42.1",
+    "io.opentelemetry:opentelemetry-bom:1.9.1",
+    "io.opentelemetry:opentelemetry-bom-alpha:1.9.1-alpha",
+    "org.testcontainers:testcontainers-bom:1.16.2"
 )
 
 val DEPENDENCY_SETS = listOf(
     DependencySet(
         "com.google.auto.service",
-        "1.0",
+        "1.0.1",
         listOf("auto-service", "auto-service-annotations")
     ),
     DependencySet(
         "com.google.auto.value",
-        "1.8.1",
+        "1.8.2",
         listOf("auto-value", "auto-value-annotations")
     ),
     DependencySet(
         "io.prometheus",
-        "0.11.0",
+        "0.12.0",
         listOf("simpleclient", "simpleclient_common", "simpleclient_httpserver")
     ),
     DependencySet(
         "org.mockito",
-        "3.11.1",
+        "4.1.0",
         listOf("mockito-core", "mockito-junit-jupiter")
     ),
     DependencySet(
         "org.slf4j",
-        "1.7.30",
+        "1.7.32",
         listOf("slf4j-api", "slf4j-simple", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j")
     )
 )
@@ -54,9 +54,9 @@ val DEPENDENCY_SETS = listOf(
 val DEPENDENCIES = listOf(
     "com.squareup.okhttp3:okhttp:3.14.9",
     "org.assertj:assertj-core:3.21.0",
-    "org.awaitility:awaitility:4.1.0",
-    "org.checkerframework:checker-qual:3.15.0",
-    "org.junit-pioneer:junit-pioneer:1.4.2",
+    "org.awaitility:awaitility:4.1.1",
+    "org.checkerframework:checker-qual:3.19.0",
+    "org.junit-pioneer:junit-pioneer:1.5.0",
     "org.skyscreamer:jsonassert:1.5.0"
 )
 
diff --git a/disruptor-processor/src/main/java/io/opentelemetry/contrib/disruptor/trace/DisruptorEventQueue.java b/disruptor-processor/src/main/java/io/opentelemetry/contrib/disruptor/trace/DisruptorEventQueue.java
index 5ecdc5b3f..f70087781 100644
--- a/disruptor-processor/src/main/java/io/opentelemetry/contrib/disruptor/trace/DisruptorEventQueue.java
+++ b/disruptor-processor/src/main/java/io/opentelemetry/contrib/disruptor/trace/DisruptorEventQueue.java
@@ -144,13 +144,11 @@ void setEntry(
       this.result = result;
     }
 
-    @Nullable
-    Object getEventArgs() {
+    @Nullable Object getEventArgs() {
       return eventArgs;
     }
 
-    @Nullable
-    EventType getEventType() {
+    @Nullable EventType getEventType() {
       return eventType;
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2f8d99567..050c89df4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
         id("com.github.ben-manes.versions") version "0.39.0"
-        id("com.github.johnrengelman.shadow") version "7.0.0"
+        id("com.github.johnrengelman.shadow") version "7.1.0"
         id("org.unbroken-dome.test-sets") version "4.0.0"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("nebula.release") version "16.0.0"