From f42726f055cf72ceef41381f87469f9308db59f3 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 14 May 2024 15:50:38 -0700 Subject: [PATCH 01/13] add demo app to ci builds --- .github/workflows/build.yaml | 2 ++ .github/workflows/pr-check.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 953e99607..8a8b7c4cd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,6 +20,8 @@ jobs: java-version: 17 - name: run gradle check run: ./gradlew check + - name: build demo app + run: ./demo-app/gradlew check - name: publish snapshot run: ./gradlew publishToSonatype env: diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index 1b0d553f6..3d0db8613 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -17,6 +17,8 @@ jobs: run: touch local.properties - name: run gradle run: ./gradlew check + - name: build demo app + run: ./demo-app/gradlew check required-status-check: needs: From 6c9305dfea21004300377ca70ebbdba49e1598d8 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 14 May 2024 16:00:00 -0700 Subject: [PATCH 02/13] run from subdir --- .github/workflows/build.yaml | 3 ++- .github/workflows/pr-check.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8a8b7c4cd..a4535c94d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,8 @@ jobs: - name: run gradle check run: ./gradlew check - name: build demo app - run: ./demo-app/gradlew check + working-directory: ./demo-app + run: ./gradlew check assemble - name: publish snapshot run: ./gradlew publishToSonatype env: diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index 3d0db8613..21d860ce6 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -18,7 +18,8 @@ jobs: - name: run gradle run: ./gradlew check - name: build demo app - run: ./demo-app/gradlew check + working-directory: ./demo-app + run: ./gradlew check assemble required-status-check: needs: From cb7da7d948b52e59a5504b2be79a5ebe17149a2a Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 14 May 2024 16:32:31 -0700 Subject: [PATCH 03/13] add jar --- demo-app/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 demo-app/gradle/wrapper/gradle-wrapper.jar diff --git a/demo-app/gradle/wrapper/gradle-wrapper.jar b/demo-app/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 Date: Tue, 14 May 2024 16:39:08 -0700 Subject: [PATCH 04/13] fixing build --- demo-app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 3bb740306..4d591337f 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -12,7 +12,6 @@ localProperties.load(FileInputStream(rootProject.file("local.properties"))) android { namespace = "io.opentelemetry.android.demo" compileSdk = 34 - targetSdk = 34 defaultConfig { applicationId = "io.opentelemetry.android.demo" @@ -46,6 +45,7 @@ android { composeOptions { kotlinCompilerExtensionVersion = "1.5.13" } + val javaVersion = JavaVersion.VERSION_11 compileOptions { sourceCompatibility(javaVersion) targetCompatibility(javaVersion) From 7a9dd13f70fe3ea8ebc147a3586b31ab5da53a76 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 14 May 2024 21:59:33 -0700 Subject: [PATCH 05/13] need to touch the demo local.properties too --- .github/workflows/build.yaml | 4 ++++ .github/workflows/pr-check.yaml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a4535c94d..ee0299f74 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,6 +18,10 @@ jobs: with: distribution: temurin java-version: 17 + - name: touch local props + run: | + touch local.properties + touch demo-app/local.properties - name: run gradle check run: ./gradlew check - name: build demo app diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index 21d860ce6..a582c09c3 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -14,7 +14,9 @@ jobs: distribution: temurin java-version: 17 - name: touch local props - run: touch local.properties + run: | + touch local.properties + touch demo-app/local.properties - name: run gradle run: ./gradlew check - name: build demo app From d09a444e3aec6d22d0108fbcf5fad9308143f618 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 15 May 2024 09:18:32 -0700 Subject: [PATCH 06/13] demo app gets its on version catalog --- .github/renovate.json5 | 14 +++++- .gitignore | 3 +- android-agent/build.gradle.kts | 1 - demo-app/build.gradle.kts | 48 ++++++++++--------- demo-app/gradle/libs.versions.toml | 43 +++++++++++++++++ demo-app/proguard-rules.pro | 5 ++ demo-app/settings.gradle.kts | 4 +- gradle/libs.versions.toml | 19 -------- .../volley/library/build.gradle.kts | 2 - 9 files changed, 89 insertions(+), 50 deletions(-) create mode 100644 demo-app/gradle/libs.versions.toml create mode 100644 demo-app/proguard-rules.pro diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d8dcc3559..e98085f7b 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -34,8 +34,18 @@ { // somehow renovate gets confused by the android property in gradle.properties, // so let's just exclude it and hopefully clean up the dashboard - "matchPackageNames": ["string:rum.version"], + "matchPackageNames": [ + "string:rum.version" + ], "enabled": false - } +// }, +// { +// "matchPackagePatterns": [ +// "^org.jetbrains.kotlin", +// "^com.google.devtools.ksp", +// "^androidx.compose.compiler" +// ], +// "groupName": "kotlin" +// } ] } diff --git a/.gitignore b/.gitignore index d2c2be31c..a0df3d643 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea .gradle /local.properties +demo-app/local.properties .DS_Store -**/build/ \ No newline at end of file +**/build/ diff --git a/android-agent/build.gradle.kts b/android-agent/build.gradle.kts index 12a0506a7..a10bb241c 100644 --- a/android-agent/build.gradle.kts +++ b/android-agent/build.gradle.kts @@ -63,7 +63,6 @@ dependencies { implementation(project(":instrumentation:crash")) implementation(project(":instrumentation:network")) implementation(project(":instrumentation:slowrendering")) - implementation(libs.androidx.appcompat) implementation(libs.androidx.core) implementation(libs.androidx.navigation.fragment) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 4d591337f..d3e459f33 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -58,28 +58,30 @@ android { } dependencies { - implementation(libs.androidx.appcompat) - implementation(libs.androidx.constraintlayout) - implementation(libs.material) - implementation(libs.androidx.lifecycle.livedata.ktx) - implementation(libs.androidx.lifecycle.viewmodel.ktx) - implementation(libs.androidx.navigation.fragment.ktx) - implementation(libs.androidx.navigation.ui.ktx) - coreLibraryDesugaring(libs.desugarJdkLibs) + implementation(demoLibs.androidx.appcompat) + implementation(demoLibs.androidx.constraintlayout) + implementation(demoLibs.material) + implementation(demoLibs.androidx.lifecycle.livedata.ktx) + implementation(demoLibs.androidx.lifecycle.viewmodel.ktx) + implementation(demoLibs.androidx.navigation.fragment.ktx) + implementation(demoLibs.androidx.navigation.ui.ktx) - implementation("io.opentelemetry.android:android-agent") - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.lifecycle.runtime.ktx) - implementation(libs.androidx.activity.compose) - implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.ui) - implementation(libs.androidx.ui.graphics) - implementation(libs.androidx.ui.tooling.preview) - implementation(libs.androidx.material3) - implementation(libs.opentelemetry.sdk) - implementation(libs.opentelemetry.exporter.otlp) - testImplementation(libs.bundles.junit) - androidTestImplementation(libs.androidx.junit) - debugImplementation(libs.androidx.ui.tooling) - debugImplementation(libs.androidx.ui.test.manifest) + coreLibraryDesugaring(demoLibs.desugarJdkLibs) + + implementation("io.opentelemetry.android:android-agent") //parent dir + implementation(demoLibs.androidx.core.ktx) + implementation(demoLibs.androidx.lifecycle.runtime.ktx) + implementation(demoLibs.androidx.activity.compose) + implementation(platform(demoLibs.androidx.compose.bom)) + implementation(demoLibs.androidx.ui) + implementation(demoLibs.androidx.ui.graphics) + implementation(demoLibs.androidx.ui.tooling.preview) + implementation(demoLibs.androidx.material3) + + implementation(demoLibs.opentelemetry.exporter.otlp) + + testImplementation(demoLibs.bundles.junit) + androidTestImplementation(demoLibs.androidx.junit) + debugImplementation(demoLibs.androidx.ui.tooling) + debugImplementation(demoLibs.androidx.ui.test.manifest) } diff --git a/demo-app/gradle/libs.versions.toml b/demo-app/gradle/libs.versions.toml new file mode 100644 index 000000000..15c8e4fbf --- /dev/null +++ b/demo-app/gradle/libs.versions.toml @@ -0,0 +1,43 @@ +[versions] +opentelemetry = "1.38.0" +junit = "5.10.2" +spotless = "6.25.0" +kotlin = "1.9.23" + +[libraries] +androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" +opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version.ref = "opentelemetry" } + +#Test tools +androidx-junit = "androidx.test.ext:junit:1.1.5" +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit" } + +#Compilation tools +desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.4" + +# demo-app +androidx-core-ktx = "androidx.core:core-ktx:1.13.1" +androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.0" +androidx-compose-bom = "androidx.compose:compose-bom:2024.05.00" +androidx-activity-compose = "androidx.activity:activity-compose:1.9.0" +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" } +material = { group = "com.google.android.material", name = "material", version = "1.12.0" } +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.0" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.8.0" } +androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version = "2.7.7" } +androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version = "2.7.7" } + +[bundles] +junit = ["junit-jupiter-api", "junit-jupiter-engine", "junit-vintage-engine"] + +[plugins] +spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } +kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/demo-app/proguard-rules.pro b/demo-app/proguard-rules.pro new file mode 100644 index 000000000..fd245fd47 --- /dev/null +++ b/demo-app/proguard-rules.pro @@ -0,0 +1,5 @@ +-dontwarn com.fasterxml.jackson.core.JsonFactory +-dontwarn com.fasterxml.jackson.core.JsonGenerator +-dontwarn com.google.auto.value.AutoValue$Builder +-dontwarn com.google.auto.value.AutoValue +-dontwarn com.google.auto.value.extension.memoized.Memoized diff --git a/demo-app/settings.gradle.kts b/demo-app/settings.gradle.kts index 96f9ff0c7..bd1f922fb 100644 --- a/demo-app/settings.gradle.kts +++ b/demo-app/settings.gradle.kts @@ -12,8 +12,8 @@ dependencyResolutionManagement { google() } versionCatalogs { - create("libs") { - from(files("../gradle/libs.versions.toml")) + create("demoLibs") { + from(files("./gradle/libs.versions.toml")) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a52d0fbc3..f6dfadaec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,6 @@ kotlin = "1.9.24" [libraries] opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom", version.ref = "opentelemetry-instrumentation" } -androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7" androidx-core = "androidx.core:core:1.13.1" findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2" @@ -61,24 +60,6 @@ android-plugin = "com.android.tools.build:gradle:8.4.0" byteBuddy-plugin = { module = "net.bytebuddy:byte-buddy-gradle-plugin", version.ref = "byteBuddy" } kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -# demo-app -androidx-core-ktx = "androidx.core:core-ktx:1.13.0" -androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" -androidx-compose-bom = "androidx.compose:compose-bom:2024.05.00" -androidx-activity-compose = "androidx.activity:activity-compose:1.9.0" -androidx-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-material3 = { group = "androidx.compose.material3", name = "material3" } -androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" } -material = { group = "com.google.android.material", name = "material", version = "1.12.0" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.7.0" } -androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.7.0" } -androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version = "2.7.7" } -androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version = "2.7.7" } - [bundles] mocking = ["mockito-core", "mockito-junit-jupiter", "mockk"] junit = ["junit-jupiter-api", "junit-jupiter-engine", "junit-vintage-engine"] diff --git a/instrumentation/volley/library/build.gradle.kts b/instrumentation/volley/library/build.gradle.kts index 5f420137b..6f7eaab15 100644 --- a/instrumentation/volley/library/build.gradle.kts +++ b/instrumentation/volley/library/build.gradle.kts @@ -35,12 +35,10 @@ android { } dependencies { - implementation(libs.androidx.appcompat) implementation(libs.androidx.navigation.fragment) implementation(libs.opentelemetry.instrumentation.api) implementation(libs.opentelemetry.semconv.incubating) compileOnly(libs.volley) - coreLibraryDesugaring(libs.desugarJdkLibs) api(platform(libs.opentelemetry.platform)) api(libs.opentelemetry.api) From 06c035f7d99ff3020cf9f171b05672a0c0d2ca9b Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 15 May 2024 09:27:09 -0700 Subject: [PATCH 07/13] try and get renovate to chill out in the demo app project --- .github/renovate.json5 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index e98085f7b..cb25131a1 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -38,14 +38,17 @@ "string:rum.version" ], "enabled": false -// }, -// { -// "matchPackagePatterns": [ -// "^org.jetbrains.kotlin", -// "^com.google.devtools.ksp", -// "^androidx.compose.compiler" -// ], -// "groupName": "kotlin" -// } + }, + { + // Try and force the demo app's kotlin and compose compilers to be in lockstep + // See https://github.com/renovatebot/renovate/issues/18354 + "includePaths": ["demo-app/"], + "matchPackagePatterns": [ + "^org.jetbrains.kotlin", + "^com.google.devtools.ksp", + "^androidx.compose.compiler" + ], + "groupName": "kotlin" + } ] } From f5d93cc7a977956e5055beb2ed75a89f475a321c Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 15 May 2024 09:47:20 -0700 Subject: [PATCH 08/13] add name --- demo-app/settings.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo-app/settings.gradle.kts b/demo-app/settings.gradle.kts index bd1f922fb..9e118c402 100644 --- a/demo-app/settings.gradle.kts +++ b/demo-app/settings.gradle.kts @@ -1,3 +1,5 @@ +rootProject.name = "opentelemetry-android-demo" + pluginManagement { repositories { mavenCentral() From d3f18a3013f976c20b13f7923201eed7c1cb0b03 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 15 May 2024 10:24:40 -0700 Subject: [PATCH 09/13] scale image down --- demo-app/src/main/res/drawable/otel_icon.png | Bin 15961 -> 12503 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/demo-app/src/main/res/drawable/otel_icon.png b/demo-app/src/main/res/drawable/otel_icon.png index 3d24a34089ea40faf7b4066c84064b949d0953fa..06efcdff9a28c32c8e2850222dd7be6f5506e5a8 100644 GIT binary patch literal 12503 zcmZ|02{hF27e78`%ozKY>|{^E49VC(wvj{)6_tHNNEE_YG7(`AEvB+Bp#?33EMtT| z8A~;yY@-FA5i`YPjo&kU&-tJ8Kfm)kj^jSdecgMX<-VWiK3B#u7YAVhIROX+BJ6m` z&J_aTS>gU75um33<8&tYvj>03)foaIXhI;#sSwBps7juPK%!9)2-6n=F(pGF(h-HN zICIc|@ON^sgY0mBO53Y%f*QUkM`wG!dAO*!j1Y?dsV4-Y|I*RU`grW;#mTs4uM>U^ zKMPXT#i;v{Z}tkDwBAo|88N+mTEVjM^yAY^`okywMInlo3&&6YwIfUedF)XELPkv^;PxN;zXCFPb{x^*7Mzm z^3@&lD_1TbYUjy6{?Mpe8N->=v-M7K!?i{>#HXarZEgt%vJ`!}1hwaLkU?M8&aNIV(y|XbqQzGUSRj*zt z#PYDKxGjDNuYAp2CbPG7lC64bLPfa68+&J^D(XyRqa5YjzL4EXtyqKk`~zu6{Jqi4 z&pE&vc);%EOx)-}fI6V|f!m{r+asNZ2R)#mHk+Qutp$|uf(K0p+dc=#k*EUzcM13X$p zAv`U75eFjzm|;wnq1vD~;;of+1d(2IDF>!3u*$SzcXl_?>QK9dMG)N(4-|M;LF{%7 zPbCptfMRv0Y>=&^kndeJLBL4ny~N}SxA4>^Ke{0pyy$_+rYn$ z%CydgFwy|RQ(4X-uJ9I~wP0rUupNoO`xlUJ(79dw9vK(TWwrN#)*bm@F%J}F8;xG- zBP4pew6R9I>N4VFoSi=>TRK(?w3=Zg%7|L;m*_Mn-P zD6owD=~;MsUjSGWeKpd3HMw2fWrWku!TE5P(f+?Mq5$R`wjF~_1Ut(0=U+f1p!EL& zssJkdFC_>1fh7yXahHV|mqQU$Rf8&max|b`aw$bFHOi&rxzs9`k_D8b31E3hzSy@(aTn8qrk8pd%}+q4hUzZsE^x`bWjN9m?;keaTAx zPSK;d`WiNfc)%Yka`?5sUZ7`vSm#2$BO%xID2d7G&`uEr#1Et9M9B!g2*n6-_GDLm zKl17Hz7u2Fgo~zJt+X@C$SfXno;6zr52YBNkl{?xC+v{B_vu2QEBcP&d%{-yLI(?{;JVT=*Vm6OIY zpf&PuEBcGrrZ#1n*dshW(n#qi9zFiI(T&?EXRJCK4l8zu-z>bJTp%IR4a0h6|91q8 zPbF64I`B}Bbc?v7N++iR#}nPCvB|YE`^_G%(`*Xhnh_i*+XMX9$er^QVB7}OySdKr zbN*SnTPH(3+N1Y>e6MQeewE*(qZR)LddlA7rF3zn$ow(jFulV5)nvAGtf`-UnDW2g zSv7Op&|A0iMEd?Bf5WlfW*u|&hrj+?ti-WC3*ua%@c+pTz_FNFI9GKz*Nu+cQOB`1 z1YKRT1akhW|E|LOZI-KRH$e=zUiUNQ*!CCF4=NEWf8BnQT^6BM-^J05>GxNU3<=JA zpVEBI;je#@r+7y0PkK&1U&+!dr6g02sn-?4)!Z-L^NuAJ`hapV<*xRg9i>GXx-NxK;Rm z&UJLjU4Rjo)2i=Zt3`^#gAp`vqbI63S@_cAgMd}F6-!yC_7$STvq8THnXUTgYJGd# zq5MxGl#RA{u_MFuM1yES2>net;t?)Os9( zFXqnsgmf&dL7~Y^06$z+XE=Mx0KnfQf2C(w7nst>LBM3;{$y!Ld{5Vt!lb@%BADDOb@AXszXOy`}%6h}% zPOf!kCxT=QK z6395z-f4+l^IMu--_A1=*OtK7rD0rI1^Z@=PZ*Qric-uZv;{z&EGJ3EY?d)-7gB_F zcOnr!X=a)<+vc4DlTS#pY*Y%RLi^Dc@x`Th`K%cdjobu<~yg>(CXH0-^* zX!i#s!jxRLNpp8zpg--lNkwsWFOU{hSt}bEor)WB(n0gNpSgLjfv?wd{nG8GgcrLb zBj(hctD0;lq}JjY>uUtpDTUhVkq}y!cdsx=tc!M8CYWb89&n;aEv@}|gw66^E@RVY zk#J?3;VL~t=3<6YBx?Ts0VQ6AB7#~aLWVP|kzpbe6)cy_d#7p&SqnZXCja__Pue}Y z0Aq|UuVO^28PW@;fw{f;SssJoU=Qh{m>-<}!c_iNr-^9Yep7Q)FN+M8mu4e$sN~Uk zY+}Nv*Fdm(a6C5A?^F+0huRaAR)A*jOP{;r^%t#Gs#y)7<;ids&&qO@s=R#z;Nh_%D!=K{58bujcXZW0OCWjr6Q!wdAiv z2goYoH~h}>qplyCR8gK$NtcSmIQGK(4e7TQ-)<|qg(uVfO0)`n;)RtKU3Y#6n+vWT zY%t;U{(}tHW!@*2h$j6JRGE!Y^WU~i_))Q@U_?V?S`{`ZQf8amWB zdUIpWfC|4l!?~+RHmX(}>t)d-b0#0YBUzay6V0KA_$D&5!J%62EPcfGrC530YoS&;s-mvA zg@j6cC}BA7DoAQ2d`k~7;Dk;C01W^Tp_9^c>Q=FJ!RY|{iDnj$6;E~I01*@e=_hKk zQ%xq?_vlF?yfVRg;U6E^Akb+;Dn$=$>JvB4Aa#VM5K0$@u2~nT8Zh@!G#Sc7{pu;P zu>Mk~JlW{zvE7VBO0dw>!`XRr_C|RX0`H z+(-B^FTPmbVcu0Whd!cmg67l1XlwcP73p>OO%0qMS zC0Xy$1aX!d6>9A?N-3F9wC zwg*goVGS4An{3ZjGm#|S@9uunierLfqRrfU?%s%DMw11io%&sVpdVQ_t&CB?2w)IvMmF>Al}Y)k=-F#;>C+Gb=QO=>JS~U1lhHNY(c6CJI^3)iFrp%OJ-tvkK={dyBJ-R3$-t!kMy=_3AJV#y}(aN#p<&CseT+y zPrfZ5MhZo9-k#2abRZHG)&yqE*AE^R=ux;h4R5w$M=^M*DjS}%%S!0^eebVR{wS(M zI4kRU!P}H#`OZ50+0787I3UwUN9jAyM2RxutM-(3q7`p3w)v8!R&QGn5O|Xzwi3dK zz9q{!Lwt_(Thp_h>)n(|H^DBhLW=p#1)JlUVXw)n`PS|@32*h2r|F|&*l#RoM}~@W zu-!ziy7}nPp0;TVIDX0v;nnkok;#%M@3pYn#9-;Efw z*p24~2<*XW`nI0KpI=>Qpk326Y zytgwITRvQen~q~|e$1L8{S%M%Jh1A)ctZIDrnJ{{{7u-LmTrwLy8fFS=LzW_1+|a6 zVh#PAi9M1@+W5M~Z>_LfSf(#c=aZdRa5g!AO+VRPXxm%_Uzex(r}o(42i<5skHgJ- zLyXvozWw5>@p1))oeaX{KAOf{Nf#)e=FAYNHddYLkC{!wSM_^6Bbn5kV@v{VL7_JE zQ5kE&0aDH5F!XaMyJdEyv8aqtQ_4NIH_2^mcj&WSsP76*@pW*c_FuQ?HBh{W-@f6O zVpFXzVqbqfo-1U(4rP2w4UW<2^~C>FXnl6#98IU#ZSG+_Z)gP;E4IlE0siN3#gjgq4?) zgN8n$p2D6cYk$(Zrn5=yM0dxHrsv1gNb8p~vo;jOeGm%B2|i2?Tj@tPzx8w&d-cPZ zjfcSRlfeB+Jhg%*LADCT{y2A+1Wb%XCr)GQ zpOnNd0lxz8fO`s@ui-}V>X@4@Zv5cR6K%j$v*|zrFQtSbqU6H;b=jxRYm%lq;f3%* zv$a_HUN5gNIc|dT&f6N z;_(ruEdJ{|r2@HAo$I@G);cmm(eL%PHRDRnwaFTtn5BQDZlg;+hcFsbubCbEF0oQZ z)`u(cw_O)o`Cj`n9AOL%g0gs$Jaz=T>pWW|PaNn?2rPlRKtDbZ*#LpZKglNy8=sB`@M(pHC6e5h)YYDxB_1SaxI84yb-DT zovQc{9KYp%nlMgL_8p3}o;cQg8Cne6lJfH>cdYZwsP=5!`>u4={nFC$5jp(S^-!V~ z&-AtZ{z(uvf;z*Ix!LuN8OR7H#=t@!%4fH_{<`t%v>#1=*%E<13gVrsa1c6>+)#{6 zZYOr~Y-gZG%^51ORo@3sWE;+Auk)~ZskcAAbC|QeNZ_5>`iZM8xg}I2yai`>jtJ+_ zZ(mi5GI~ok4utus-c|75wqtb5EVr18tRelp36#9n_o(?05;~mTLJ4x4_<4-v!n=L# zSG|A9h%M5+Yr3j_J3yYDIz-NmO?>jL*f zy#>sl0An6GBfKQhvrj%j6C|3YzK{mfzx>+87;?4Zho9zY%Ru!P)Ayy+J(XQP`3H*8 zdY7o|NG?gVXKIxlTZK$rpZhRk09s|1KPKjhamFf^i;#~V{5j3kDvikHEA~qCrH>#| z>fo}=AD^i1&$~yxSyS}&MCfkG*?6nKkNWBZJ*A=Ez2=$A{L-)Oaq@~v$TsMh2}g2R zG9981yF;vqG79gb%aFAcPCM(h~id<)_PK|C4B7wn^kLU_Z>Yi_b=HYQjlH3zqGoSVN$ESg?25t?Ix+0dcK6pQvsSuV&R;=DfF1)!SgArO&r1I*ELhd|B zx&aeaqut*531Xhl08}^GAx6({oar2oF}7n!@{s)U zZOQ^s+BIt(`27&wb7~#GufUG-S-#nl{@l3e*DRJJ7cd+@NY;7|U;E8iJvoA{c?CV{ zvPKS9^_)rE*J%6WDfWTwYNT+40dOg52<;!% z-(TaR240u0rlN=5F4}o+7B;kw+NxUh>QY{1G-pn{NGspg{-R9qaoO5YmU>gVnv5PA z%%*U}S>aZUsXXPcajENcqPfFdwC&u7qiStEdJm?38y-JApqt{2!53GBCXavaxcPZz zJYH;7VKIiyNgnrg; zR5m{-KAYqt`*UektS|@Y zUm>?s0PT5<^XtvevKaF(f1arC7yRtlsQk}Kha?3v6tb18nhd_U-I*dRwkWVVDRV?u z?%yF~fBEIODDQQ-i_$|TLLP-1){kBZ5v)mZT937k_)GK`Q@q7ltXFo;jC$urWjj5% zUQX;NAH=LGX^W|s;*G>l$;L>m`afzXdZ|v122#gI4qxPpNP4|Fo)x>}zVC*$elnVM zi<7$i{OJ$tHr(_+M*j6&-Lw*HTm2+@{vOeqg~3mmfW5ln@q5oy+@~|d(6Z~xbGQ5X ztx|g$Bxgcmg7+cXyMaDWG?qS(>s((o?YtI2Ze0$sx-o%#oDucX3CTKq7U#F&1zrpr>{!)1S1gbDWn!nvE}$LE?<-quXD)$ikAuk0aq{C zDIbfT2SGriYh*Xt(hNJfdTUn-A5dW0b zNOg;7OsT9krp5>yazoF{8qV6EwwZXDKZ$MYZaz~0(LF?~3UZfVS+Ky!4c$WPe>C{w z!iqEe`QV-xuY&Z?r;TCmj1Dj%feK}z2!sWQGM+ONzjGk_`$?+Mg{S7pY>V+zjUV9Y zFb8bgLMXc&Ge9W~>Lp8uYhNrd^m0Vn@9#t?!0ihic66!s7oU29UW&)}q!f$erv$Tz zuc()Iro&opHq^!Je+BCVBPe%bQzbx}aZ#K_5d8k+c=a10f+h%EDu}IbC+%L}R`Rjv z70G?i5;floRvcnmI`ed`OP=hCkj(Ow$&Kdv_7btxKLe|pcI|E)DD620v_9-g>&&-&;a^6E#P z)X0IS;97Rz7k*2aQOQi1sPG=|C?ej>h({|>c8*QGf1XJz)$*sshbbcrAKE_?Sv&cy zuNlTxWsJR9HG5j7d@!kGtzy}X$f`_Iq9-COc<@v4uXtk8&$+k45^kdEuUz{;0-DGa9^Ic#8X(CWer$#)Rk9agFid-o1H#?OyqBtGrv;z zNp_|AayMCLOtIOAWcKiyzXtnLYA$#Zw*N9FIZKo=uTzj`JGiY|JPoT0Z zcSf*2PWWWtP^5+bM2x&Pq8!RG&?E{yWo5+@%89uzBMPt z2THhBlE_CM<+CV_`t+$ZF_+)*F zm`nFtCLEhRSd*z)-A&*fKYwiCXE#MDRf@4qI^bZBT}RA3+!)tPB)#|a?+ANPzgxVn z)M!?&Nst|Zu+E*gVF)oaYD*y0`7Lcq1>aEjf2p?bM%{OOk5?9y#E#ggt@lvMC_gC~ zsq3E#9waru7ph$wV3Ti4!)Jve2Uw zIhwCIXS52VunXyvp-DmsH&A7VUG6|v6}JdHe(+~H$PX3X_T)WtA~tI=nr)E*K2(9r z>B33VSzD^!r<|MLPm>>AM6`RENs4G3j{KCuwvae`DX+|SM0rnP-#|3aZAJdM^;NCH z&AM@$j(5dFcT?3ayMDdYjHwLZ6AK=^5dE12jkhUu3=FBDK1#mg`}*2B#o->Zk9BOv zD6t~aXsGn%!X9dX-1~$a9;F-e9ae$~2Hg{hKQ&p)ZU)`^w z-Q!8luRJAiUrl$#CeX|j1p2FqtCdL-0xvSfmY3baufGi%9*^c*?uCb9}Y{B>Q3ebCpIDU7@HsSkivFB5}!SZa?Qrh;BV>iy>BVEDRQ ztAxL4y&7BJ-yBj8~V|+ zd}(tihlvyA-43ck07}%+uL6757ou z6_N}GB+=mSsV#{?JGA^>CmB;WKZ`G|dEHef)sj2!p#QXfxjb27;(HzFt zaar*Q)R%o()bL7s@B|n*?AgWaA*i`9^A~d@P$Hf@Xq8O~+4$yoz{wh2dmCbaLu(;=#y|IWOTuC-k4u-1128eXU>Rp9K$ABgLWJ@Aql}`<1sQH5t1Z28?)$J5iY@=40nS4;$p8DFBOX zUDADwCJJ|fZbO>2W)fCxF2Fi?+C;Jx5AY{-Qe;?7UIH{61oytV<}L)G6^lm>Bg(n?6^f=Z${Z@U^7 z?a-``x~pMePjrAe@N7zm47fX7J1ChX)55=|%|6S>O1%+Y z*Ku8?pz`N_nH6yr5KFZg^HYZYux^%E-^~!9&b)t=%;6jjF~IaDJbI4Abs9zw>!?vX zgvOLHGGn5e9()-kKPLGe-}A5$T9avD`KI3ew4E4#(Uv3kj#Pw zL42SW>bIX|%*!l?O<>oo)(=)HSB+*PH$6zr>drv{!|CNMG8ke6d>KYm?A!Xhz#m?3 zDz$c$x;N7rQmJ18t?Jr!*Xk}!OU1(2;S^h0t64EDD;HsD9h>{h1@)&T7H?V2 z*YGD#!qIi;y!6UxObmPq(YAXmENycvOKf`7@GL!hy-fsm8QkadD_=D66LbsBBt)L> z@DH@PC-VEb6eq};6T2q)`&%;j@=@F^omGp7};-0yGxP0z9YrO{Yp?2;`q z+|4caW42;6-ZD?O*7%?NTOVu0*Z5NfpL~Ai3sCGnLLPx{zPk34nNk+-mgQo4A51BS+UUmK(HiucbHF5!gxIVMYeCIfELG(PvV;1z!(P zYB5%^B4ED;?~iPE{vk-QlDJxafLlI4&fC5_%b8*YVNq(TeQ6qwlCmahXTnAdr5!WC z&dt|s8m66pg!GHk%Aw=IN1(EnW)jpIdeb2Y^mV%*BfhIbDH~m&J`m7#Vt_Q7BJG*2KwFKGkl`|Eu3xGAc3RXFGy*ZS($Cp0^V;-6i$6 z@-V&B7G&&!ob`nT`c6cJA95Q?N$b;qx7 zO@aLyj&csa!RY8YzPHIgy5BG-=ZNKV-dGK`1j1^s$vR10`;H5*qNx<8lUL~`!B*Yz z&-=Tjwn63KOjg-phB;iI-t(@OTd|E|tbrT^M`rFIT+vjVQ$=y(>vYPex4Hn$#W|ZW zrSJlE`*)v8ZGYpYMKP)%-6Vgb?1OdsBJkWvz-O4+ZnpHW=Kw$cpt0JH5{va6n^r36&waS@7rUBv{ zWd_nKf0yG^>-0+8G%^9ZNkKu_Gh)`(IZwQ!oI|wm`TB)}gE&k~0OIC|?bd_rtH9apKjdUte5>RmT zfJP5>Exr`j%xaNo7Vf#Ai?j{9^$G;%M(;S7+mU_5T1WiJf}@ literal 15961 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 P=xz&jhiUQ;2TuM6{VG!e From 6ad2aad1644b92bc2a1716ca353bbc8ace7ccfc6 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 15 May 2024 13:11:00 -0700 Subject: [PATCH 10/13] more dep updates --- demo-app/build.gradle.kts | 4 ++-- demo-app/gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index d3e459f33..0a2e6abfd 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -3,7 +3,7 @@ import java.util.Properties plugins { id("com.android.application") version "8.4.0" - id("org.jetbrains.kotlin.android") version "1.9.23" + id("org.jetbrains.kotlin.android") version "1.9.24" } val localProperties = Properties() @@ -43,7 +43,7 @@ android { viewBinding = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.13" + kotlinCompilerExtensionVersion = "1.5.14" } val javaVersion = JavaVersion.VERSION_11 compileOptions { diff --git a/demo-app/gradle/libs.versions.toml b/demo-app/gradle/libs.versions.toml index 15c8e4fbf..80e982d64 100644 --- a/demo-app/gradle/libs.versions.toml +++ b/demo-app/gradle/libs.versions.toml @@ -2,7 +2,7 @@ opentelemetry = "1.38.0" junit = "5.10.2" spotless = "6.25.0" -kotlin = "1.9.23" +kotlin = "1.9.24" [libraries] androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" From 510ddf4060ecd0f60ec3ddae0a2b6dc0c607abb1 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 16 May 2024 12:51:42 -0700 Subject: [PATCH 11/13] remove root local.properties --- .github/workflows/build.yaml | 4 +--- .github/workflows/codeql-daily.yml | 2 +- .github/workflows/pr-check.yaml | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ee0299f74..df4d3c237 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,9 +19,7 @@ jobs: distribution: temurin java-version: 17 - name: touch local props - run: | - touch local.properties - touch demo-app/local.properties + run: touch demo-app/local.properties - name: run gradle check run: ./gradlew check - name: build demo app diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index 889eb3048..215d106a2 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -20,7 +20,7 @@ jobs: java-version: 17 - name: touch local props - run: touch local.properties + run: touch demo-app/local.properties - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index a582c09c3..b3afd1f1b 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -14,9 +14,7 @@ jobs: distribution: temurin java-version: 17 - name: touch local props - run: | - touch local.properties - touch demo-app/local.properties + run: touch demo-app/local.properties - name: run gradle run: ./gradlew check - name: build demo app From fe073c825a65b56d6d2d8d9abc2d0d0610110ec7 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 16 May 2024 12:57:00 -0700 Subject: [PATCH 12/13] add target sdk for app --- demo-app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 0a2e6abfd..9fbb67ac0 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -16,6 +16,7 @@ android { defaultConfig { applicationId = "io.opentelemetry.android.demo" minSdk = 21 + targetSdk = 34 versionCode = 1 versionName = "1.0" From cac9e6df43df8b7ab5bbb4bd5558ac6077efce40 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 16 May 2024 13:07:30 -0700 Subject: [PATCH 13/13] simplify catalog --- demo-app/build.gradle.kts | 42 ++++++++++++++++++------------------ demo-app/settings.gradle.kts | 5 ----- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 9fbb67ac0..0c2de8d08 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -59,30 +59,30 @@ android { } dependencies { - implementation(demoLibs.androidx.appcompat) - implementation(demoLibs.androidx.constraintlayout) - implementation(demoLibs.material) - implementation(demoLibs.androidx.lifecycle.livedata.ktx) - implementation(demoLibs.androidx.lifecycle.viewmodel.ktx) - implementation(demoLibs.androidx.navigation.fragment.ktx) - implementation(demoLibs.androidx.navigation.ui.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.constraintlayout) + implementation(libs.material) + implementation(libs.androidx.lifecycle.livedata.ktx) + implementation(libs.androidx.lifecycle.viewmodel.ktx) + implementation(libs.androidx.navigation.fragment.ktx) + implementation(libs.androidx.navigation.ui.ktx) - coreLibraryDesugaring(demoLibs.desugarJdkLibs) + coreLibraryDesugaring(libs.desugarJdkLibs) implementation("io.opentelemetry.android:android-agent") //parent dir - implementation(demoLibs.androidx.core.ktx) - implementation(demoLibs.androidx.lifecycle.runtime.ktx) - implementation(demoLibs.androidx.activity.compose) - implementation(platform(demoLibs.androidx.compose.bom)) - implementation(demoLibs.androidx.ui) - implementation(demoLibs.androidx.ui.graphics) - implementation(demoLibs.androidx.ui.tooling.preview) - implementation(demoLibs.androidx.material3) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) - implementation(demoLibs.opentelemetry.exporter.otlp) + implementation(libs.opentelemetry.exporter.otlp) - testImplementation(demoLibs.bundles.junit) - androidTestImplementation(demoLibs.androidx.junit) - debugImplementation(demoLibs.androidx.ui.tooling) - debugImplementation(demoLibs.androidx.ui.test.manifest) + testImplementation(libs.bundles.junit) + androidTestImplementation(libs.androidx.junit) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) } diff --git a/demo-app/settings.gradle.kts b/demo-app/settings.gradle.kts index 9e118c402..10e3d2827 100644 --- a/demo-app/settings.gradle.kts +++ b/demo-app/settings.gradle.kts @@ -13,10 +13,5 @@ dependencyResolutionManagement { mavenCentral() google() } - versionCatalogs { - create("demoLibs") { - from(files("./gradle/libs.versions.toml")) - } - } } includeBuild("..") \ No newline at end of file