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

[BugFix] Fixing Span operation names generated from RestActions #12005

Merged
merged 9 commits into from
Feb 7, 2024

Conversation

atharvasharma61
Copy link
Contributor

@atharvasharma61 atharvasharma61 commented Jan 24, 2024

Description

This is a bug fix to have RestActions rawPath as span operation names, query params as their tags and avoid using exact URI (#10791)

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.

Copy link
Contributor

❌ Gradle check result for 06b28a4: 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?

Copy link
Contributor

github-actions bot commented Jan 24, 2024

Compatibility status:

Checks if related components are compatible with change a7f847f

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/cross-cluster-replication.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/common-utils.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/sql.git]

@github-actions github-actions bot added 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 labels Jan 24, 2024
Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for f675d5c: 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?

Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for f675d5c: 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?

Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for f675d5c: 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 reta self-requested a review February 6, 2024 14:29
Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for f675d5c: 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?

@Gaganjuneja
Copy link
Contributor

Flaky test : org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT

@reta
Copy link
Collaborator

reta commented Feb 6, 2024

Flaky test : org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT

I suspect the 2.x branch in not in a good shape :(

@Gaganjuneja
Copy link
Contributor

Flaky test : org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT

I suspect the 2.x branch in not in a good shape :(

Yes, I tried rerunning this more than 10 times and still failing.

Copy link
Contributor

github-actions bot commented Feb 7, 2024

❕ Gradle check result for a7f847f: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

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 Feb 7, 2024

Codecov Report

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

Comparison is base (0d50525) 71.38% compared to head (a7f847f) 71.35%.

Files Patch % Lines
.../org/opensearch/telemetry/tracing/SpanBuilder.java 95.23% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #12005      +/-   ##
============================================
- Coverage     71.38%   71.35%   -0.04%     
+ Complexity    59707    59671      -36     
============================================
  Files          4952     4952              
  Lines        280639   280656      +17     
  Branches      40773    40776       +3     
============================================
- Hits         200341   200258      -83     
- Misses        63629    63742     +113     
+ Partials      16669    16656      -13     

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

@Gaganjuneja
Copy link
Contributor

@sachinpkale @gbbafna Could you please merge this. We did a rebase to pass the test cases. Thanks!

@sachinpkale sachinpkale merged commit c0fca74 into opensearch-project:main Feb 7, 2024
30 checks passed
@sachinpkale sachinpkale added backport 2.x Backport to 2.x branch backport 2.12 Backport to 2.12 branch labels Feb 7, 2024
@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-12005-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c0fca74709e96ec7c8cf295cdca6110946b592b8
# Push it to GitHub
git push --set-upstream origin backport/backport-12005-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-12005-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 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.12 2.12
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.12
# Create a new branch
git switch --create backport/backport-12005-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c0fca74709e96ec7c8cf295cdca6110946b592b8
# Push it to GitHub
git push --set-upstream origin backport/backport-12005-to-2.12
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-12005-to-2.12.

atharvasharma61 added a commit to atharvasharma61/OpenSearch that referenced this pull request Feb 7, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
(cherry picked from commit c0fca74)
atharvasharma61 added a commit to atharvasharma61/OpenSearch that referenced this pull request Feb 7, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
(cherry picked from commit c0fca74)
atharvasharma61 added a commit to atharvasharma61/OpenSearch that referenced this pull request Feb 7, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
(cherry picked from commit c0fca74)
atharvasharma61 added a commit to atharvasharma61/OpenSearch that referenced this pull request Feb 7, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
(cherry picked from commit c0fca74)
sachinpkale pushed a commit that referenced this pull request Feb 7, 2024
…) (#12221)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
(cherry picked from commit c0fca74)
sachinpkale pushed a commit that referenced this pull request Feb 7, 2024
…) (#12222)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
(cherry picked from commit c0fca74)
peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Mar 1, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…search-project#12005)

* bug fix to have RestActions rawPath as operation names, query params as tags and avoid using exact URI (opensearch-project#10791)

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added UTs

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added parameterized tests

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* improvised parameterized tests using annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* removed unused annotations

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Added details in CHANGELOG.md

Signed-off-by: Atharva Sharma <athrv@amazon.com>

* Addressed spotlessJavaCheck failures

Signed-off-by: Atharva Sharma <athrv@amazon.com>

---------

Signed-off-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Atharva Sharma <60044988+atharvasharma61@users.noreply.github.com>
Co-authored-by: Atharva Sharma <athrv@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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 2.12 Backport to 2.12 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
Status: No status
Development

Successfully merging this pull request may close these issues.

5 participants