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

Fix the issue with DefaultSpanScope restoring wrong span in the Trace… #11316

Merged
merged 2 commits into from
Dec 11, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Nov 23, 2023

…rContextStorage upon detach

Description

Fix the issue with DefaultSpanScope restoring wrong span in the Trace…

Related Issues

N/A

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…rContextStorage upon detach

Signed-off-by: Andriy Redko <[email protected]>
Copy link
Contributor

github-actions bot commented Nov 23, 2023

Compatibility status:

Checks if related components are compatible with change d647e01

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/sql.git]

Copy link
Contributor

❌ Gradle check result for e1945ef: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta
Copy link
Collaborator Author

reta commented Nov 23, 2023

❌ Gradle check result for e1945ef: FAILURE

#10006
#10983

Copy link
Contributor

❕ Gradle check result for e1945ef: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.multipart.RemoteStoreMultipartIT.testOverriddenBufferInterval

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Nov 23, 2023

Codecov Report

Attention: 62 lines in your changes are missing coverage. Please review.

Comparison is base (f7f3500) 71.37% compared to head (d647e01) 71.32%.
Report is 2 commits behind head on main.

Files Patch % Lines
...rch/pipeline/common/CollapseResponseProcessor.java 71.42% 7 Missing and 5 partials ⚠️
...ch/pipeline/common/helpers/SearchResponseUtil.java 69.69% 8 Missing and 2 partials ⚠️
...search/core/common/io/stream/BytesStreamInput.java 40.00% 7 Missing and 2 partials ⚠️
...earch/search/pipeline/common/SearchRequestMap.java 80.00% 6 Missing and 3 partials ⚠️
...search/pipeline/common/ScriptRequestProcessor.java 40.00% 6 Missing ⚠️
...ch/pipeline/common/OversampleRequestProcessor.java 73.68% 3 Missing and 2 partials ⚠️
...pipeline/common/TruncateHitsResponseProcessor.java 84.61% 2 Missing and 2 partials ⚠️
...rg/opensearch/search/pipeline/common/BasicMap.java 90.90% 2 Missing ⚠️
...eline/common/SearchPipelineCommonModulePlugin.java 0.00% 1 Missing ⚠️
...h/search/pipeline/common/helpers/ContextUtils.java 75.00% 0 Missing and 1 partial ⚠️
... and 3 more
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #11316      +/-   ##
============================================
- Coverage     71.37%   71.32%   -0.05%     
+ Complexity    59113    59060      -53     
============================================
  Files          4893     4903      +10     
  Lines        277831   277985     +154     
  Branches      40367    40382      +15     
============================================
- Hits         198288   198284       -4     
- Misses        63042    63206     +164     
+ Partials      16501    16495       -6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Gaganjuneja
Copy link
Contributor

Thanks @reta, for taking this up. Sorry I was bit busy with other stuff now back and will raise the PR for fixing context propagation in scheduled tasks.

@reta
Copy link
Collaborator Author

reta commented Dec 6, 2023

@andrross @dblock could you folks help to get it in? thank you

Copy link
Contributor

github-actions bot commented Dec 6, 2023

❌ Gradle check result for d647e01: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta
Copy link
Collaborator Author

reta commented Dec 6, 2023

❌ Gradle check result for d647e01: FAILURE

#11316
#10006

Copy link
Contributor

github-actions bot commented Dec 6, 2023

✅ Gradle check result for d647e01: SUCCESS

@dblock dblock merged commit 00dd577 into opensearch-project:main Dec 11, 2023
30 checks passed
@dblock dblock added the backport 2.x Backport to 2.x branch label Dec 11, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11316-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 00dd577a0211cb7f1bcb75291ed1424cda215b64
# Push it to GitHub
git push --set-upstream origin backport/backport-11316-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-11316-to-2.x.

reta added a commit to reta/OpenSearch that referenced this pull request Dec 11, 2023
…rContextStorage upon detach (opensearch-project#11316)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 00dd577)
reta added a commit that referenced this pull request Dec 11, 2023
…rContextStorage upon detach (#11316) (#11567)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 00dd577)
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request Dec 11, 2023
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…rContextStorage upon detach (opensearch-project#11316)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed bug Something isn't working v2.12.0 Issues and PRs related to version 2.12.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants