Skip to content

Commit

Permalink
Release/0.14.0 (#267)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* Update docs/setup.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/setup.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/setup.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/setup.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Updating OTel Android note

---------

Co-authored-by: Brandon Morelli <[email protected]>
  • Loading branch information
LikeTheSalad and bmorelli25 authored Feb 2, 2024
1 parent 152a295 commit 3761997
Show file tree
Hide file tree
Showing 67 changed files with 568 additions and 2,624 deletions.
4 changes: 0 additions & 4 deletions .ci/snapshoty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
7 changes: 3 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions android-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion android-common/metadata/notice.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dependencies.hash=C4E938CB5D2FBDF87B030546B2E27163
dependencies.hash=7975FB0685D05968563B5868A424E0DC
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion android-common/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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

-------------------------------------------------------------------------------

Expand Down
39 changes: 0 additions & 39 deletions android-instrumentation/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion android-instrumentation/metadata/notice.properties

This file was deleted.

2 changes: 0 additions & 2 deletions android-instrumentation/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3761997

Please sign in to comment.