chore: add clean script to ottrelite interop otel

Author: artus9033

examples/rn-app/ios/license_plist.yml

@@ -1403,7 +1403,7 @@ manual:
   - name: [email protected]
     version: '18.3.1'
     source: https://github.com/facebook/react
-    file: '../../../node_modules/pretty-format/node_modules/react-is/LICENSE'
+    file: '../../../node_modules/react-is/LICENSE'
   - name: [email protected]
     version: '0.83.1'
     source: https://github.com/facebook/metro
@@ -1523,7 +1523,7 @@ manual:
   - name: [email protected]
     version: '2.20.3'
     source: https://github.com/tj/commander.js
-    file: '../../../node_modules/terser/node_modules/commander/LICENSE'
+    file: '../../../node_modules/commander/LICENSE'
   - name: [email protected]
     version: '0.5.21'
     source: https://github.com/evanw/node-source-map-support
@@ -1791,7 +1791,7 @@ manual:
   - name: [email protected]
     version: '12.1.0'
     source: https://github.com/tj/commander.js
-    file: '../../../node_modules/commander/LICENSE'
+    file: '../../../node_modules/react-native/node_modules/commander/LICENSE'
   - name: [email protected]
     version: '29.7.0'
     source: https://github.com/jestjs/jest
@@ -1955,7 +1955,7 @@ manual:
   - name: [email protected]
     version: '16.13.1'
     source: https://github.com/facebook/react
-    file: '../../../node_modules/react-is/LICENSE'
+    file: '../../../node_modules/hoist-non-react-statics/node_modules/react-is/LICENSE'
   - name: [email protected]
     version: '3.2.1'
     source: Qix-/color

packages/interop-otel/android/build.gradle

