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

Merge main into version branch #326

Merged
merged 48 commits into from
May 30, 2024
Merged

Merge main into version branch #326

merged 48 commits into from
May 30, 2024

Conversation

apmmachine
Copy link
Contributor

Created by Github action 🤖

dependabot bot and others added 30 commits December 18, 2023 10:59
Bumps the github-actions group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).

- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Created sample app dir

* Adding code from sample-app-android-apm

* Setting latest lib version on sample app

* Updating the sample app README

* Adding doc comment
* Calling getSimOperator once

* Validating simOperator calls

* Updated changelog
* Preparing for the next release

* Update gradle.properties

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Co-authored-by: César <56847527+LikeTheSalad@users.noreply.github.com>
* 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>
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
* Making OTel resource configurable

* Validating configured resource

* Adding resource config docs

* Updated the CHANGELOG.asciidoc
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
* security: add permissions block to workflows

* Add permissions
* Removing links to latest version of artifacts

* Adding note to warn users about version 1.13.1

* Update docs/setup.asciidoc

Co-authored-by: Emily S <emily.s@elastic.co>

* Updating note

* Removing 1.13.1 notes

---------

Co-authored-by: Emily S <emily.s@elastic.co>
* Validating version override format and major/minor values

* Reorganizing code

* Reorganizing code

* Providing clearer function name
* Enhancing slack messages when a release is triggered

* Showing release input params in slack message
…285)

* Created action to automatically update version branch with the latest changes from main after a release

* Update .github/workflows/updateVersionBranch.yml

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

---------

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
* Removing androidx libs version constraints

* Updating tests

* Updating sample app compileSdk version

* Updating notice files

* Updated the changelog
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
* Upgrading to gradle 8.4

* Bumping up gradle env

* Using MaxMetaspaceSize

* Enabling desugaring

* Using new env var mocking lib

* Adding buildconfg fields for tests

* Updating tests

* Using Java 17
* Bumping Kotlin min version

* Adding signals examples for manual instrumentation

* Explaining sessions in the docs

* Clean up
v1v and others added 18 commits April 26, 2024 13:57
* Bumping OTel deps and addressing Event api changes

* Addressing app listener interface issue

* Sorting lifecycle instrumentation

* Using new disk buffering api

* Adjusting tests to api changes

* Bumping up semconv and contrib versions

* Making CreateNoticeTask output a dir

* Updating jar notice tasks

* Adding notice file to repo for android libs

* Fixing jar create notice file resources dependency
#306)

Bumps the github-actions group with 1 update: [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/download-artifact` from 3 to 4
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Updating build-tools processor to not leak compile-only annotation

* Bumping up gradle in sample app

* Adding R8 common rules

* Updating changelog
* Adding faq on SSL/TLS

* Fixing typo

* Update docs/faq.asciidoc

Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>

* Update docs/faq.asciidoc

Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>

* Update docs/faq.asciidoc

Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>

* Update docs/faq.asciidoc

Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>

---------

Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
…b-actions group (#317)

Bumps the github-actions group with 1 update: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance).
Updates `actions/attest-build-provenance` from 1.1.1 to 1.1.2
- [Release notes](https://github.com/actions/attest-build-provenance/releases)
- [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md)
- [Commits](actions/attest-build-provenance@951c0c5...173725a)
* Fetching remote branches before switching to version branch

* Using checkout action params to fetch all git branches
* Adding http exporting path

* Updated changelog
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
* Upgrading byte buddy plugin

* Updated chagelog

* Updating notice files metadata
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
@LikeTheSalad LikeTheSalad merged commit 11472eb into 0.x May 30, 2024
8 checks passed
@LikeTheSalad LikeTheSalad deleted the post-release/main-to-0.x branch May 30, 2024 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants