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

WriterMetrics and config classes removal #373

Merged
merged 5 commits into from
May 24, 2023

Conversation

Tjofil
Copy link
Contributor

@Tjofil Tjofil commented May 24, 2023

Removed and redirect dependencies to commons for WriterMetrics and several config classes and sub-classes.

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

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.

Tjofil added 5 commits May 24, 2023 20:21
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
@codecov
Copy link

codecov bot commented May 24, 2023

Codecov Report

Merging #373 (55a3a8d) into main (744f4e3) will decrease coverage by 0.46%.
The diff coverage is 71.06%.

❗ Current head 55a3a8d differs from pull request most recent head 1f5eb33. Consider uploading reports for the commit 1f5eb33 to get more accurate results

@@             Coverage Diff              @@
##               main     #373      +/-   ##
============================================
- Coverage     72.87%   72.41%   -0.46%     
+ Complexity     3045     2828     -217     
============================================
  Files           381      348      -33     
  Lines         19109    17443    -1666     
  Branches       1472     1398      -74     
============================================
- Hits          13925    12632    -1293     
+ Misses         4589     4242     -347     
+ Partials        595      569      -26     
Impacted Files Coverage Δ
...org/opensearch/performanceanalyzer/AppContext.java 93.75% <ø> (ø)
...ensearch/performanceanalyzer/CertificateUtils.java 84.74% <ø> (ø)
...performanceanalyzer/OSMetricsGeneratorFactory.java 42.85% <ø> (ø)
...erformanceanalyzer/PerformanceAnalyzerThreads.java 100.00% <ø> (ø)
...ch/performanceanalyzer/collectors/CachedStats.java 0.00% <ø> (ø)
...ch/performanceanalyzer/collectors/DiskMetrics.java 0.00% <ø> (ø)
...ceanalyzer/collectors/MountedPartitionMetrics.java 100.00% <ø> (ø)
...r/collectors/MountedPartitionMetricsCollector.java 86.20% <ø> (ø)
...rmanceanalyzer/collectors/NetInterfaceSummary.java 100.00% <ø> (ø)
...rmanceanalyzer/collectors/NetworkE2ECollector.java 88.57% <ø> (ø)
... and 120 more

... and 3 files with indirect coverage changes

@@ -346,11 +346,11 @@ dependencies {
implementation 'org.checkerframework:checker-qual:3.29.0'
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
implementation "org.opensearch:performance-analyzer-commons:1.0.0-SNAPSHOT"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.0.0-SNAPSHOT is meant for tracking active development and we use the release version otherwise.

Let us fix this in follow-up PR.

@khushbr khushbr merged commit 9d100f9 into opensearch-project:main May 24, 2023
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-373-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9d100f9766d2613ccbb9be07cbdf467332a22eea
# Push it to GitHub
git push --set-upstream origin backport/backport-373-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request May 30, 2023
* Replace majority of dependencies.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Config folder removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Version dependency from commons.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* WriterMetrics removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Update with new commons dependency.
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

---------

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
(cherry picked from commit 9d100f9)
khushbr pushed a commit that referenced this pull request May 30, 2023
* Replace majority of dependencies.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Config folder removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Version dependency from commons.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* WriterMetrics removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Update with new commons dependency.
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

---------

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
(cherry picked from commit 9d100f9)

Co-authored-by: Filip Drobnjaković <drobnjakovicfilip@gmail.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 30, 2023
* Replace majority of dependencies.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Config folder removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Version dependency from commons.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* WriterMetrics removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Update with new commons dependency.
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

---------

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
(cherry picked from commit 9d100f9)
khushbr pushed a commit that referenced this pull request May 30, 2023
* Replace majority of dependencies.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Config folder removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Version dependency from commons.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* WriterMetrics removal and dependency redirection.

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

* Update with new commons dependency.
Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>

---------

Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com>
(cherry picked from commit 9d100f9)

Co-authored-by: Filip Drobnjaković <drobnjakovicfilip@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants