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

Update upstream agent #49

Merged
merged 13 commits into from
Nov 29, 2023
Merged

Conversation

SylvainJuge
Copy link
Member

@SylvainJuge SylvainJuge commented Nov 27, 2023

  • switch to external toml for version catalog
  • bootstrap updating dependencies with dependabot (on a daily basis for now)
  • needs to be merged on main to know if the dependabot part works as expected.

Closes #15

@@ -15,3 +17,10 @@ updates:
github-actions:
patterns:
- "*"

# Gradle
- package-ecosystem: "gradle"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[for reviewer] this configures dependabot to attempt updating gradle dependencies in gradle/libs.versions.toml, maybe other files are covered as well (but this will be the central place where we attempt to configure dependencies in the future).

@SylvainJuge SylvainJuge marked this pull request as ready for review November 27, 2023 15:57

# Gradle
- package-ecosystem: "gradle"
directory: "/gradle/" # for now only on the version catalog to prevent noise
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[for reviewer] for now we only try to update versions set in "version catalog", covering all dependencies should be part of #8

Copy link
Contributor

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice!

@@ -16,8 +16,8 @@ subprojects {
ext {
deps = [
autoservice: [
"com.google.auto.service:auto-service:" + libraries.versions.autoservice.get(),
"com.google.auto.service:auto-service-annotations:" + libraries.versions.autoservice.get(),
"com.google.auto.service:auto-service:" + catalog.versions.autoservice.get(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can't use libraries instead of versions here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know yet for those and plan to tackle it with #8 later to focus on the otel parts.


testImplementation("org.mockito:mockito-core:5.5.0")

testImplementation(enforcedPlatform("org.junit:junit-bom:" + libraries.versions.junit.get().toString()))
testImplementation(enforcedPlatform("org.junit:junit-bom:" + catalog.versions.junit.get().toString()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: Impossible to use a library instead of version, correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, here it's possible to use the catalog in a declarative way, but I will do that when dealing with #8 to keep changes minimal here.

@SylvainJuge SylvainJuge merged commit 4c591bf into elastic:main Nov 29, 2023
3 checks passed
@SylvainJuge SylvainJuge deleted the update-upstream branch November 29, 2023 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

automate updating the upstream otel agent
2 participants