Merge pull request #1826 from DataDog/nogorodnikov/rum-1308/add-more-…

…http-methods-to-rum RUM-1308: Add more HTTP methods to RUM
DataDog · Jan 17, 2024 · 8c57aad · 8c57aad
2 parents 1e97c29 + 2284a01
commit 8c57aad
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 15 deletions.
diff --git a/features/dd-sdk-android-rum/api/apiSurface b/features/dd-sdk-android-rum/api/apiSurface
@@ -139,6 +139,9 @@ enum com.datadog.android.rum.RumResourceMethod
   - PUT
   - DELETE
   - PATCH
+  - TRACE
+  - OPTIONS
+  - CONNECT
 interface com.datadog.android.rum.RumSessionListener
   fun onSessionStarted(String, Boolean)
 class com.datadog.android.rum._RumInternalProxy
@@ -775,6 +778,9 @@ data class com.datadog.android.rum.model.ErrorEvent
     - PUT
     - DELETE
     - PATCH
+    - TRACE
+    - OPTIONS
+    - CONNECT
     fun toJson(): com.google.gson.JsonElement
     companion object 
       fun fromJson(kotlin.String): Method
@@ -1261,6 +1267,9 @@ data class com.datadog.android.rum.model.ResourceEvent
     - PUT
     - DELETE
     - PATCH
+    - TRACE
+    - OPTIONS
+    - CONNECT
     fun toJson(): com.google.gson.JsonElement
     companion object 
       fun fromJson(kotlin.String): Method