@@ -170,23 +170,23 @@ dependencies {
 def isReleaseBuild = project.hasProperty("buildType") && project.buildType == "release"
 def cxxBuildVariantDirName = isReleaseBuild ? "Release" : "Debug"
 def thirdPartySourceDir = file("${project.projectDir}/../third_party").absolutePath
-def otelSourceDir = "$thirdPartySourceDir/opentelemetry-cpp"
 def protobufSourceDir = "$thirdPartySourceDir/protobuf"
 def openSSLForAndroidSourceDir = "$thirdPartySourceDir/openssl_for_android"
 def brotliSourceDir = "$thirdPartySourceDir/brotli"
 def zlibSourceDir = "$thirdPartySourceDir/zlib"
 def curlSourceDir = "$thirdPartySourceDir/curl"
 def wrapperRootDir = "$thirdPartySourceDir/wrapper"
-def getWrapperBuildDir = { String abi -> "$wrapperRootDir/android/$cxxBuildVariantDirName/$abi" }
-def getGeneric3PBuildDir = { String libName, String abi -> "$wrapperRootDir/android/$cxxBuildVariantDirName/$abi/$libName" }
+def wrapperBuildDir = "$wrapperRootDir/android"
+def getCmakeInstallDir = { String abi -> "$wrapperBuildDir/install/$abi" }
+def getGeneric3PBuildDir = { String libName, String abi -> "$wrapperBuildDir/$cxxBuildVariantDirName/$abi/$libName" }
 def getProtobufBuildDir = { String abi -> getGeneric3PBuildDir("protobuf", abi) }
 def getOpenSSLForAndroidBuildDir = { String abi -> new File(openSSLForAndroidSourceDir, "openssl_${opensslVersion}_${abi}").path }
 def getBrotliBuildDir = { String abi -> getGeneric3PBuildDir("brotli", abi) }
 def getZlibBuildDir = { String abi -> getGeneric3PBuildDir("zlib", abi) }
 def getCurlBuildDir = { String abi -> getGeneric3PBuildDir("curl", abi) }
-def getCmakeInstallDir = { String abi -> "$wrapperRootDir/android/install/$abi" }
 
 def prepareOttreliteInteropHeadersTask = tasks.register('prepareOttreliteInteropHeadersTask', Copy) {
+    println("Preparing Ottrelite Interop OTEL headers...")
     from files(
             fileTree('../cpp/include/public/'),
             fileTree('../nitrogen/generated/shared/c++/')
@@ -237,7 +237,7 @@ tasks.register("buildOpenSSL") {
             copy {
                 from tarTree(tarFile.path)
 
-                // below: actually, the script creates the openssl-${opensslVersion} directory by itself
+                // below: actually, the script appends the openssl-${opensslVersion} directory by itself
                 into openSSLSourceDirFile.parent
             }
         } else {
@@ -571,81 +571,35 @@ tasks.register("buildAndInstallProtobuf") {
     }
 }
 
-//// CPP wrapper + OTEL CPP SDK
-//tasks.register("buildAndInstallCppWrapper") {
-//    doFirst {
-//        if (!new File(otelSourceDir, "CMakeLists.txt").exists()) {
-//            println("[@ottrelite/interop-otel] Cloning OpenTelemetry C++ SDK to ${otelSourceDir}...")
-//
-//            if (!file(otelSourceDir).exists()) {
-//                file(otelSourceDir).mkdirs()
-//                exec {
-//                    commandLine "git", "clone", "--depth", "1", "--branch", "v1.23.0", "https://github.com/open-telemetry/opentelemetry-cpp.git", otelSourceDir
-//                }
-//            }
-//        } else {
-//            println("[@ottrelite/interop-otel] OpenTelemetry C++ SDK already cloned in ${otelSourceDir}")
-//        }
-//    }
-//
-//    doLast {
-//        reactNativeArchitectures().each { abi ->
-//            def wrapperBuildDir = getWrapperBuildDir(abi)
-//            def cmakeInstallDir = getCmakeInstallDir(abi)
-//
-//            println("[@ottrelite/interop-otel] Building & installing artifacts for ABI $abi, this may take a while...")
-//
-//            if (!new File(wrapperBuildDir).exists()) {
-//                file(wrapperBuildDir).mkdirs()
-//            }
-//
-//            exec {
-//                println("[@ottrelite/interop-otel] Configuring for ABI $abi from ${thirdPartySourceDir} and writing to ${wrapperBuildDir}...")
-//
-//                commandLine "cmake", "-S", thirdPartySourceDir, "-B", wrapperBuildDir,
-//                        "-DANDROID_ABI=$abi",
-//                        "-DANDROID_PLATFORM=${android.defaultConfig.minSdkVersion.apiLevel}",
-//                        "-DCMAKE_TOOLCHAIN_FILE=${android.ndkDirectory}/build/cmake/android.toolchain.cmake",
-//                        "-DCMAKE_BUILD_TYPE=${cxxBuildVariantDirName}",
-//                        "-DCMAKE_CXX_FLAGS_DEBUG=-g",
-//                        "-DProtobuf_DIR=$cmakeInstallDir/lib/cmake/protobuf",
-//                        "-Dabsl_DIR=$cmakeInstallDir/lib/cmake/absl",
-//                        "-Dutf8_range_DIR=$cmakeInstallDir/lib/cmake/utf8_range",
-//                        "-DCURL_DIR=$cmakeInstallDir/lib/cmake/CURL",
-//                        "-DOPENSSL_ROOT_DIR=${cmakeInstallDir}",
-//                        "-DOPENSSL_SSL_LIBRARY=${cmakeInstallDir}/lib/libssl.a",
-//                        "-DOPENSSL_CRYPTO_LIBRARY=${cmakeInstallDir}/lib/libcrypto.a",
-//                        "-DOPENSSL_INCLUDE_DIR=${cmakeInstallDir}/include"
-//            }
-//
-//            println("[@ottrelite/interop-otel] Building for ABI $abi ${wrapperBuildDir}...")
-//
-//            exec {
-//                commandLine "cmake", "--build", wrapperBuildDir, "-j8"
-//            }
-//
-//            println("[@ottrelite/interop-otel] Installing build artifacts for ABI $abi to ${cmakeInstallDir}...")
-//
-//            exec {
-//                commandLine "cmake", "--install", wrapperBuildDir, "--prefix", cmakeInstallDir
-//            }
-//
-//            println("[@ottrelite/interop-otel] Build & install finished for ABI $abi")
-//        }
-//    }
-//}
-//
-//buildAndInstallCppWrapper.dependsOn(copyOpenSSL)
-//buildAndInstallCppWrapper.dependsOn(buildAndInstallProtobuf)
-//buildAndInstallCppWrapper.dependsOn(buildAndInstallBrotli)
-//buildAndInstallCppWrapper.dependsOn(buildAndInstallZlib)
-//buildAndInstallCppWrapper.dependsOn(buildAndInstallCURL)
-
-//tasks.matching { it.name.startsWith("buildCMake") }.all { task ->
 preBuild.dependsOn(copyOpenSSL)
 preBuild.dependsOn(buildAndInstallProtobuf)
 preBuild.dependsOn(buildAndInstallBrotli)
 preBuild.dependsOn(buildAndInstallZlib)
 preBuild.dependsOn(buildAndInstallCURL)
-//}
 
+tasks.named('clean') {
+    doLast {
+        reactNativeArchitectures().each { abi ->
+            def wrapperBuildDirFile = new File(wrapperBuildDir)
+
+            if (wrapperBuildDirFile.exists()) {
+                println "Deleting wrapper build directory: ${wrapperBuildDirFile.path}"
+                delete(wrapperBuildDirFile)
+            }
+
+            def openSSLBuildDirFile = new File(getOpenSSLForAndroidBuildDir(abi))
+
+            if (openSSLBuildDirFile.exists()) {
+                println "Deleting OpenSSL build directory: ${openSSLBuildDirFile.path}"
+                delete(openSSLBuildDirFile)
+            }
+
+            def cmakeInstallDirFile = getCmakeInstallDir(abi)
+
+            if (cmakeInstallDirFile.exists()) {
+                println "Deleting dependencies install directory: ${cmakeInstallDirFile.path}"
+                delete(cmakeInstallDirFile)
+            }
+        }
+    }
+}

packages/interop-otel/cpp/CMakeLists.txt

@@ -43,11 +43,11 @@ target_include_directories(
 )
 
 # Find RN Ottrelite Core package
-find_package(ottrelite_core REQUIRED)
+find_package(ottrelite_core)
 
 # Find Protobuf C++ package
 set(Protobuf_DIR "${DEPS_INSTALL_DIR}/lib/cmake/protobuf/")
-find_package(Protobuf CONFIG REQUIRED)
+find_package(Protobuf CONFIG)
 
 # Find OpenSSL package
 set(OpenSSLArtifactsDir "${CMAKE_CURRENT_LIST_DIR}/../third_party/openssl_for_android/openssl_${OTTRELITE_OPENSSL_VERSION}_${ANDROID_ABI}")
@@ -70,11 +70,11 @@ set_target_properties(OpenSSL::Crypto PROPERTIES
 
 # Find CURL C++ package
 set(CURL_DIR "${DEPS_INSTALL_DIR}/lib/cmake/CURL/")
-find_package(CURL CONFIG REQUIRED)
+find_package(CURL CONFIG)
 
 # Find OpenTelemetry C++ package
 set(opentelemetry-cpp_DIR "${DEPS_INSTALL_DIR}/lib/cmake/opentelemetry-cpp/")
-find_package(opentelemetry-cpp CONFIG REQUIRED)
+find_package(opentelemetry-cpp CONFIG)
 
 target_link_libraries(
         ${PACKAGE_NAME}