diff --git a/examples/rn-app/android/build.gradle b/examples/rn-app/android/build.gradle index 170a230..3344052 100644 --- a/examples/rn-app/android/build.gradle +++ b/examples/rn-app/android/build.gradle @@ -17,6 +17,7 @@ buildscript { classpath("com.android.tools.build:gradle") classpath("com.facebook.react:react-native-gradle-plugin") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin") + classpath("com.callstack:ottrelite-plugin:0.1.0") } } diff --git a/examples/rn-app/android/buildSrc/build.gradle.kts b/examples/rn-app/android/buildSrc/build.gradle.kts deleted file mode 100644 index b063d56..0000000 --- a/examples/rn-app/android/buildSrc/build.gradle.kts +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - `kotlin-dsl` -} - -repositories { - google() - mavenCentral() -} - -dependencies { - implementation("com.android.tools.build:gradle:8.11.1") - implementation("org.ow2.asm:asm:9.8") - implementation("org.ow2.asm:asm-commons:9.8") -} - -gradlePlugin { - plugins { - create("ottrelite") { - id = "com.callstack.ottrelite" - implementationClass = "com.callstack.plugin.OttreliteTracingPlugin" - } - } -} \ No newline at end of file diff --git a/packages/core/android/src/main/java/com/callstack/ottrelite/OttreliteAndroid.kt b/packages/core/android/src/main/java/com/callstack/ottrelite/OttreliteAndroid.kt index f008c5a..ed8a1a4 100644 --- a/packages/core/android/src/main/java/com/callstack/ottrelite/OttreliteAndroid.kt +++ b/packages/core/android/src/main/java/com/callstack/ottrelite/OttreliteAndroid.kt @@ -6,6 +6,11 @@ object OttreliteAndroid { OttreliteBridge.nativeBeginAsyncEvent(eventName, emptyMap()) } + @JvmStatic + fun beginAsyncEvent(eventName: String, argsMap: Map) { + OttreliteBridge.nativeBeginAsyncEvent(eventName, argsMap) + } + @JvmStatic fun endAsyncEvent(eventName: String, cookie: Int) { OttreliteBridge.nativeEndAsyncEvent(eventName, cookie.toDouble(), emptyMap()) @@ -30,13 +35,23 @@ object OttreliteAndroid { OttreliteBridge.nativeBeginEvent(sectionName, argsMap) } + @JvmStatic + fun beginEvent(sectionName: String, argsMap: Map) { + OttreliteBridge.nativeBeginEvent(sectionName, argsMap) + } + @JvmStatic fun endEvent() { OttreliteBridge.nativeEndEvent(emptyMap()) } @JvmStatic - fun traceCounter(counterName: String, counterValue: Int) { + fun counterEvent(counterName: String, counterValue: Int) { OttreliteBridge.nativeCounterEvent(counterName, counterValue.toDouble()) } + + @JvmStatic + fun counterEvent(counterName: String, counterValue: Double) { + OttreliteBridge.nativeCounterEvent(counterName, counterValue) + } } diff --git a/plugin/ottrelite-gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/plugin/ottrelite-gradle-plugin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8bdaf60 Binary files /dev/null and b/plugin/ottrelite-gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/plugin/ottrelite-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/plugin/ottrelite-gradle-plugin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9a84687 --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +validateDistributionUrl=false +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/plugin/ottrelite-gradle-plugin/gradlew b/plugin/ottrelite-gradle-plugin/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/plugin/ottrelite-gradle-plugin/gradlew.bat b/plugin/ottrelite-gradle-plugin/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugin/ottrelite-gradle-plugin/ottrelite-plugin/build.gradle.kts b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/build.gradle.kts new file mode 100644 index 0000000..f5bd524 --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/build.gradle.kts @@ -0,0 +1,36 @@ +import org.jetbrains.kotlin.gradle.internal.backend.common.serialization.metadata.DynamicTypeDeserializer.id + +plugins { + `java-gradle-plugin` + `kotlin-dsl` + `maven-publish` + id("com.gradle.plugin-publish") version "2.0.0" +} + +version = "0.1.0" +group = "com.callstack" + +repositories { + google() + mavenCentral() +} + +dependencies { + implementation("com.android.tools.build:gradle:8.11.2") + implementation("org.ow2.asm:asm:9.8") + implementation("org.ow2.asm:asm-commons:9.8") +} + +gradlePlugin { + website = "https://oss.callstack.com/ottrelite/" + vcsUrl = "https://github.com/callstackincubator/ottrelite" + plugins { + create("ottrelite") { + id = "com.callstack.ottrelite" + displayName = "Ottrelite Android Plugin for React Native" + description = "Plugin for injecting @ottrelite/core logic into React Native's Android Systrace API" + tags = listOf("testing", "tracing", "react-native", "performance") + implementationClass = "com.callstack.plugin.OttreliteTracingPlugin" + } + } +} diff --git a/examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/OttreliteInstrumentation.kt b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteInstrumentation.kt similarity index 52% rename from examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/OttreliteInstrumentation.kt rename to plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteInstrumentation.kt index bfcd51b..0e0b3c5 100644 --- a/examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/OttreliteInstrumentation.kt +++ b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteInstrumentation.kt @@ -4,13 +4,13 @@ import com.android.build.api.instrumentation.AsmClassVisitorFactory import com.android.build.api.instrumentation.ClassContext import com.android.build.api.instrumentation.ClassData import com.android.build.api.instrumentation.InstrumentationParameters +import com.callstack.plugin.model.replacementDescriptorList import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.objectweb.asm.ClassVisitor import org.objectweb.asm.MethodVisitor import org.objectweb.asm.Opcodes - interface ReactInstrumentationParameters : InstrumentationParameters { @get:Input @@ -31,11 +31,8 @@ abstract class OttreliteClassVisitorFactory : classContext: ClassContext, nextClassVisitor: ClassVisitor ): ClassVisitor { - // We return a custom ClassVisitor that will do the actual work. - // It wraps the 'nextClassVisitor' in the chain. return object : ClassVisitor(Opcodes.ASM9, nextClassVisitor) { - // This method is called for each method in the class. override fun visitMethod( access: Int, name: String?, @@ -45,7 +42,6 @@ abstract class OttreliteClassVisitorFactory : ): MethodVisitor { val mv = super.visitMethod(access, name, descriptor, signature, exceptions) - // Check if this method matches our configured target. val className = classContext.currentClassData.className val desiredClassFound = className == parameters.get().targetClassName.get() val replacementDescriptor = if (desiredClassFound) { @@ -55,10 +51,9 @@ abstract class OttreliteClassVisitorFactory : replacementDescriptor != null && (access and Opcodes.ACC_STATIC) != 0 - if (isTargetMethod && replacementDescriptor != null) { - println("[OttreliteInstrumentation] Modifying method: $className.$name$descriptor") + if (isTargetMethod) { + println("Modifying method: $className.$name$descriptor") - // Return a new MethodVisitor that will replace the method's body. return replacementDescriptor.methodVisitorType.getMethodVisitor( mv, replacementDescriptor.additionalMethodName, access @@ -74,54 +69,3 @@ abstract class OttreliteClassVisitorFactory : } } -private val replacementDescriptorList = buildList { - add( - ReplacementDescriptor( - targetMethodName = "isTracing", - targetMethodDescriptor = "(J)Z", - additionalMethodName = null, - methodVisitorType = MethodVisitorType.BOOLEAN - ) - ) - add( - ReplacementDescriptor( - targetMethodName = "endSection", - targetMethodDescriptor = "(J)V", - additionalMethodName = "endEvent", - methodVisitorType = MethodVisitorType.LONG - ) - ) - add( - ReplacementDescriptor( - targetMethodName = "beginSection", - targetMethodDescriptor = "(JLjava/lang/String;)V", - additionalMethodName = "beginEvent", - methodVisitorType = MethodVisitorType.LONG_STRING - ) - ) - add( - ReplacementDescriptor( - targetMethodName = "beginAsyncSection", - targetMethodDescriptor = "(JLjava/lang/String;I)V", - additionalMethodName = "beginAsyncEvent", - methodVisitorType = MethodVisitorType.LONG_STRING_INT - ) - ) - add( - ReplacementDescriptor( - targetMethodName = "endAsyncSection", - targetMethodDescriptor = "(JLjava/lang/String;I)V", - additionalMethodName = "endAsyncEvent", - methodVisitorType = MethodVisitorType.LONG_STRING_INT - ) - ) - add( - ReplacementDescriptor( - targetMethodName = "traceCounter", - targetMethodDescriptor = "(JLjava/lang/String;I)V", - additionalMethodName = "traceCounter", - methodVisitorType = MethodVisitorType.LONG_STRING_INT - ) - ) -} - diff --git a/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteTracingExtension.kt b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteTracingExtension.kt new file mode 100644 index 0000000..6153fd2 --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteTracingExtension.kt @@ -0,0 +1,21 @@ +package com.callstack.plugin + +import org.gradle.api.Project +import org.gradle.api.provider.SetProperty + +open class OttreliteTracingExtension(project: Project) { + /** + * Set of variant names where tracing should be enabled. + * If empty, tracing will be applied to all variants. + * + * Example usage in build.gradle: + * ``` + * ottreliteTracing { + * rnInstrumentationVariants = ["debug", "profiling"] + * } + * ``` + */ + val rnInstrumentationVariants: SetProperty = + project.objects.setProperty(String::class.java) + .convention(emptySet()) +} \ No newline at end of file diff --git a/examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/OttreliteTracingPlugin.kt b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteTracingPlugin.kt similarity index 76% rename from examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/OttreliteTracingPlugin.kt rename to plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteTracingPlugin.kt index fc6e204..5970ba6 100644 --- a/examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/OttreliteTracingPlugin.kt +++ b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/OttreliteTracingPlugin.kt @@ -5,24 +5,6 @@ import com.android.build.api.instrumentation.InstrumentationScope import com.android.build.api.variant.AndroidComponentsExtension import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.provider.SetProperty - -open class OttreliteTracingExtension(project: Project) { - /** - * Set of variant names where tracing should be enabled. - * If empty, tracing will be applied to all variants. - * - * Example usage in build.gradle: - * ``` - * ottreliteTracing { - * rnInstrumentationVariants = ["debug", "profiling"] - * } - * ``` - */ - val rnInstrumentationVariants: SetProperty = - project.objects.setProperty(String::class.java) - .convention(emptySet()) -} class OttreliteTracingPlugin : Plugin { override fun apply(project: Project) { @@ -76,11 +58,8 @@ class OttreliteTracingPlugin : Plugin { val rnInstrumentationVariants = extension.rnInstrumentationVariants.get() // if enabled variants are specified, only instrument those - if (rnInstrumentationVariants.isNotEmpty()) { - return rnInstrumentationVariants.contains(variantName) - } - - // otherwise, instrument all variants - return true + return if (rnInstrumentationVariants.isNotEmpty()) { + rnInstrumentationVariants.contains(variantName) + } else true } } \ No newline at end of file diff --git a/examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/ReplacementDescriptor.kt b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/model/ReplacementDescriptor.kt similarity index 99% rename from examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/ReplacementDescriptor.kt rename to plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/model/ReplacementDescriptor.kt index fd43ce1..f1c19f5 100644 --- a/examples/rn-app/android/buildSrc/src/main/kotlin/com/callstack/plugin/ReplacementDescriptor.kt +++ b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/model/ReplacementDescriptor.kt @@ -1,4 +1,4 @@ -package com.callstack.plugin +package com.callstack.plugin.model import org.objectweb.asm.MethodVisitor import org.objectweb.asm.Opcodes diff --git a/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/model/ReplacementDescriptorList.kt b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/model/ReplacementDescriptorList.kt new file mode 100644 index 0000000..06660ee --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/ottrelite-plugin/src/main/java/com/callstack/plugin/model/ReplacementDescriptorList.kt @@ -0,0 +1,52 @@ +package com.callstack.plugin.model + +val replacementDescriptorList = buildList { + add( + ReplacementDescriptor( + targetMethodName = "isTracing", + targetMethodDescriptor = "(J)Z", + additionalMethodName = null, + methodVisitorType = MethodVisitorType.BOOLEAN + ) + ) + add( + ReplacementDescriptor( + targetMethodName = "endSection", + targetMethodDescriptor = "(J)V", + additionalMethodName = "endEvent", + methodVisitorType = MethodVisitorType.LONG + ) + ) + add( + ReplacementDescriptor( + targetMethodName = "beginSection", + targetMethodDescriptor = "(JLjava/lang/String;)V", + additionalMethodName = "beginEvent", + methodVisitorType = MethodVisitorType.LONG_STRING + ) + ) + add( + ReplacementDescriptor( + targetMethodName = "beginAsyncSection", + targetMethodDescriptor = "(JLjava/lang/String;I)V", + additionalMethodName = "beginAsyncEvent", + methodVisitorType = MethodVisitorType.LONG_STRING_INT + ) + ) + add( + ReplacementDescriptor( + targetMethodName = "endAsyncSection", + targetMethodDescriptor = "(JLjava/lang/String;I)V", + additionalMethodName = "endAsyncEvent", + methodVisitorType = MethodVisitorType.LONG_STRING_INT + ) + ) + add( + ReplacementDescriptor( + targetMethodName = "traceCounter", + targetMethodDescriptor = "(JLjava/lang/String;I)V", + additionalMethodName = "counterEvent", + methodVisitorType = MethodVisitorType.LONG_STRING_INT + ) + ) +} \ No newline at end of file diff --git a/plugin/ottrelite-gradle-plugin/settings.gradle.kts b/plugin/ottrelite-gradle-plugin/settings.gradle.kts new file mode 100644 index 0000000..78fd178 --- /dev/null +++ b/plugin/ottrelite-gradle-plugin/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "ottrelite-gradle-plugin" + +include("ottrelite-plugin")