Dependency and gradle updates (#605)

* update build tools to 33.0.1 and update gradle wrapper to 8.2.1. This also updates the volley getter to use the new apis.

* add getNetworkTransport

Author: breedx-splk

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

gradlew

@@ -11,7 +11,7 @@ android {
     namespace = "opentelemetry.rum.instrumentation"
 
     compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "33.0.1"
 
     defaultConfig {
         minSdk = 21

opentelemetry-android-instrumentation/build.gradle.kts

@@ -12,7 +12,7 @@ android {
     namespace = "com.splunk.android.sample"
 
     compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "33.0.1"
 
     defaultConfig {
         applicationId = "com.splunk.android.sample"

sample-app/build.gradle.kts

@@ -17,7 +17,6 @@
 package com.splunk.android.sample;
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
-import static org.apache.http.conn.ssl.SSLSocketFactory.SSL;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -195,7 +194,7 @@ private Call.Factory buildOkHttpClient(SplunkRum splunkRum) {
         try {
             // NOTE: This is really bad and dangerous. Don't ever do this in the real world.
             // it's only necessary because the demo endpoint uses a self-signed SSL cert.
-            SSLContext sslContext = SSLContext.getInstance(SSL);
+            SSLContext sslContext = SSLContext.getInstance("SSL");
             sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
             SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
             return splunkRum.createRumOkHttpCallFactory(

sample-app/src/main/java/com/splunk/android/sample/FirstFragment.java

@@ -10,7 +10,7 @@ android {
     namespace = "com.splunk.android.rum.volley"
 
     compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "33.0.1"
 
     defaultConfig {
         minSdk = 21

splunk-otel-android-volley/build.gradle.kts

@@ -24,6 +24,7 @@
 import com.android.volley.Request;
 import com.android.volley.toolbox.HttpResponse;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
+import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +38,16 @@ public String getUrlFull(RequestWrapper requestWrapper) {
         return requestWrapper.getRequest().getUrl();
     }
 
+    @Override
+    public String getServerAddress(RequestWrapper requestWrapper) {
+        return UrlParser.getHost(requestWrapper.getRequest().getUrl());
+    }
+
+    @Override
+    public Integer getServerPort(RequestWrapper requestWrapper) {
+        return UrlParser.getPort(requestWrapper.getRequest().getUrl());
+    }
+
     @Nullable
     @Override
     public String getHttpRequestMethod(RequestWrapper requestWrapper) {
@@ -116,4 +127,14 @@ static List<String> headersToList(List<Header> headers, String name) {
         }
         return headersList;
     }
+
+    @Override
+    public String getTransport(RequestWrapper requestWrapper, HttpResponse httpResponse) {
+        return SemanticAttributes.NetTransportValues.IP_TCP;
+    }
+
+    @Override
+    public String getNetworkTransport(RequestWrapper requestWrapper, HttpResponse httpResponse) {
+        return "tcp";
+    }
 }

splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyHttpClientAttributesGetter.java

@@ -40,8 +40,7 @@ public final class VolleyTracingBuilder {
     private final HttpClientAttributesExtractorBuilder<RequestWrapper, HttpResponse>
             httpClientAttributesExtractorBuilder =
                     HttpClientAttributesExtractor.builder(
-                            VolleyHttpClientAttributesGetter.INSTANCE,
-                            VolleyNetClientAttributesGetter.INSTANCE);
+                            VolleyHttpClientAttributesGetter.INSTANCE);
 
     VolleyTracingBuilder(OpenTelemetry openTelemetry) {
         this.openTelemetry = openTelemetry;

splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyNetClientAttributesGetter.java

@@ -8,7 +8,7 @@ android {
     namespace = "com.splunk.android.rum"
 
     compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "33.0.1"
 
     defaultConfig {
         minSdk = 21