Bump spotless to 6.19 (#560)

* Bump spotless to 6.19 * fix broken import
open-telemetry · Jun 7, 2023 · d480a39 · d480a39
1 parent 5666e4d
commit d480a39
Show file tree

Hide file tree

Showing 150 changed files with 119 additions and 475 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     // keep this version in sync with /build.gradle.kts
     implementation("com.android.tools.build:gradle:8.0.2")
 
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.19.0")
     implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
     implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.6.0")
 }
diff --git a/...-android-instrumentation/src/main/java/io/opentelemetry/rum/internal/AndroidResource.java b/...-android-instrumentation/src/main/java/io/opentelemetry/rum/internal/AndroidResource.java
@@ -26,13 +26,10 @@
 
 import android.app.Application;
 import android.os.Build;
-
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
-
-import opentelemetry.rum.instrumentation.R;
-
 import java.util.function.Supplier;
+import opentelemetry.rum.instrumentation.R;
 
 final class AndroidResource {
 

diff --git a/...-instrumentation/src/main/java/io/opentelemetry/rum/internal/ApplicationStateWatcher.java b/...-instrumentation/src/main/java/io/opentelemetry/rum/internal/ApplicationStateWatcher.java
@@ -17,11 +17,8 @@
 package io.opentelemetry.rum.internal;
 
 import android.app.Activity;
-
 import androidx.annotation.NonNull;
-
 import io.opentelemetry.rum.internal.instrumentation.ApplicationStateListener;
-
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 

diff --git a/...ion/src/main/java/io/opentelemetry/rum/internal/DefaultingActivityLifecycleCallbacks.java b/...ion/src/main/java/io/opentelemetry/rum/internal/DefaultingActivityLifecycleCallbacks.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

diff --git a/...rumentation/src/main/java/io/opentelemetry/rum/internal/GlobalAttributesSpanAppender.java b/...rumentation/src/main/java/io/opentelemetry/rum/internal/GlobalAttributesSpanAppender.java
@@ -24,7 +24,6 @@
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.SpanProcessor;
-
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 

diff --git a/...trumentation/src/main/java/io/opentelemetry/rum/internal/InstrumentedApplicationImpl.java b/...trumentation/src/main/java/io/opentelemetry/rum/internal/InstrumentedApplicationImpl.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal;
 
 import android.app.Application;
-
 import io.opentelemetry.rum.internal.instrumentation.ApplicationStateListener;
 import io.opentelemetry.rum.internal.instrumentation.InstrumentedApplication;
 import io.opentelemetry.sdk.OpenTelemetrySdk;

diff --git a/...android-instrumentation/src/main/java/io/opentelemetry/rum/internal/OpenTelemetryRum.java b/...android-instrumentation/src/main/java/io/opentelemetry/rum/internal/OpenTelemetryRum.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal;
 
 import android.app.Application;
-
 import io.opentelemetry.api.OpenTelemetry;
 
 /**

diff --git a/...-instrumentation/src/main/java/io/opentelemetry/rum/internal/OpenTelemetryRumBuilder.java b/...-instrumentation/src/main/java/io/opentelemetry/rum/internal/OpenTelemetryRumBuilder.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal;
 
 import android.app.Application;
-
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.rum.internal.instrumentation.InstrumentedApplication;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -28,7 +27,6 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiFunction;

diff --git a/...emetry-android-instrumentation/src/main/java/io/opentelemetry/rum/internal/SessionId.java b/...emetry-android-instrumentation/src/main/java/io/opentelemetry/rum/internal/SessionId.java
@@ -19,10 +19,8 @@
 import static java.util.Objects.requireNonNull;
 
 import androidx.annotation.Nullable;
-
 import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.sdk.common.Clock;
-
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;

diff --git a/...strumentation/src/main/java/io/opentelemetry/rum/internal/SessionIdRatioBasedSampler.java b/...strumentation/src/main/java/io/opentelemetry/rum/internal/SessionIdRatioBasedSampler.java
@@ -22,7 +22,6 @@
 import io.opentelemetry.sdk.trace.data.LinkData;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;
-
 import java.util.List;
 
 /**

diff --git a/...-instrumentation/src/main/java/io/opentelemetry/rum/internal/SessionIdTimeoutHandler.java b/...-instrumentation/src/main/java/io/opentelemetry/rum/internal/SessionIdTimeoutHandler.java
@@ -18,7 +18,6 @@
 
 import io.opentelemetry.rum.internal.instrumentation.ApplicationStateListener;
 import io.opentelemetry.sdk.common.Clock;
-
 import java.util.concurrent.TimeUnit;
 
 /**

diff --git a/...android-instrumentation/src/main/java/io/opentelemetry/rum/internal/SpanDataModifier.java b/...android-instrumentation/src/main/java/io/opentelemetry/rum/internal/SpanDataModifier.java
@@ -22,7 +22,6 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

diff --git a/...ndroid-instrumentation/src/main/java/io/opentelemetry/rum/internal/SpanFilterBuilder.java b/...ndroid-instrumentation/src/main/java/io/opentelemetry/rum/internal/SpanFilterBuilder.java
@@ -18,7 +18,6 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;

diff --git a/.../src/main/java/io/opentelemetry/rum/internal/instrumentation/InstrumentedApplication.java b/.../src/main/java/io/opentelemetry/rum/internal/instrumentation/InstrumentedApplication.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal.instrumentation;
 
 import android.app.Application;
-
 import io.opentelemetry.rum.internal.OpenTelemetryRum;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 

diff --git a/...tion/src/main/java/io/opentelemetry/rum/internal/instrumentation/ScreenNameExtractor.java b/...tion/src/main/java/io/opentelemetry/rum/internal/instrumentation/ScreenNameExtractor.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal.instrumentation;
 
 import android.app.Activity;
-
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 

diff --git a/...c/main/java/io/opentelemetry/rum/internal/instrumentation/activity/ActivityCallbacks.java b/...c/main/java/io/opentelemetry/rum/internal/instrumentation/activity/ActivityCallbacks.java
@@ -18,10 +18,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import io.opentelemetry.rum.internal.DefaultingActivityLifecycleCallbacks;
 
 public class ActivityCallbacks implements DefaultingActivityLifecycleCallbacks {

diff --git a/.../src/main/java/io/opentelemetry/rum/internal/instrumentation/activity/ActivityTracer.java b/.../src/main/java/io/opentelemetry/rum/internal/instrumentation/activity/ActivityTracer.java
@@ -21,18 +21,15 @@
 import static io.opentelemetry.rum.internal.RumConstants.START_TYPE_KEY;
 
 import android.app.Activity;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.rum.internal.instrumentation.startup.AppStartupTimer;
 import io.opentelemetry.rum.internal.util.ActiveSpan;
-
 import java.util.concurrent.atomic.AtomicReference;
 
 public class ActivityTracer {

diff --git a/...main/java/io/opentelemetry/rum/internal/instrumentation/activity/ActivityTracerCache.java b/...main/java/io/opentelemetry/rum/internal/instrumentation/activity/ActivityTracerCache.java
@@ -17,13 +17,10 @@
 package io.opentelemetry.rum.internal.instrumentation.activity;
 
 import android.app.Activity;
-
 import androidx.annotation.VisibleForTesting;
-
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.rum.internal.instrumentation.ScreenNameExtractor;
 import io.opentelemetry.rum.internal.instrumentation.startup.AppStartupTimer;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;

diff --git a/...n/java/io/opentelemetry/rum/internal/instrumentation/activity/Pre29ActivityCallbacks.java b/...n/java/io/opentelemetry/rum/internal/instrumentation/activity/Pre29ActivityCallbacks.java
@@ -18,10 +18,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import io.opentelemetry.rum.internal.DefaultingActivityLifecycleCallbacks;
 
 public class Pre29ActivityCallbacks implements DefaultingActivityLifecycleCallbacks {

diff --git a/...entelemetry/rum/internal/instrumentation/activity/Pre29VisibleScreenLifecycleBinding.java b/...entelemetry/rum/internal/instrumentation/activity/Pre29VisibleScreenLifecycleBinding.java
@@ -17,9 +17,7 @@
 package io.opentelemetry.rum.internal.instrumentation.activity;
 
 import android.app.Activity;
-
 import androidx.annotation.NonNull;
-
 import io.opentelemetry.rum.internal.DefaultingActivityLifecycleCallbacks;
 
 /**

diff --git a/...io/opentelemetry/rum/internal/instrumentation/activity/RumFragmentActivityRegisterer.java b/...io/opentelemetry/rum/internal/instrumentation/activity/RumFragmentActivityRegisterer.java
@@ -19,12 +19,10 @@
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
-
 import io.opentelemetry.rum.internal.DefaultingActivityLifecycleCallbacks;
 
 /**

diff --git a/...io/opentelemetry/rum/internal/instrumentation/activity/VisibleScreenLifecycleBinding.java b/...io/opentelemetry/rum/internal/instrumentation/activity/VisibleScreenLifecycleBinding.java
@@ -17,9 +17,7 @@
 package io.opentelemetry.rum.internal.instrumentation.activity;
 
 import android.app.Activity;
-
 import androidx.annotation.NonNull;
-
 import io.opentelemetry.rum.internal.DefaultingActivityLifecycleCallbacks;
 
 /**

diff --git a/...ain/java/io/opentelemetry/rum/internal/instrumentation/activity/VisibleScreenTracker.java b/...ain/java/io/opentelemetry/rum/internal/instrumentation/activity/VisibleScreenTracker.java
@@ -17,12 +17,10 @@
 package io.opentelemetry.rum.internal.instrumentation.activity;
 
 import android.app.Activity;
-
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.fragment.NavHostFragment;
-
 import java.util.concurrent.atomic.AtomicReference;
 
 /**

diff --git a/...entation/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrDetector.java b/...entation/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrDetector.java
@@ -18,13 +18,11 @@
 
 import android.os.Handler;
 import android.os.Looper;
-
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.rum.internal.instrumentation.InstrumentedApplication;
-
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 

diff --git a/...n/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrDetectorBuilder.java b/...n/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrDetectorBuilder.java
@@ -17,9 +17,7 @@
 package io.opentelemetry.rum.internal.instrumentation.anr;
 
 import android.os.Looper;
-
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;

diff --git a/...n/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrDetectorToggler.java b/...n/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrDetectorToggler.java
@@ -17,9 +17,7 @@
 package io.opentelemetry.rum.internal.instrumentation.anr;
 
 import androidx.annotation.Nullable;
-
 import io.opentelemetry.rum.internal.instrumentation.ApplicationStateListener;
-
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

diff --git a/...mentation/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrWatcher.java b/...mentation/src/main/java/io/opentelemetry/rum/internal/instrumentation/anr/AnrWatcher.java
@@ -17,10 +17,8 @@
 package io.opentelemetry.rum.internal.instrumentation.anr;
 
 import android.os.Handler;
-
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...tion/src/main/java/io/opentelemetry/rum/internal/instrumentation/crash/CrashReporter.java b/...tion/src/main/java/io/opentelemetry/rum/internal/instrumentation/crash/CrashReporter.java
@@ -20,7 +20,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.rum.internal.instrumentation.InstrumentedApplication;
-
 import java.util.List;
 
 /** Entrypoint for installing the crash reporting instrumentation. */

diff --git a/...c/main/java/io/opentelemetry/rum/internal/instrumentation/crash/CrashReporterBuilder.java b/...c/main/java/io/opentelemetry/rum/internal/instrumentation/crash/CrashReporterBuilder.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal.instrumentation.crash;
 
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...a/io/opentelemetry/rum/internal/instrumentation/crash/CrashReportingExceptionHandler.java b/...a/io/opentelemetry/rum/internal/instrumentation/crash/CrashReportingExceptionHandler.java
@@ -17,12 +17,10 @@
 package io.opentelemetry.rum.internal.instrumentation.crash;
 
 import androidx.annotation.NonNull;
-
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
-
 import java.util.concurrent.TimeUnit;
 
 final class CrashReportingExceptionHandler implements Thread.UncaughtExceptionHandler {

diff --git a/.../src/main/java/io/opentelemetry/rum/internal/instrumentation/fragment/FragmentTracer.java b/.../src/main/java/io/opentelemetry/rum/internal/instrumentation/fragment/FragmentTracer.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.rum.internal.instrumentation.fragment;
 
 import androidx.fragment.app.Fragment;
-
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;

diff --git a/...io/opentelemetry/rum/internal/instrumentation/fragment/RumFragmentLifecycleCallbacks.java b/...io/opentelemetry/rum/internal/instrumentation/fragment/RumFragmentLifecycleCallbacks.java
@@ -19,17 +19,14 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.rum.internal.instrumentation.ScreenNameExtractor;
 import io.opentelemetry.rum.internal.instrumentation.activity.VisibleScreenTracker;
 import io.opentelemetry.rum.internal.util.ActiveSpan;
-
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/...opentelemetry/rum/internal/instrumentation/lifecycle/AndroidLifecycleInstrumentation.java b/...opentelemetry/rum/internal/instrumentation/lifecycle/AndroidLifecycleInstrumentation.java
@@ -18,9 +18,7 @@
 
 import android.app.Application;
 import android.os.Build;
-
 import androidx.annotation.NonNull;
-
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.rum.internal.instrumentation.InstrumentedApplication;
 import io.opentelemetry.rum.internal.instrumentation.ScreenNameExtractor;
@@ -33,7 +31,6 @@
 import io.opentelemetry.rum.internal.instrumentation.activity.VisibleScreenTracker;
 import io.opentelemetry.rum.internal.instrumentation.fragment.RumFragmentLifecycleCallbacks;
 import io.opentelemetry.rum.internal.instrumentation.startup.AppStartupTimer;
-
 import java.util.function.Function;
 
 /**

diff --git a/...emetry/rum/internal/instrumentation/lifecycle/AndroidLifecycleInstrumentationBuilder.java b/...emetry/rum/internal/instrumentation/lifecycle/AndroidLifecycleInstrumentationBuilder.java
@@ -20,7 +20,6 @@
 import io.opentelemetry.rum.internal.instrumentation.ScreenNameExtractor;
 import io.opentelemetry.rum.internal.instrumentation.activity.VisibleScreenTracker;
 import io.opentelemetry.rum.internal.instrumentation.startup.AppStartupTimer;
-
 import java.util.function.Function;
 
 public class AndroidLifecycleInstrumentationBuilder {

diff --git a/...entation/src/main/java/io/opentelemetry/rum/internal/instrumentation/network/Carrier.java b/...entation/src/main/java/io/opentelemetry/rum/internal/instrumentation/network/Carrier.java
@@ -18,10 +18,8 @@
 
 import android.os.Build;
 import android.telephony.TelephonyManager;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-
 import java.util.Objects;
 
 @RequiresApi(api = Build.VERSION_CODES.P)

diff --git a/...on/src/main/java/io/opentelemetry/rum/internal/instrumentation/network/CarrierFinder.java b/...on/src/main/java/io/opentelemetry/rum/internal/instrumentation/network/CarrierFinder.java
@@ -18,7 +18,6 @@
 
 import android.os.Build;
 import android.telephony.TelephonyManager;
-
 import androidx.annotation.RequiresApi;
 
 @RequiresApi(api = Build.VERSION_CODES.P)

diff --git a/...n/src/main/java/io/opentelemetry/rum/internal/instrumentation/network/CurrentNetwork.java b/...n/src/main/java/io/opentelemetry/rum/internal/instrumentation/network/CurrentNetwork.java
@@ -17,9 +17,7 @@
 package io.opentelemetry.rum.internal.instrumentation.network;
 
 import android.os.Build;
-
 import androidx.annotation.Nullable;
-
 import java.util.Objects;
 
 /** A value class representing the current network that the device is connected to. */
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     package io.opentelemetry.rum.internal;
     import android.app.Application;
     import io.opentelemetry.api.OpenTelemetry;
     /**
@@ Expand Down @@