Update OpenTelemetry packages to 1.8.0 #3351
Merged
Conversation
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
|
Successfully tested retries. |
JamesNK
force-pushed
the
jamesnk/opentelemetry-1.8.0
branch
from
7cb1f6f
to
279abee
Compare
eerhardt
reviewed
Apr 3, 2024
...re.ProjectTemplates/templates/aspire-empty/AspireApplication.1.ServiceDefaults/Extensions.cs
Show resolved
Hide resolved
DamianEdwards
approved these changes
Apr 3, 2024
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8540815099 |
|
@eerhardt backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update OpenTelemetry packages to 1.8.0
Using index info to reconstruct a base tree...
M Directory.Packages.props
M src/Aspire.Hosting/ProjectResourceBuilderExtensions.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Hosting/ProjectResourceBuilderExtensions.cs
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update OpenTelemetry packages to 1.8.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@eerhardt an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
eerhardt
pushed a commit
to eerhardt/aspire
that referenced
this pull request
Apr 3, 2024
* Update OpenTelemetry packages to 1.8.0 * Update template versions
Closed
radical
pushed a commit
to radical/aspire
that referenced
this pull request
Apr 3, 2024
* Update OpenTelemetry packages to 1.8.0 * Update template versions
eerhardt
added a commit
that referenced
this pull request
Apr 4, 2024
* Update OpenTelemetry packages to 1.8.0 * Update template versions Co-authored-by: James Newton-King <[email protected]>
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #3086
This PR:
UseOtlpExporter- [otlp] Update README for UseOtlpExporter & new experimental flag open-telemetry/opentelemetry-dotnet#5452I tested retries and they don't appear to be working. Will contact OTEL folks and figure out what is going on.My delay was 20 seconds and the default retry duration is 10 seconds. 10 seconds a fine default. Dashboard should startup in that time.TODO: Update templates and playground service defaults.
Microsoft Reviewers: Open in CodeFlow