update and run spotless (#519)

open-telemetry · Apr 7, 2023 · 05a40f3 · 05a40f3
1 parent b2b8715
commit 05a40f3
Show file tree

Hide file tree

Showing 145 changed files with 461 additions and 114 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:7.4.2")
 
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.17.0")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
     implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1")
     implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0")
 }
diff --git a/sample-app/src/androidTest/java/com/splunk/android/sample/ExampleInstrumentedTest.java b/sample-app/src/androidTest/java/com/splunk/android/sample/ExampleInstrumentedTest.java
@@ -19,8 +19,10 @@
 import static org.junit.Assert.*;
 
 import android.content.Context;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/DemoAnimatedView.java b/sample-app/src/main/java/com/splunk/android/sample/DemoAnimatedView.java
@@ -25,8 +25,10 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;

diff --git a/sample-app/src/main/java/com/splunk/android/sample/FirstFragment.java b/sample-app/src/main/java/com/splunk/android/sample/FirstFragment.java
@@ -17,40 +17,48 @@
 package com.splunk.android.sample;
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
+
 import static org.apache.http.conn.ssl.SSLSocketFactory.SSL;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.navigation.fragment.NavHostFragment;
+
 import com.splunk.android.sample.databinding.FragmentFirstBinding;
 import com.splunk.rum.SplunkRum;