diff --git a/features/dd-sdk-android-rum/api/dd-sdk-android-rum.api b/features/dd-sdk-android-rum/api/dd-sdk-android-rum.api
@@ -201,12 +201,15 @@ public final class com/datadog/android/rum/RumResourceKind$Companion {
 }
 
 public final class com/datadog/android/rum/RumResourceMethod : java/lang/Enum {
+	public static final field CONNECT Lcom/datadog/android/rum/RumResourceMethod;
 	public static final field DELETE Lcom/datadog/android/rum/RumResourceMethod;
 	public static final field GET Lcom/datadog/android/rum/RumResourceMethod;
 	public static final field HEAD Lcom/datadog/android/rum/RumResourceMethod;
+	public static final field OPTIONS Lcom/datadog/android/rum/RumResourceMethod;
 	public static final field PATCH Lcom/datadog/android/rum/RumResourceMethod;
 	public static final field POST Lcom/datadog/android/rum/RumResourceMethod;
 	public static final field PUT Lcom/datadog/android/rum/RumResourceMethod;
+	public static final field TRACE Lcom/datadog/android/rum/RumResourceMethod;
 	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/rum/RumResourceMethod;
 	public static fun values ()[Lcom/datadog/android/rum/RumResourceMethod;
 }
@@ -1715,13 +1718,16 @@ public final class com/datadog/android/rum/model/ErrorEvent$Interface$Companion
 }
 
 public final class com/datadog/android/rum/model/ErrorEvent$Method : java/lang/Enum {
+	public static final field CONNECT Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final field Companion Lcom/datadog/android/rum/model/ErrorEvent$Method$Companion;
 	public static final field DELETE Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final field GET Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final field HEAD Lcom/datadog/android/rum/model/ErrorEvent$Method;
+	public static final field OPTIONS Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final field PATCH Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final field POST Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final field PUT Lcom/datadog/android/rum/model/ErrorEvent$Method;
+	public static final field TRACE Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/rum/model/ErrorEvent$Method;
 	public final fun toJson ()Lcom/google/gson/JsonElement;
 	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/rum/model/ErrorEvent$Method;
@@ -3221,13 +3227,16 @@ public final class com/datadog/android/rum/model/ResourceEvent$Interface$Compani
 }
 
 public final class com/datadog/android/rum/model/ResourceEvent$Method : java/lang/Enum {
+	public static final field CONNECT Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final field Companion Lcom/datadog/android/rum/model/ResourceEvent$Method$Companion;
 	public static final field DELETE Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final field GET Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final field HEAD Lcom/datadog/android/rum/model/ResourceEvent$Method;
+	public static final field OPTIONS Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final field PATCH Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final field POST Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final field PUT Lcom/datadog/android/rum/model/ResourceEvent$Method;
+	public static final field TRACE Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public static final fun fromJson (Ljava/lang/String;)Lcom/datadog/android/rum/model/ResourceEvent$Method;
 	public final fun toJson ()Lcom/google/gson/JsonElement;
 	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/rum/model/ResourceEvent$Method;

diff --git a/features/dd-sdk-android-rum/src/main/json/rum/error-schema.json b/features/dd-sdk-android-rum/src/main/json/rum/error-schema.json
@@ -123,7 +123,7 @@
                 "method": {
                   "type": "string",
                   "description": "HTTP method of the resource",
-                  "enum": ["POST", "GET", "HEAD", "PUT", "DELETE", "PATCH"],
+                  "enum": ["POST", "GET", "HEAD", "PUT", "DELETE", "PATCH", "TRACE", "OPTIONS", "CONNECT"],
                   "readOnly": true
                 },
                 "status_code": {

diff --git a/features/dd-sdk-android-rum/src/main/json/rum/resource-schema.json b/features/dd-sdk-android-rum/src/main/json/rum/resource-schema.json
@@ -43,7 +43,7 @@
             "method": {
               "type": "string",
               "description": "HTTP method of the resource",
-              "enum": ["POST", "GET", "HEAD", "PUT", "DELETE", "PATCH"],
+              "enum": ["POST", "GET", "HEAD", "PUT", "DELETE", "PATCH", "TRACE", "OPTIONS", "CONNECT"],
               "readOnly": true
             },
             "url": {

diff --git a/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumResourceMethod.kt b/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumResourceMethod.kt
@@ -39,5 +39,20 @@ enum class RumResourceMethod {
     /**
      * PATCH Method.
      */
-    PATCH
+    PATCH,
+
+    /**
+     * TRACE Method.
+     */
+    TRACE,
+
+    /**
+     * OPTIONS Method.
+     */
+    OPTIONS,
+
+    /**
+     * CONNECT Method.
+     */
+    CONNECT
 }
diff --git a/...-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumEventExt.kt b/...-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumEventExt.kt
@@ -33,6 +33,9 @@ internal fun RumResourceMethod.toResourceMethod(): ResourceEvent.Method {
         RumResourceMethod.PUT -> ResourceEvent.Method.PUT
         RumResourceMethod.DELETE -> ResourceEvent.Method.DELETE
         RumResourceMethod.PATCH -> ResourceEvent.Method.PATCH
+        RumResourceMethod.TRACE -> ResourceEvent.Method.TRACE
+        RumResourceMethod.OPTIONS -> ResourceEvent.Method.OPTIONS
+        RumResourceMethod.CONNECT -> ResourceEvent.Method.CONNECT
     }
 }
 
@@ -44,6 +47,9 @@ internal fun RumResourceMethod.toErrorMethod(): ErrorEvent.Method {
         RumResourceMethod.PUT -> ErrorEvent.Method.PUT
         RumResourceMethod.DELETE -> ErrorEvent.Method.DELETE
         RumResourceMethod.PATCH -> ErrorEvent.Method.PATCH
+        RumResourceMethod.TRACE -> ErrorEvent.Method.TRACE
+        RumResourceMethod.OPTIONS -> ErrorEvent.Method.OPTIONS
+        RumResourceMethod.CONNECT -> ErrorEvent.Method.CONNECT
     }
 }
 

diff --git a/...android-rum/src/main/kotlin/com/datadog/android/rum/internal/monitor/DatadogRumMonitor.kt b/...android-rum/src/main/kotlin/com/datadog/android/rum/internal/monitor/DatadogRumMonitor.kt
@@ -204,6 +204,9 @@ internal class DatadogRumMonitor(
             "PUT" -> RumResourceMethod.PUT
             "DELETE" -> RumResourceMethod.DELETE
             "PATCH" -> RumResourceMethod.PATCH
+            "CONNECT" -> RumResourceMethod.CONNECT
+            "TRACE" -> RumResourceMethod.TRACE
+            "OPTIONS" -> RumResourceMethod.OPTIONS
             else -> {
                 sdkCore.internalLogger.log(
                     InternalLogger.Level.WARN,

diff --git a/...oid-rum/src/test/kotlin/com/datadog/android/rum/internal/monitor/DatadogRumMonitorTest.kt b/...oid-rum/src/test/kotlin/com/datadog/android/rum/internal/monitor/DatadogRumMonitorTest.kt
@@ -403,7 +403,10 @@ internal class DatadogRumMonitorTest {
             "pUt",
             "HeAd",
             "DeLeTe",
-            "pAtCh"
+            "pAtCh",
+            "cOnnEct",
+            "TrAcE",
+            "oPtIoNs"
         )
         @Suppress("DEPRECATION")
         testedMonitor.startResource(key, method, url, fakeAttributes)

diff --git a/...ns/dd-sdk-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/DatadogInterceptor.kt b/...ns/dd-sdk-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/DatadogInterceptor.kt
@@ -374,6 +374,9 @@ internal constructor(
             "HEAD" -> RumResourceMethod.HEAD
             "DELETE" -> RumResourceMethod.DELETE
             "POST" -> RumResourceMethod.POST
+            "TRACE" -> RumResourceMethod.TRACE
+            "OPTIONS" -> RumResourceMethod.OPTIONS
+            "CONNECT" -> RumResourceMethod.CONNECT
             else -> {
                 internalLogger.log(
                     InternalLogger.Level.WARN,

diff --git a/...-okhttp/src/test/kotlin/com/datadog/android/okhttp/DatadogInterceptorWithoutTracesTest.kt b/...-okhttp/src/test/kotlin/com/datadog/android/okhttp/DatadogInterceptorWithoutTracesTest.kt
@@ -389,7 +389,10 @@ internal class DatadogInterceptorWithoutTracesTest {
             fakeMethod = forge.anElementFrom(
                 RumResourceMethod.GET,
                 RumResourceMethod.HEAD,
-                RumResourceMethod.DELETE
+                RumResourceMethod.DELETE,
+                RumResourceMethod.CONNECT,
+                RumResourceMethod.TRACE,
+                RumResourceMethod.OPTIONS
             )
             fakeBody = null
             builder.method(fakeMethod.name, null)

diff --git a/...otlin/com/datadog/android/okhttp/trace/TracingInterceptorNonDdTracerNotSendingSpanTest.kt b/...otlin/com/datadog/android/okhttp/trace/TracingInterceptorNonDdTracerNotSendingSpanTest.kt
@@ -1274,11 +1274,21 @@ internal open class TracingInterceptorNonDdTracerNotSendingSpanTest {
     ): Request {
         val builder = Request.Builder().url(fakeUrl)
         if (forge.aBool()) {
-            fakeMethod = "POST"
+            fakeMethod = forge.anElementFrom("POST", "PUT", "PATCH")
             fakeBody = forge.anAlphabeticalString()
-            builder.post(fakeBody!!.toByteArray().toRequestBody(null))
+            with(builder) {
+                val body = fakeBody!!.toByteArray().toRequestBody(null)
+                when (fakeMethod) {
+                    "POST" -> post(body)
+                    "PUT" -> put(body)
+                    "PATCH" -> patch(body)
+                    else -> {
+                        throw IllegalArgumentException("Unknown method value: $fakeMethod")
+                    }
+                }
+            }
         } else {
-            fakeMethod = forge.anElementFrom("GET", "HEAD", "DELETE")
+            fakeMethod = forge.anElementFrom("GET", "HEAD", "DELETE", "CONNECT", "TRACE", "OPTIONS")
             fakeBody = null
             builder.method(fakeMethod, null)
         }

diff --git a/...ttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNonDdTracerTest.kt b/...ttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNonDdTracerTest.kt
@@ -1391,11 +1391,21 @@ internal open class TracingInterceptorNonDdTracerTest {
     ): Request {
         val builder = Request.Builder().url(url)
         if (forge.aBool()) {
-            fakeMethod = "POST"
+            fakeMethod = forge.anElementFrom("POST", "PUT", "PATCH")
             fakeBody = forge.anAlphabeticalString()
-            builder.post(fakeBody!!.toByteArray().toRequestBody(null))
+            with(builder) {
+                val body = fakeBody!!.toByteArray().toRequestBody(null)
+                when (fakeMethod) {
+                    "POST" -> post(body)
+                    "PUT" -> put(body)
+                    "PATCH" -> patch(body)
+                    else -> {
+                        throw IllegalArgumentException("Unknown method value: $fakeMethod")
+                    }
+                }
+            }
         } else {
-            fakeMethod = forge.anElementFrom("GET", "HEAD", "DELETE")
+            fakeMethod = forge.anElementFrom("GET", "HEAD", "DELETE", "CONNECT", "TRACE", "OPTIONS")
             fakeBody = null
             builder.method(fakeMethod, null)
         }

diff --git a/.../src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNotSendingSpanTest.kt b/.../src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorNotSendingSpanTest.kt
@@ -1359,7 +1359,10 @@ internal open class TracingInterceptorNotSendingSpanTest {
             fakeMethod = forge.anElementFrom(
                 RumResourceMethod.GET,
                 RumResourceMethod.HEAD,
-                RumResourceMethod.DELETE
+                RumResourceMethod.DELETE,
+                RumResourceMethod.CONNECT,
+                RumResourceMethod.TRACE,
+                RumResourceMethod.OPTIONS
             )
             fakeBody = null
             builder.method(fakeMethod.name, null)

diff --git a/...android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorTest.kt b/...android-okhttp/src/test/kotlin/com/datadog/android/okhttp/trace/TracingInterceptorTest.kt
@@ -1523,11 +1523,21 @@ internal open class TracingInterceptorTest {
     ): Request {
         val builder = Request.Builder().url(url)
         if (forge.aBool()) {
-            fakeMethod = "POST"
+            fakeMethod = forge.anElementFrom("POST", "PUT", "PATCH")
             fakeBody = forge.anAlphabeticalString()
-            builder.post(fakeBody!!.toByteArray().toRequestBody(null))
+            with(builder) {
+                val body = fakeBody!!.toByteArray().toRequestBody(null)
+                when (fakeMethod) {
+                    "POST" -> post(body)
+                    "PUT" -> put(body)
+                    "PATCH" -> patch(body)
+                    else -> {
+                        throw IllegalArgumentException("Unknown method value: $fakeMethod")
+                    }
+                }
+            }
         } else {
-            fakeMethod = forge.anElementFrom("GET", "HEAD", "DELETE")
+            fakeMethod = forge.anElementFrom("GET", "HEAD", "DELETE", "CONNECT", "TRACE", "OPTIONS")
             fakeBody = null
             builder.method(fakeMethod, null)
         }