Skip to content

Commit 3761997

Browse files
Release/0.14.0 (#267)
* Using gradle version catalog * Clean up * Upgrading dependencies * Updating notice files * Removing okhttp auto-instrumentation * Moving okhttp android test network call to the test * Testing okhttp async calls * Moving all okhttp tests to NetworkCallingActivityTest * Clean up * Adding OTel OkHttp auto-instrumentation * Clean up common dependencies * Removing android-instrumentation module * Adding OTel Android dependency * Initializing OpenTelemetryRum * Created LaunchTimeApplicationListener * Clean up * Adding OTelRumConfig * Updating tests * Preventing compileSdk > 33 to be enforced * Updating app launch metrics test * Updating UI span tests * Adding fragment destruction span UI tests * Updated coroutines context preservation * Updating sample-app * Cleaning up okhttp version lookup * Adding OTel Android note to the README * Updating the OTel Android note * Updated the setup.asciidoc file * Updated notice files * Update docs/setup.asciidoc Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co> * Update docs/setup.asciidoc Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co> * Update docs/setup.asciidoc Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co> * Update docs/setup.asciidoc Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co> * Update docs/setup.asciidoc Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co> * Updating OTel Android note --------- Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
1 parent 152a295 commit 3761997

File tree

67 files changed

+568
-2624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+568
-2624
lines changed

.ci/snapshoty.yml

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ artifacts:
3434
output_pattern: '{project}/{github_branch_name}/elastic-apm-android-common-{app_version}-{github_sha_short}.jar'
3535
# List of metadata processors to use.
3636
metadata: *metadata
37-
- path: './android-instrumentation/build/outputs/aar'
38-
files_pattern: 'android-instrumentation-(?P<version>debug|release)\.aar'
39-
output_pattern: '{project}/{github_branch_name}/elastic-apm-android-instrumentation-{version}-{github_sha_short}.aar'
40-
metadata: *metadata
4137
- path: './android-plugin/build/libs'
4238
files_pattern: 'android-plugin-(?P<app_version>\d+\.\d+\.\d+)\.jar'
4339
output_pattern: '{project}/{github_branch_name}/elastic-apm-android-plugin-{app_version}-{github_sha_short}.jar'

NOTICE

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ Copyright 2018-2022 Elasticsearch B.V.
55

66
This product includes software licensed under the 'Apache License Version 2.0' license from the following sources:
77

8-
- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.5.1)
8+
- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.1)
99
- Android Support Library Annotations (https://developer.android.com/jetpack/androidx/releases/annotation#1.4.0)
10-
- Android Support Library fragment (https://developer.android.com/jetpack/androidx/releases/fragment#1.5.3)
1110
- Byte Buddy (without dependencies)
1211
- Byte Buddy Gradle plugin
1312
- com.github.instacart.truetime-android:library:3.5
14-
- Kotlin Stdlib Jdk8 (https://kotlinlang.org/)
15-
- OkHttp
13+
- Kotlin Stdlib (https://kotlinlang.org/)
1614
- okhttp (https://square.github.io/okhttp/)
15+
- OpenTelemetry Android (https://github.com/open-telemetry/opentelemetry-android)
1716
- OpenTelemetry Java (https://github.com/open-telemetry/opentelemetry-java)
1817
- OpenTelemetry Java Contrib (https://github.com/open-telemetry/opentelemetry-java-contrib)
1918
- OpenTelemetry Semantic Conventions Java (https://github.com/open-telemetry/semantic-conventions-java)

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# apm-agent-android
22

3+
> [!NOTE]
4+
> This agent is based on
5+
> the [OpenTelemetry Android lib](https://github.com/open-telemetry/opentelemetry-android) which is
6+
> not stable yet. Elastic is proactively making contributions to this OpenTelemetry initiative and
7+
> we will release v1.x of the Elastic Android APM agent after a stable release of the OTel Android
8+
> SDK/API becomes available.
9+
310
Elastic APM Android Agent
411

512
See the [documentation](https://www.elastic.co/guide/en/apm/agent/android/current/index.html) for

android-common/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ licensesConfig {
1010
}
1111

1212
dependencies {
13-
api "com.squareup.okhttp3:okhttp:$okhttp_version"
14-
api "org.slf4j:slf4j-api:2.0.0"
15-
implementation "androidx.annotation:annotation:$androidAnnotations_version"
13+
api libs.slf4j.api
14+
implementation libs.androidx.annotations
1615
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dependencies.hash=C4E938CB5D2FBDF87B030546B2E27163
1+
dependencies.hash=7975FB0685D05968563B5868A424E0DC

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

-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ public class ApmInfo {
2525
public static String KEY_SERVER_SECRET_TOKEN = "server.secret_token";
2626
public static String KEY_SERVER_API_KEY = "server.api_key";
2727
public static String KEY_SERVICE_ENVIRONMENT = "service.deployment_environment";
28-
public static String KEY_SCOPE_OKHTTP_VERSION = "scope.okhttp.version";
2928
public static String ASSET_FILE_NAME = "co_elastic_apm_android.properties";
3029
}

android-common/src/main/java/co/elastic/apm/android/common/okhttp/eventlistener/CompositeEventListener.java

-51
This file was deleted.

android-common/src/main/java/co/elastic/apm/android/common/okhttp/eventlistener/CompositeEventListenerFactory.java

-50
This file was deleted.

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

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Copyright 2018-2022 Elasticsearch B.V.
66
This product includes software licensed under the 'Apache License Version 2.0' license from the following sources:
77

88
- Android Support Library Annotations (https://developer.android.com/jetpack/androidx/releases/annotation#1.4.0)
9-
- OkHttp
109

1110
-------------------------------------------------------------------------------
1211

android-instrumentation/build.gradle

-39
This file was deleted.

android-instrumentation/metadata/notice.properties

-1
This file was deleted.

android-instrumentation/src/main/AndroidManifest.xml

-2
This file was deleted.

android-instrumentation/src/main/java/co/elastic/apm/android/instrumentation/okhttp/client/OkHttpClientAdvice.java

-41
This file was deleted.

android-instrumentation/src/main/java/co/elastic/apm/android/instrumentation/okhttp/client/OkHttpClientPlugin.java

-53
This file was deleted.

android-instrumentation/src/main/java/co/elastic/apm/android/instrumentation/okhttp/eventlistener/CompositeEventListenerFactoryPlugin.java

-47
This file was deleted.

0 commit comments

Comments
 (0)