+
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Scope;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+
 import java.io.IOException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
 
 public class FirstFragment extends Fragment {
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/MailDialogFragment.java b/sample-app/src/main/java/com/splunk/android/sample/MailDialogFragment.java
@@ -21,9 +21,12 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
+
 import com.splunk.rum.SplunkRum;
+
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/MainActivity.java b/sample-app/src/main/java/com/splunk/android/sample/MainActivity.java
@@ -29,6 +29,7 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresPermission;
 import androidx.appcompat.app.AppCompatActivity;
@@ -38,10 +39,13 @@
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
+
 import com.splunk.android.sample.databinding.ActivityMainBinding;
 import com.splunk.rum.RumScreenName;
 import com.splunk.rum.SplunkRum;
+
 import io.opentelemetry.api.common.Attributes;
+
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/SampleApplication.java b/sample-app/src/main/java/com/splunk/android/sample/SampleApplication.java
@@ -19,9 +19,12 @@
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
 import android.app.Application;
+
 import com.splunk.rum.SplunkRum;
 import com.splunk.rum.StandardAttributes;
+
 import io.opentelemetry.api.common.Attributes;
+
 import java.time.Duration;
 import java.util.regex.Pattern;
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/SecondFragment.java b/sample-app/src/main/java/com/splunk/android/sample/SecondFragment.java
@@ -21,19 +21,23 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import androidx.annotation.NonNull;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.navigation.fragment.NavHostFragment;
+
 import com.splunk.android.sample.databinding.FragmentSecondBinding;
 import com.splunk.rum.RumScreenName;
 import com.splunk.rum.SplunkRum;
+
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
+
 import java.util.Random;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/sample-app/src/main/java/com/splunk/android/sample/ShopWebViewFragment.java b/sample-app/src/main/java/com/splunk/android/sample/ShopWebViewFragment.java
@@ -23,10 +23,12 @@
 import android.view.ViewGroup;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.webkit.WebViewClientCompat;
+
 import com.splunk.android.sample.databinding.FragmentWebViewBinding;
 import com.splunk.rum.SplunkRum;
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/VolleyExample.java b/sample-app/src/main/java/com/splunk/android/sample/VolleyExample.java
@@ -27,8 +27,10 @@
 import com.android.volley.toolbox.HurlStack;
 import com.android.volley.toolbox.NoCache;
 import com.android.volley.toolbox.StringRequest;
+
 import com.splunk.rum.SplunkRum;
 import com.splunk.rum.VolleyTracing;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;

diff --git a/sample-app/src/main/java/com/splunk/android/sample/WebViewFragment.java b/sample-app/src/main/java/com/splunk/android/sample/WebViewFragment.java
@@ -26,13 +26,16 @@
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.webkit.WebViewAssetLoader;
 import androidx.webkit.WebViewClientCompat;
+
 import com.splunk.android.sample.databinding.FragmentWebViewBinding;
 import com.splunk.rum.SplunkRum;
+
 import io.opentelemetry.api.common.Attributes;
 
 /** A simple {@link Fragment} subclass with a WebView in it. */

diff --git a/splunk-otel-android-volley/src/main/java/com/splunk/rum/RequestWrapper.java b/splunk-otel-android-volley/src/main/java/com/splunk/rum/RequestWrapper.java
@@ -17,6 +17,7 @@
 package com.splunk.rum;
 
 import com.android.volley.Request;
+
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/splunk-otel-android-volley/src/main/java/com/splunk/rum/TracingHurlStack.java b/splunk-otel-android-volley/src/main/java/com/splunk/rum/TracingHurlStack.java
@@ -20,11 +20,14 @@
 import com.android.volley.Request;
 import com.android.volley.toolbox.HttpResponse;
 import com.android.volley.toolbox.HurlStack;
+
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+
 import java.io.IOException;
 import java.util.Map;
+
 import javax.net.ssl.SSLSocketFactory;
 
 final class TracingHurlStack extends HurlStack {

diff --git a/...nk-otel-android-volley/src/main/java/com/splunk/rum/VolleyHttpClientAttributesGetter.java b/...nk-otel-android-volley/src/main/java/com/splunk/rum/VolleyHttpClientAttributesGetter.java
@@ -19,11 +19,14 @@
 import static java.util.Collections.emptyList;
 
 import androidx.annotation.Nullable;
+
 import com.android.volley.AuthFailureError;
 import com.android.volley.Header;
 import com.android.volley.Request;
 import com.android.volley.toolbox.HttpResponse;
+
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyNetClientAttributesGetter.java b/splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyNetClientAttributesGetter.java
@@ -17,7 +17,9 @@
 package com.splunk.rum;
 
 import androidx.annotation.Nullable;
+
 import com.android.volley.toolbox.HttpResponse;
+
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 

diff --git a/...k-otel-android-volley/src/main/java/com/splunk/rum/VolleyResponseAttributesExtractor.java b/...k-otel-android-volley/src/main/java/com/splunk/rum/VolleyResponseAttributesExtractor.java
@@ -21,8 +21,10 @@
 import static com.splunk.rum.SplunkRum.LINK_TRACE_ID_KEY;
 
 import androidx.annotation.Nullable;
+
 import com.android.volley.Header;
 import com.android.volley.toolbox.HttpResponse;
+
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;

diff --git a/splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyTracing.java b/splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyTracing.java
@@ -18,8 +18,10 @@
 
 import com.android.volley.toolbox.HttpResponse;
 import com.android.volley.toolbox.HurlStack;
+
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+
 import javax.net.ssl.SSLSocketFactory;
 
 /** Entrypoint for tracing Volley clients. */

diff --git a/splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyTracingBuilder.java b/splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyTracingBuilder.java
@@ -17,6 +17,7 @@
 package com.splunk.rum;
 
 import com.android.volley.toolbox.HttpResponse;
+
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
@@ -26,6 +27,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractorBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
+
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/splunk-otel-android-volley/src/test/java/com/splunk/rum/TestRequestQueue.java b/splunk-otel-android-volley/src/test/java/com/splunk/rum/TestRequestQueue.java
@@ -24,6 +24,7 @@
 import com.android.volley.toolbox.BasicNetwork;
 import com.android.volley.toolbox.HurlStack;
 import com.android.volley.toolbox.NoCache;
+
 import java.util.concurrent.Executors;
 
 class TestRequestQueue {

diff --git a/splunk-otel-android-volley/src/test/java/com/splunk/rum/TracingHurlStackExceptionTest.java b/splunk-otel-android-volley/src/test/java/com/splunk/rum/TracingHurlStackExceptionTest.java
@@ -17,24 +17,28 @@
 package com.splunk.rum;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.HurlStack;
 import com.android.volley.toolbox.RequestFuture;
 import com.android.volley.toolbox.StringRequest;
+
 import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 @RunWith(RobolectricTestRunner.class)
 public class TracingHurlStackExceptionTest {
 

diff --git a/splunk-otel-android-volley/src/test/java/com/splunk/rum/TracingHurlStackTest.java b/splunk-otel-android-volley/src/test/java/com/splunk/rum/TracingHurlStackTest.java
@@ -27,14 +27,24 @@
 import com.android.volley.toolbox.HurlStack;
 import com.android.volley.toolbox.RequestFuture;
 import com.android.volley.toolbox.StringRequest;
+
 import com.google.mockwebserver.MockResponse;
 import com.google.mockwebserver.MockWebServer;
+
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.URL;
@@ -45,12 +55,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class TracingHurlStackTest {

diff --git a/...tel-android-volley/src/test/java/com/splunk/rum/VolleyHttpClientAttributesGetterTest.java b/...tel-android-volley/src/test/java/com/splunk/rum/VolleyHttpClientAttributesGetterTest.java
@@ -24,13 +24,15 @@
 import com.android.volley.Header;
 import com.android.volley.Request;
 import com.android.volley.toolbox.HttpResponse;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class VolleyHttpClientAttributesGetterTest {