Updating opentelemetry sdk (#170)

* Adding disk buffering otel lib * Upgrading kotlin version to avoid issues with opentelemetry's kotlin version * Updating android-plugin module gradle plugin config * Using gradle version 7.6.2 * Using namespace for android-test/android-test-common module * Updated notice file's metadata
elastic · Aug 2, 2023 · be5ac53 · be5ac53
1 parent 55c4406
commit be5ac53
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 32 deletions.
diff --git a/android-instrumentation/build.gradle b/android-instrumentation/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "co.elastic.apm.android.instrumentation"
     compileSdk androidCompileSdk
 
     defaultConfig {

diff --git a/android-instrumentation/src/main/AndroidManifest.xml b/android-instrumentation/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.elastic.apm.android.instrumentation" />
+<manifest />
diff --git a/android-plugin/build.gradle b/android-plugin/build.gradle
@@ -34,6 +34,7 @@ gradlePlugin {
             implementationClass = 'co.elastic.apm.android.plugin.ApmAndroidAgentPlugin'
             displayName = "Elastic APM Android Agent"
             description = project.description
+            tags.addAll("Android", "APM", "Elastic", "ELK", "opentelemetry")
         }
     }
 }
diff --git a/android-sdk-ktx/build.gradle b/android-sdk-ktx/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace = "co.elastic.apm.android.sdk.kotlin"
     compileSdk androidCompileSdk
 
     defaultConfig {
@@ -24,6 +25,9 @@ android {
         sourceCompatibility jvmCompatibility
         targetCompatibility jvmCompatibility
     }
+    kotlinOptions {
+        jvmTarget = jvmCompatibility.toString()
+    }
 }
 
 licensesConfig {

diff --git a/android-sdk-ktx/metadata/notice.properties b/android-sdk-ktx/metadata/notice.properties
@@ -1 +1 @@
-dependencies.hash=10B02FCF3F89AE2FB4C10F150B4D3E60
+dependencies.hash=83E0E6D9CD40065C79FADBCA67A5607B
diff --git a/android-sdk-ktx/src/main/AndroidManifest.xml b/android-sdk-ktx/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.elastic.apm.android.sdk.kotlin" />
+<manifest />
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
@@ -4,7 +4,9 @@ plugins {
 }
 
 android {
+    namespace = "co.elastic.apm.android.sdk"
     compileSdk androidCompileSdk
+    buildFeatures.buildConfig true
 
     defaultConfig {
         minSdk androidMinSdk

diff --git a/android-sdk/metadata/notice.properties b/android-sdk/metadata/notice.properties
@@ -1 +1 @@
-dependencies.hash=E031E675FDFA0A70B2D4701CBDC88E2E
+dependencies.hash=4803E42B18EE973D53DEF65DEE8E2F66
diff --git a/android-sdk/src/main/AndroidManifest.xml b/android-sdk/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.elastic.apm.android.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/android-test/android-test-common/build.gradle b/android-test/android-test-common/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "co.elastic.apm.android.test.common"
     compileSdk androidCompileSdk
 
     defaultConfig {

diff --git a/android-test/android-test-common/src/main/AndroidManifest.xml b/android-test/android-test-common/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.elastic.apm.android.test.common" />
+<manifest />
diff --git a/android-test/app/build.gradle b/android-test/app/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
         classpath "co.elastic.apm:android-plugin:$agent_version"
     }
 }
@@ -15,6 +15,7 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'co.elastic.apm.android'
 
 android {
+    namespace = "co.elastic.apm.android.test"
     compileSdk androidCompileSdk
     testOptions {
         unitTests {

diff --git a/android-test/app/src/main/AndroidManifest.xml b/android-test/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.elastic.apm.android.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/android-test/build.gradle b/android-test/build.gradle
@@ -9,7 +9,7 @@ ext {
     junit_version = '4.13.2'
     espresso_version = '3.4.0'
     mockito_version = '4.9.0'
-    agp_version = '7.2.0'
+    agp_version = '7.3.0'
     mockwebserver_version = '4.10.0'
     androidCompileSdk = 32
     androidMinSdk = 26

diff --git a/...main/java/co/elastic/apm/compile/tools/publishing/subprojects/ApmJavaPublisherPlugin.java b/...main/java/co/elastic/apm/compile/tools/publishing/subprojects/ApmJavaPublisherPlugin.java
@@ -1,13 +1,10 @@
 package co.elastic.apm.compile.tools.publishing.subprojects;
 
-import com.gradle.publish.PluginBundleExtension;
 import com.gradle.publish.PublishPlugin;
 
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPluginExtension;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.gradle.plugin.devel.GradlePluginDevelopmentExtension;
 
 public class ApmJavaPublisherPlugin extends BaseApmPublisherPlugin {
     private static final String GRADLE_PLUGIN_PROJECT_PLUGIN = "java-gradle-plugin";
@@ -29,20 +26,12 @@ protected void onApply() {
 
     private void configureGradlePluginPublication() {
         project.getPlugins().apply(PublishPlugin.class);
-        configureGradlePluginPortalBundle(project.getExtensions().getByType(PluginBundleExtension.class));
+        configureGradlePluginPortalBundle(project.getExtensions().getByType(GradlePluginDevelopmentExtension.class));
     }
 
-    private void configureGradlePluginPortalBundle(PluginBundleExtension pluginBundle) {
-        pluginBundle.setWebsite(getWebsiteUrl());
-        pluginBundle.setVcsUrl(getRepositoryUrl());
-        pluginBundle.setDescription(project.getDescription());
-        List<String> tags = new ArrayList<>();
-        tags.add("Android");
-        tags.add("APM");
-        tags.add("Elastic");
-        tags.add("ELK");
-        tags.add("opentelemetry");
-        pluginBundle.setTags(tags);
+    private void configureGradlePluginPortalBundle(GradlePluginDevelopmentExtension pluginBundle) {
+        pluginBundle.getWebsite().set(getWebsiteUrl());
+        pluginBundle.getVcsUrl().set(getRepositoryUrl());
     }
 
     private boolean isAGradlePluginProject(Project project) {

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.7.10' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.8.22' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
     id 'co.elastic.apm.publishing'
 }
 
 ext {
     jvmCompatibility = JavaVersion.VERSION_1_8
     androidMinSdk = 24
     androidCompileSdk = 32
-    openTelemetry_version = "1.27.0"
+    openTelemetry_version = "1.28.0"
     androidAnnotations_version = "1.4.0"
     bytebuddy_version = "1.12.22"
     okhttp_version = '3.11.0'

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #Fri Jun 02 14:32:07 CEST 2023
-androidGradlePlugin_version=7.2.0
+androidGradlePlugin_version=7.3.0
 description=APM for Android applications with the Elastic stack
 org.gradle.jvmargs=-XX\:MaxMetaspaceSize\=1G
 version=0.8.0

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists