Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main to 0x #298

Merged
merged 29 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7e1dcad
Bump the github-actions group with 1 update (#250)
dependabot[bot] Dec 18, 2023
0d78519
Add sample app (#249)
LikeTheSalad Dec 19, 2023
f2264ed
ci(release): use new set of credentials for GPG and Maven Central (#255)
v1v Jan 16, 2024
5c9059a
ci(buildkite): vault context switch (#256)
v1v Jan 16, 2024
c00c4a3
Revert "Bump the github-actions group with 1 update" (#257)
v1v Jan 16, 2024
75a38a8
ci(release): use the new vault secret path (#258)
v1v Jan 17, 2024
ed1a6dc
ci(release): fetch field in plain format (#259)
v1v Jan 17, 2024
dbd3b99
Sim operator fix (#261)
LikeTheSalad Jan 18, 2024
b8ad9ba
Using short key id (#262)
LikeTheSalad Jan 18, 2024
6ff031f
Release 0.13.1 (#263)
apmmachine Jan 18, 2024
152a295
backstage: add tags for the obltmachine/apmmachine and other things (…
v1v Jan 26, 2024
3761997
Release/0.14.0 (#267)
LikeTheSalad Feb 2, 2024
947da73
Preparing for the next release (#268)
apmmachine Feb 2, 2024
2f9cf82
Updated the changelog (#269)
LikeTheSalad Feb 2, 2024
beeb312
Make resources configurable (#276)
LikeTheSalad Mar 11, 2024
d839f8e
ci: use VM with the installed tools and fallback otherwise (#274)
v1v Mar 11, 2024
ced2449
Preparing for the next release (#277)
apmmachine Mar 12, 2024
28d4cf9
github-action: listen for all the github workflows (#279)
v1v Mar 13, 2024
74cda37
security: add permissions block to workflows (#272)
reakaleek Mar 13, 2024
16eee2d
Documentation update (#281)
LikeTheSalad Mar 14, 2024
bf755f0
Cicd version validation (#282)
LikeTheSalad Mar 14, 2024
77ea42a
Updating setup doc versions in post deploy process (#283)
LikeTheSalad Mar 14, 2024
f33bb63
Cicd release messages update (#284)
LikeTheSalad Mar 14, 2024
561606a
Github action to automatically update version branch after a release …
LikeTheSalad Mar 14, 2024
05abcf8
Remove compilesdk validation (#292)
LikeTheSalad Apr 3, 2024
a24c350
Preparing for the next release (#294)
apmmachine Apr 3, 2024
421e18f
Main to 0.x (#290)
LikeTheSalad Apr 2, 2024
6153d01
Main to 0.x (#291)
LikeTheSalad Apr 3, 2024
1ae9929
Merge branch '0.x' into main-to-0x
LikeTheSalad Apr 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ ${next_release_notes}
* New feature: {pull}000[#000]
////

[[release-notes-0.16.0]]
==== 0.16.0 - 2024/04/03

[float]
===== Bug fixes

* Removing strict version constraint that prevented enforcing compileSdk > 33: {pull}292[#292]

[[release-notes-0.15.0]]
==== 0.15.0 - 2024/03/11

Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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.6.1)
- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.2)
- Android Support Library Annotations (https://developer.android.com/jetpack/androidx/releases/annotation#1.4.0)
- Byte Buddy (without dependencies)
- Byte Buddy Gradle plugin
Expand Down
14 changes: 0 additions & 14 deletions android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,4 @@ dependencies {
compileOnly 'co.elastic.apm.compile:processor'
testImplementation libs.bundles.mocking
testImplementation libs.junit

// To avoid enforcing compileSdk > 33:
constraints {
add("implementation", "androidx.navigation:navigation-fragment") {
version {
strictly("2.6.0")
}
}
add("implementation", "androidx.core:core") {
version {
strictly("1.10.1")
}
}
}
}
2 changes: 1 addition & 1 deletion android-sdk/metadata/notice.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dependencies.hash=F58F6A39BDAD2A7E96BD4C0924CF4A0C
dependencies.hash=77B4570CA3D2C0BA9C3541561D0679C0
2 changes: 1 addition & 1 deletion android-sdk/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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.6.1)
- Android Lifecycle Process (https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.2)
- com.github.instacart.truetime-android:library:3.5
- okhttp (https://square.github.io/okhttp/)
- OpenTelemetry Android (https://github.com/open-telemetry/opentelemetry-android)
Expand Down
16 changes: 15 additions & 1 deletion android-test/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,26 @@ dependencies {
testImplementation "io.opentelemetry:opentelemetry-exporter-otlp:1.28.0"
testImplementation "org.mockito:mockito-core:$mockito_version"
testImplementation "org.mockito:mockito-inline:$mockito_version"
testImplementation 'org.robolectric:robolectric:4.11.1'
testImplementation 'org.robolectric:robolectric:4.12.1'
testImplementation "com.squareup.okhttp3:mockwebserver:$mockwebserver_version"
androidTestImplementation "androidx.test:core:1.5.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockwebserver_version"

// To avoid enforcing compileSdk > 33:
constraints {
add("implementation", "androidx.navigation:navigation-fragment") {
version {
strictly("2.6.0")
}
}
add("implementation", "androidx.core:core") {
version {
strictly("1.10.1")
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void ensureExistingParentDir(File file) {
}

protected int getAndroidCompileSdk() {
return 33;
return 34;
}

protected String getAndroidAppId() {
Expand Down
7 changes: 3 additions & 4 deletions docs/setup.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ You can skip this step if your `minSdkVersion` is 26 or higher.
[[adding-gradle-plugin]]
==== Add the Elastic Agent Gradle plugin

To automatically instrument <<supported-technologies,Supported Technologies>>, add the https://plugins.gradle.org/plugin/co.elastic.apm.android/0.15.0[Elastic APM agent plugin] to your application's `build.gradle` file as shown below:
To automatically instrument <<supported-technologies,Supported Technologies>>, add the https://plugins.gradle.org/plugin/co.elastic.apm.android/0.16.0[Elastic APM agent plugin] to your application's `build.gradle` file as shown below:

[source,groovy]
----
// Android app's build.gradle file
plugins {
id "com.android.application"
id "co.elastic.apm.android" version "0.15.0"
id "co.elastic.apm.android" version "0.16.0"
}
----

Expand Down Expand Up @@ -122,7 +122,7 @@ Add the Elastic APM agent SDK to your application's `build.gradle` file as shown
----
// Android app's build.gradle file
dependencies {
implementation "co.elastic.apm:android-sdk:0.15.0"
implementation "co.elastic.apm:android-sdk:0.16.0"
}
----

Expand Down Expand Up @@ -155,4 +155,3 @@ Head to the **APM app in {kib}** to start exploring your data.

If you need to customize the Elastic APM agent to your project's needs, see <<configuration,configuration>>.
If you need to create your own custom transactions, see <<manual-instrumentation, manual instrumentation>>.

6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Mon Mar 11 09:51:53 UTC 2024
#Wed Apr 03 14:24:32 UTC 2024
androidGradlePlugin_version=7.4.0
description=APM for Android applications with the Elastic stack
org.gradle.jvmargs=-XX\:MaxMetaspaceSize\=2G
version=0.16.0
version=0.17.0
android.useAndroidX=true
group=co.elastic.apm
group=co.elastic.apm
4 changes: 2 additions & 2 deletions sample-app/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {

android {
namespace 'co.elastic.apm.android.sample'
compileSdk 33
compileSdk 34

defaultConfig {
applicationId "co.elastic.apm.android.sample"
minSdk 26
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"

Expand Down
Loading