-
Notifications
You must be signed in to change notification settings - Fork 199
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
Move diagnostics package out of bootstrap module #3190
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a33abc5
Move diagnostics out of bootstrap
trask be679e7
Suppress spotbugs false positive
trask e34db74
Update slf4j and logback!
trask 1fcbd93
Merge remote-tracking branch 'origin/main' into move-diagnostics-to-t…
trask 1cd9294
fix
trask 3e3abf3
Fix merge
trask fe7aed8
Spotless
trask d79edc3
revert
trask 43cdb36
Merge remote-tracking branch 'origin/main' into move-diagnostics-to-t…
trask 6c1453e
Merge remote-tracking branch 'origin/main' into move-diagnostics-to-t…
trask File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,14 @@ | ||
# This is a Gradle generated file for dependency locking. | ||
# Manual edits can break the build and are not advised. | ||
# This file is expected to be part of source control. | ||
ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath | ||
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath | ||
ch.qos.logback:logback-classic:1.2.12=runtimeClasspath | ||
ch.qos.logback:logback-core:1.2.12=runtimeClasspath | ||
com.azure:azure-sdk-bom:1.2.14=runtimeClasspath | ||
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath | ||
com.google.guava:guava-bom:32.1.1-jre=runtimeClasspath | ||
com.squareup.moshi:moshi:1.11.0=runtimeClasspath | ||
com.squareup.okio:okio:1.17.5=runtimeClasspath | ||
io.netty:netty-bom:4.1.94.Final=runtimeClasspath | ||
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.27.0-alpha=runtimeClasspath | ||
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.27.0=runtimeClasspath | ||
io.opentelemetry:opentelemetry-bom-alpha:1.27.0-alpha=runtimeClasspath | ||
io.opentelemetry:opentelemetry-bom:1.27.0=runtimeClasspath | ||
org.junit:junit-bom:5.9.3=runtimeClasspath | ||
org.slf4j:slf4j-api:1.7.36=runtimeClasspath | ||
org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath | ||
empty= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...gnostics/AgentExtensionVersionFinder.java → ...gnostics/AgentExtensionVersionFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...agnostics/ApplicationMetadataFactory.java → ...agnostics/ApplicationMetadataFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...nostics/CachedDiagnosticsValueFinder.java → ...nostics/CachedDiagnosticsValueFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...tstrap/diagnostics/DiagnosticsHelper.java → ...ternal/diagnostics/DiagnosticsHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...p/diagnostics/DiagnosticsValueFinder.java → ...l/diagnostics/DiagnosticsValueFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...diagnostics/InstrumentationKeyFinder.java → ...diagnostics/InstrumentationKeyFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...tstrap/diagnostics/MachineNameFinder.java → ...ternal/diagnostics/MachineNameFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ts/agent/bootstrap/diagnostics/MsgId.java → ...hts/agent/internal/diagnostics/MsgId.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...gent/bootstrap/diagnostics/PidFinder.java → ...agent/internal/diagnostics/PidFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...otstrap/diagnostics/SdkVersionFinder.java → ...nternal/diagnostics/SdkVersionFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...bootstrap/diagnostics/SiteNameFinder.java → .../internal/diagnostics/SiteNameFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...rap/diagnostics/SubscriptionIdFinder.java → ...nal/diagnostics/SubscriptionIdFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...ics/log/ApplicationInsightsCsvLayout.java → ...ics/log/ApplicationInsightsCsvLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...licationInsightsDiagnosticsLogFilter.java → ...licationInsightsDiagnosticsLogFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...cs/log/ApplicationInsightsJsonLayout.java → ...cs/log/ApplicationInsightsJsonLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...p/diagnostics/log/MoshiJsonFormatter.java → ...l/diagnostics/log/MoshiJsonFormatter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this was what motivated moving this code out of the bootstrap module (in addition to it being a generally good thing to minimize amount of classes in the bootstrap module)
(although this comment is now very outdated, and we'll move to jackson)