use RequiresApi on method and change coordinate type to long

Author: cleverchuk

instrumentation/view-click/build.gradle.kts

@@ -7,10 +7,6 @@ description = "OpenTelemetry Android View click library instrumentation"
 
 android {
     namespace = "io.opentelemetry.android.instrumentation.view.click"
-
-    defaultConfig {
-        minSdk = 23
-    }
 }
 
 dependencies {

instrumentation/view-click/src/main/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickEventGenerator.kt

@@ -38,8 +38,8 @@ class ViewClickEventGenerator(
         windowRef?.get()?.let { window ->
             if (motionEvent != null && motionEvent.actionMasked == MotionEvent.ACTION_UP) {
                 createEvent(APP_SCREEN_CLICK_EVENT_NAME)
-                    .setAttribute(yCoordinateAttr, motionEvent.y.toDouble())
-                    .setAttribute(xCoordinateAttr, motionEvent.x.toDouble())
+                    .setAttribute(yCoordinateAttr, motionEvent.y.toLong())
+                    .setAttribute(xCoordinateAttr, motionEvent.x.toLong())
                     .emit()
 
                 findTargetForTap(window.decorView, motionEvent.x, motionEvent.y)?.let { view ->
@@ -70,8 +70,8 @@ class ViewClickEventGenerator(
         builder.put(viewNameAttr, viewToName(view))
         builder.put(viewIdAttr, view.id.toLong())
 
-        builder.put(xCoordinateAttr, view.x.toDouble())
-        builder.put(yCoordinateAttr, view.y.toDouble())
+        builder.put(xCoordinateAttr, view.x.toLong())
+        builder.put(yCoordinateAttr, view.y.toLong())
         return builder.build()
     }
 

instrumentation/view-click/src/main/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickInstrumentation.kt

@@ -20,7 +20,7 @@ class ViewClickInstrumentation : AndroidInstrumentation {
                 ViewClickEventGenerator(
                     ctx.openTelemetry
                         .logsBridge
-                        .loggerBuilder("io.opentelemetry.android.view.click")
+                        .loggerBuilder("io.opentelemetry.android.instrumentation.view.click")
                         .build() as ExtendedLogger,
                 ),
             ),

instrumentation/view-click/src/main/kotlin/io/opentelemetry/android/instrumentation/view/click/WindowCallbackWrapper.kt

@@ -5,8 +5,12 @@
 
 package io.opentelemetry.android.instrumentation.view.click
 
+import android.os.Build.VERSION_CODES
+import android.view.ActionMode
 import android.view.MotionEvent
+import android.view.SearchEvent
 import android.view.Window.Callback
+import androidx.annotation.RequiresApi
 
 class WindowCallbackWrapper(
     private val callback: Callback,
@@ -17,5 +21,14 @@ class WindowCallbackWrapper(
         return callback.dispatchTouchEvent(event)
     }
 
+    @RequiresApi(api = VERSION_CODES.M)
+    override fun onSearchRequested(searchEvent: SearchEvent?): Boolean = callback.onSearchRequested(searchEvent)
+
+    @RequiresApi(api = VERSION_CODES.M)
+    override fun onWindowStartingActionMode(
+        callback: ActionMode.Callback?,
+        type: Int,
+    ): ActionMode? = this.callback.onWindowStartingActionMode(callback, type)
+
     fun unwrap(): Callback = callback
 }

instrumentation/view-click/src/main/kotlin/io/opentelemetry/android/instrumentation/view/click/internal/ViewUtils.kt

@@ -6,14 +6,13 @@
 package io.opentelemetry.android.instrumentation.view.click.internal
 
 import io.opentelemetry.api.common.AttributeKey
-import io.opentelemetry.api.common.AttributeKey.doubleKey
 import io.opentelemetry.api.common.AttributeKey.longKey
 import io.opentelemetry.api.common.AttributeKey.stringKey
 
 const val APP_SCREEN_CLICK_EVENT_NAME = "app.screen.click"
 const val VIEW_CLICK_EVENT_NAME = "event.app.widget.click"
 val viewNameAttr: AttributeKey<String> = stringKey("app.widget.name")
 
-val xCoordinateAttr: AttributeKey<Double> = doubleKey("app.screen.coordinate.x")
-val yCoordinateAttr: AttributeKey<Double> = doubleKey("app.screen.coordinate.y")
+val xCoordinateAttr: AttributeKey<Long> = longKey("app.screen.coordinate.x")
+val yCoordinateAttr: AttributeKey<Long> = longKey("app.screen.coordinate.y")
 val viewIdAttr: AttributeKey<Long> = longKey("app.widget.id")

instrumentation/view-click/src/test/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickInstrumentationTest.kt

@@ -110,16 +110,16 @@ class ViewClickInstrumentationTest {
         assertThat(event)
             .hasEventName(APP_SCREEN_CLICK_EVENT_NAME)
             .hasAttributesSatisfyingExactly(
-                equalTo(xCoordinateAttr, motionEvent.x.toDouble()),
-                equalTo(yCoordinateAttr, motionEvent.y.toDouble()),
+                equalTo(xCoordinateAttr, motionEvent.x.toLong()),
+                equalTo(yCoordinateAttr, motionEvent.y.toLong()),
             )
 
         event = events[1] as ExtendedLogRecordData
         assertThat(event)
             .hasEventName(VIEW_CLICK_EVENT_NAME)
             .hasAttributesSatisfyingExactly(
-                equalTo(xCoordinateAttr, mockView.x.toDouble()),
-                equalTo(yCoordinateAttr, mockView.y.toDouble()),
+                equalTo(xCoordinateAttr, mockView.x.toLong()),
+                equalTo(yCoordinateAttr, mockView.y.toLong()),
                 equalTo(viewIdAttr, mockView.id),
                 equalTo(viewNameAttr, "10012"),
             )
@@ -177,16 +177,16 @@ class ViewClickInstrumentationTest {
         assertThat(event)
             .hasEventName(APP_SCREEN_CLICK_EVENT_NAME)
             .hasAttributesSatisfyingExactly(
-                equalTo(xCoordinateAttr, motionEvent.x.toDouble()),
-                equalTo(yCoordinateAttr, motionEvent.y.toDouble()),
+                equalTo(xCoordinateAttr, motionEvent.x.toLong()),
+                equalTo(yCoordinateAttr, motionEvent.y.toLong()),
             )
 
         event = events[1] as ExtendedLogRecordData
         assertThat(event)
             .hasEventName(VIEW_CLICK_EVENT_NAME)
             .hasAttributesSatisfyingExactly(
-                equalTo(xCoordinateAttr, mockView.x.toDouble()),
-                equalTo(yCoordinateAttr, mockView.y.toDouble()),
+                equalTo(xCoordinateAttr, mockView.x.toLong()),
+                equalTo(yCoordinateAttr, mockView.y.toLong()),
                 equalTo(viewIdAttr, mockView.id),
                 equalTo(viewNameAttr, "10012"),
             )
@@ -244,8 +244,8 @@ class ViewClickInstrumentationTest {
         assertThat(event)
             .hasEventName(APP_SCREEN_CLICK_EVENT_NAME)
             .hasAttributesSatisfyingExactly(
-                equalTo(xCoordinateAttr, motionEvent.x.toDouble()),
-                equalTo(yCoordinateAttr, motionEvent.y.toDouble()),
+                equalTo(xCoordinateAttr, motionEvent.x.toLong()),
+                equalTo(yCoordinateAttr, motionEvent.y.toLong()),
             )
     }