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

[Backport] [2.x] - Add Tracing Instrumentation at Network and Rest layer #9939

Merged
merged 2 commits into from
Sep 8, 2023

Conversation

Gaganjuneja
Copy link
Contributor

Description

backport #9415 to 2.x

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

…ject#9415)

* Add Instrumentation

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* update changelog

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* clear the context

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Add Instrumentation

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Add Instrumentation

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Add Instrumentation

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Remove internal transport action check

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Changes

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Refactor code

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix failing test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix failing test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix failing test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix failing test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix failing test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix failing test cases

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix java doc

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address merge conflicts

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address merge conflicts

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Enable NumberOfTraceIDsEqualToRequests test

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix java doc

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix java doc

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Address review comment

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fix test case

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Remove instrumentation from TransportService

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Signed-off-by: Gagan Juneja <gagandeepjuneja@gmail.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
@Gaganjuneja
Copy link
Contributor Author

@reta, please take a look.

@reta reta changed the title Backport 2.x - Add Tracing Instrumentation at Network and Rest layer [Backport] [2.x] - Add Tracing Instrumentation at Network and Rest layer Sep 8, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

Compatibility status:

Checks if related components are compatible with change df16ce0

Incompatible components

Skipped components

Compatible components

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

@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

Compatibility status:

Checks if related components are compatible with change 854d207

Incompatible components

Skipped components

Compatible components

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

@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Sep 8, 2023

Codecov Report

Merging #9939 (854d207) into 2.x (5258ff2) will increase coverage by 0.04%.
Report is 3 commits behind head on 2.x.
The diff coverage is 84.29%.

@@             Coverage Diff              @@
##                2.x    #9939      +/-   ##
============================================
+ Coverage     70.76%   70.81%   +0.04%     
- Complexity    58217    58308      +91     
============================================
  Files          4817     4820       +3     
  Lines        275286   275379      +93     
  Branches      40445    40456      +11     
============================================
+ Hits         194814   195010     +196     
+ Misses        63820    63732      -88     
+ Partials      16652    16637      -15     
Files Changed Coverage Δ
.../opensearch/telemetry/tracing/noop/NoopTracer.java 72.72% <ø> (+18.18%) ⬆️
...g/opensearch/transport/nio/NioTransportPlugin.java 25.00% <ø> (ø)
...a/org/opensearch/common/network/NetworkModule.java 92.00% <ø> (ø)
...ain/java/org/opensearch/plugins/NetworkPlugin.java 100.00% <ø> (ø)
...racing/ThreadContextBasedTracerContextStorage.java 93.10% <0.00%> (+20.68%) ⬆️
...etry/tracing/listener/TraceableActionListener.java 58.82% <58.82%> (ø)
.../org/opensearch/telemetry/tracing/SpanBuilder.java 91.66% <66.66%> (+3.43%) ⬆️
...lemetry/tracing/channels/TraceableHttpChannel.java 70.58% <70.58%> (ø)
...lemetry/tracing/channels/TraceableRestChannel.java 84.21% <84.21%> (ø)
.../src/main/java/org/opensearch/common/Rounding.java 85.02% <92.85%> (-0.10%) ⬇️
... and 9 more

... and 500 files with indirect coverage changes

@reta reta merged commit 27cddec into opensearch-project:2.x Sep 8, 2023
12 checks passed
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.

2 participants