Main -> 0.x

.ci/snapshoty.yml

@@ -34,10 +34,6 @@ artifacts:
     output_pattern: '{project}/{github_branch_name}/elastic-apm-android-common-{app_version}-{github_sha_short}.jar'
     # List of metadata processors to use.
     metadata: *metadata
-  - path: './android-instrumentation/build/outputs/aar'
-    files_pattern: 'android-instrumentation-(?P<version>debug|release)\.aar'
-    output_pattern: '{project}/{github_branch_name}/elastic-apm-android-instrumentation-{version}-{github_sha_short}.aar'
-    metadata: *metadata
   - path: './android-plugin/build/libs'
     files_pattern: 'android-plugin-(?P<app_version>\d+\.\d+\.\d+)\.jar'
     output_pattern: '{project}/{github_branch_name}/elastic-apm-android-plugin-{app_version}-{github_sha_short}.jar'

CHANGELOG.asciidoc

@@ -35,6 +35,14 @@ ${next_release_notes}
 * New feature: {pull}000[#000]
 ////
 
+[[release-notes-0.14.0]]
+==== 0.14.0 - 2024/02/02
+
+[float]
+===== Features
+
+* Making OpenTelemetry Android the base project: {pull}268[#268]
+
 [[release-notes-0.13.1]]
 ==== 0.13.1 - 2024/01/18
 

NOTICE

@@ -5,15 +5,14 @@ Copyright 2018-2022 Elasticsearch B.V.
 
 This product includes software licensed under the 'Apache License Version 2.0' license from the following sources:
 
- - Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.5.1)
+ - Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.1)
  - Android Support Library Annotations (https://developer.android.com/jetpack/androidx/releases/annotation#1.4.0)
- - Android Support Library fragment (https://developer.android.com/jetpack/androidx/releases/fragment#1.5.3)
  - Byte Buddy (without dependencies)
  - Byte Buddy Gradle plugin
  - com.github.instacart.truetime-android:library:3.5
- - Kotlin Stdlib Jdk8 (https://kotlinlang.org/)
- - OkHttp
+ - Kotlin Stdlib (https://kotlinlang.org/)
  - okhttp (https://square.github.io/okhttp/)
+ - OpenTelemetry Android (https://github.com/open-telemetry/opentelemetry-android)
  - OpenTelemetry Java (https://github.com/open-telemetry/opentelemetry-java)
  - OpenTelemetry Java Contrib (https://github.com/open-telemetry/opentelemetry-java-contrib)
  - OpenTelemetry Semantic Conventions Java (https://github.com/open-telemetry/semantic-conventions-java)

README.md

@@ -1,5 +1,12 @@
 # apm-agent-android
 
+> [!NOTE]
+> This agent is based on
+> the [OpenTelemetry Android lib](https://github.com/open-telemetry/opentelemetry-android) which is
+> not stable yet. Elastic is proactively making contributions to this OpenTelemetry initiative and
+> we will release v1.x of the Elastic Android APM agent after a stable release of the OTel Android
+> SDK/API becomes available.
+
 Elastic APM Android Agent
 
 See the [documentation](https://www.elastic.co/guide/en/apm/agent/android/current/index.html) for

android-common/build.gradle

@@ -10,7 +10,6 @@ licensesConfig {
 }
 
 dependencies {
-    api "com.squareup.okhttp3:okhttp:$okhttp_version"
-    api "org.slf4j:slf4j-api:2.0.0"
-    implementation "androidx.annotation:annotation:$androidAnnotations_version"
+    api libs.slf4j.api
+    implementation libs.androidx.annotations
 }

android-common/metadata/notice.properties

@@ -1 +1 @@
-dependencies.hash=C4E938CB5D2FBDF87B030546B2E27163
+dependencies.hash=7975FB0685D05968563B5868A424E0DC

android-common/src/main/java/co/elastic/apm/android/common/ApmInfo.java

@@ -25,6 +25,5 @@ public class ApmInfo {
     public static String KEY_SERVER_SECRET_TOKEN = "server.secret_token";
     public static String KEY_SERVER_API_KEY = "server.api_key";
     public static String KEY_SERVICE_ENVIRONMENT = "service.deployment_environment";
-    public static String KEY_SCOPE_OKHTTP_VERSION = "scope.okhttp.version";
     public static String ASSET_FILE_NAME = "co_elastic_apm_android.properties";
 }

android-common/src/main/resources/META-INF/NOTICE

@@ -6,7 +6,6 @@ Copyright 2018-2022 Elasticsearch B.V.
 This product includes software licensed under the 'Apache License Version 2.0' license from the following sources:
 
  - Android Support Library Annotations (https://developer.android.com/jetpack/androidx/releases/annotation#1.4.0)
- - OkHttp
 
 -------------------------------------------------------------------------------