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.

Sign up for GitHub

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

Jump to bottom

Bridge-Removal - Detach the quarkus-common-module dependency (OFF WE GO!) #1191

Merged
merged 48 commits into from
Jul 9, 2024
Merged

Bridge-Removal - Detach the quarkus-common-module dependency (OFF WE GO!) #1191

merged 48 commits into from
Jul 9, 2024

Conversation

Yuqi-Du
Copy link
Contributor

@Yuqi-Du Yuqi-Du commented Jun 25, 2024 •
edited
Loading

This PR mainly focuses on restoring the metrics components after the removal of quarkus-common-module dependency.
But as you can see, there are other cleanups in this PR, this is because some cleanups can not be done in this PR Bridge-Removal - miscellaneous cleanups, as long as the quarkus-common-module dependency remains, there are some bean production and injection required, that is why these cleanups must be done here.

Detach quarkus-common-module dependency

Remove quarkus-common-module dependency in Data API pom file.
As for stargate version in Data API pom file, @maheshrajamani may need your confirmation, we could remove stargate versions, and just separate HCD, DSE versions out to make IT work?

Metrics

  • Add Metrics config. (I still keep the configMapping path starts with stargate, this is because we still have these paths used helm chart, but we can do deep cleanups in the future).
  • Add MicrometerConfiguration, this produces a globalTagsMeterFilter, which will add sgv2-jsonapi as global tag to all metrics entries.
  • Add prometheus metric export path, same as before. http://localhost:8181/metrics

Other cleanups

  • Remove DataStoreConfig, this is coupling with Bridge calls, and only used to see if backend is vectorSearchEnabled(redundant).
  • Remove RetriableStargateBridgeProvider
  • Remove JsonApiGrpcRetryPolicy, and corresponding tests

README.md, CONFIGURATION.md

Cleanup quarkus-common keywords in markdown file.
Detaching quarkus-common-module also means we lose some shared documentation there. Created a ticket for this.
Documentation revisit after quarkus-common-module removal

Checklist

  • Changes manually tested
  • Automated Tests added/updated
  • Documentation added/updated
  • CLA Signed: DataStax CLA

Yuqi-Du and others added 30 commits June 4, 2024 11:50
@Yuqi-Du
init
141976e
@Yuqi-Du
fix
09c6b4e
@tatu-at-datastax
Merge branch 'main' into bridge-removal-cleanupBeforeMetric
f559e0e
@Yuqi-Du
Merge remote-tracking branch 'origin/main' into bridge-removal-cleanu…
e2c5ebf 
…pBeforeMetric
@Yuqi-Du
fix ErrorChallengeSender.java
45b1b41
@Yuqi-Du
update pom
fc80f16
@Yuqi-Du
builtCondition use columnUtils
0087cf5 
add jakarta.validation
@Yuqi-Du
Eliminate ChallengeSender interface, use ErrorChallengeSender impleme…
777d75b 
…ntation directly.
@Yuqi-Du
add SourceApiQualifier annotation
0cac4d7
@Yuqi-Du
delete all old bridge grpc talking
1d7de2b
@Yuqi-Du
add SourceApiQualifier back
baba37b
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
818ff07 
…ic' into bridge-removal-cutoff-grpc
@Yuqi-Du
Delete CreateCollectionResolverVectorDisabledTest, DisableVectorSearc…
bfdb435 
…hProfile, since they rely on stargate data-store config, and to check if vectorSearch is enabled. This will be deprecated after we remove quarkus-common module dependency, and this is just a redundant check because we only deploy data-api in vector kubes.
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
3e82ccd 
…ic' into bridge-removal-cutoff-grpc
@Yuqi-Du
Merge branch 'main' into bridge-removal-cutoff-grpc
ab13d33
@Yuqi-Du
Merge branch 'main' into bridge-removal-cleanupBeforeMetric
cc4e06f
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
44bfe30 
…ic' into bridge-removal-cutoff-grpc
@Yuqi-Du
This interface needs to be removed finally
cb120ac
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
92bdaf3 
…ic' into bridge-removal-cutoff-grpc
@Yuqi-Du
Merge branch 'main' into bridge-removal-cutoff-grpc
5841a4a
@Yuqi-Du
Merge branch 'main' into bridge-removal-cleanupBeforeMetric
b2c4437
@Yuqi-Du
Merge branch 'main' into bridge-removal-cleanupBeforeMetric
cb7f387
@Yuqi-Du
add http access log
6d1ef54
@Yuqi-Du
add openapi and swaggerUI configuration
f78d3e6
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
2147551 
…ic' into bridge-removal-metrics
@Yuqi-Du
add stargate logo
ce06cc3
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
8282bea 
…ic' into bridge-removal-metrics
@Yuqi-Du
add quarkus-resteasy-reactive and quarkus-resteasy-reactive-jackson d…
8e84a4b 
…ependencies
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
620f505 
…ic' into bridge-removal-metrics
@Yuqi-Du
init
c49f300
@Yuqi-Du Yuqi-Du changed the base branch from main to bridge-removal-cleanupBeforeMetric June 25, 2024 22:11
Yuqi-Du added 3 commits June 25, 2024 15:16
@Yuqi-Du
add quarkus-hibernate-validator
8506d43 
Enables validation of configuration, beans, REST endpoints, etc.
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
edbe862 
…ic' into bridge-removal-cleanupBeforeMetric
@Yuqi-Du
Merge remote-tracking branch 'origin/bridge-removal-cleanupBeforeMetr…
06b6206 
…ic' into bridge-removal-metrics
@Yuqi-Du Yuqi-Du closed this Jun 25, 2024
@Yuqi-Du Yuqi-Du reopened this Jun 25, 2024
@Yuqi-Du Yuqi-Du changed the base branch from bridge-removal-cleanupBeforeMetric to main June 25, 2024 22:20
@Yuqi-Du Yuqi-Du closed this Jun 25, 2024
@Yuqi-Du Yuqi-Du reopened this Jun 25, 2024
@Yuqi-Du Yuqi-Du marked this pull request as ready for review July 8, 2024 22:24
@Yuqi-Du Yuqi-Du requested a review from a team as a code owner July 8, 2024 22:24
tatu-at-datastax
tatu-at-datastax approved these changes Jul 9, 2024
View reviewed changes
Copy link
Contributor

@tatu-at-datastax tatu-at-datastax left a comment

Choose a reason for hiding this comment

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

LGTM

@Yuqi-Du Yuqi-Du merged commit ce2b337 into main Jul 9, 2024
4 checks passed
@Yuqi-Du Yuqi-Du deleted the bridge-removal-metrics branch July 9, 2024 16:19
amorton added a commit that referenced this pull request Jul 16, 2024
@amorton
Fix failing tests.
680a795 
This commit fixes failing unit and integration tests.

It cherry picks multiple commits from the ajm/tables branch below.

-> SKIPPED - did not cherry pick the original see below <-
commit 0b53fba
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:34:14 2024 -0700

    Revert UT->IT cherry-picked merge

commit 951a092
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:32:20 2024 -0700

    Minor clean up of test contexts, javadocs

commit 28c9ebb
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:21:20 2024 -0700

    Minor clean up

commit 9801566
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:09:18 2024 -0700

    Fix import stmt

-> merge commit - not cherry picked <-
commit b14dfa2
Merge: 13678a5 a9cb436
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 16:49:10 2024 -0700

    Merge branch 'main' into ajm/tables

-> came from merge, not cherry picked <-
commit a9cb436
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 16:47:00 2024 -0700

    Update Quarkus Data API uses to 3.9.5 (from parent 3.6.x) (#1246)

-> merge commit - not cherry picked <-
commit 13678a5
Merge: c7eccc0 dd42485
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 12:29:49 2024 -0700

    Merge branch 'main' into ajm/tables

-> came from merge, not cherry picked <-
commit dd42485
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 11:40:21 2024 -0700

    Fix a problem that would prevent Quarkus 3.12 upgrade (due to change in Smallrye lib) (#1248)

-> came from merge, not cherry picked <-
commit 15cd3f6
Author: YuqiDu <istimdu@gmail.com>
Date:   Tue Jul 9 10:31:03 2024 -0700

    fix http port to 8181, refactor application.yaml as alphabetic order (#1247)

-> came from merge, not cherry picked <-
commit ce2b337
Author: YuqiDu <istimdu@gmail.com>
Date:   Tue Jul 9 09:19:11 2024 -0700

    Bridge-Removal - Detach the quarkus-common-module dependency (OFF WE GO!) (#1191)

    Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com>

commit c7eccc0
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:31:31 2024 +1200

    fmt fix

commit 64930f5
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:28:42 2024 +1200

    Unit test fixes for Namespace commands

-> merge commit - not cherry picked <-
commit e7a6d15
Merge: baa6ea5 5796eca
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:18:55 2024 +1200

    Merge branch 'main' into ajm/tables

commit baa6ea5
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:14:03 2024 +1200

    Fixes for Namespace Commands

    so they work on DatabaseSchemaObject

commit cfbbc8c
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 14:57:20 2024 +1200

    fix CreateCollectionResolverVectorizeDisabledTest

-> SKIPPED - later reverted , broke IT's <-
commit c50d7fd
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 19:30:57 2024 -0700

    Fixes #1245: change 3 unit tests to integration tests to speed up unit test runtime

    git cherry-pick 1996697

-> came from merge, not cherry picked <-
commit 5796eca
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 19:08:23 2024 -0700

    Refactor unit test profiles, try to speed things up (#1244)

-> came from merge, not cherry picked <-
commit 30c7ae0
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 18:36:41 2024 -0700

    Fix accidental dependencies to shaded packages (#1243)

-> merge commit, not cherry picked <-
commit 18a804b
Merge: 7ee94cd 35ecb00
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 18:33:51 2024 -0700

    Merge branch 'main' into ajm/tables

commit 7ee94cd
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 13:13:47 2024 +1200

    fix CreateCollectionResolverVectorDisabledTest

commit b12c484
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 12:45:23 2024 +1200

    Fix for failing Collection based tests

-> came from merge, not cherry picked <-
commit 35ecb00
Author: YuqiDu <istimdu@gmail.com>
Date:   Mon Jul 8 17:32:05 2024 -0700

    Bridge-Removal - miscellaneous cleanups (#1149)

    Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com>

commit 4681ccd
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 11:52:31 2024 +1200

    fix for createCollection

    and other commands that run against the namespace

    FindIntegrationTest works, waiting to find out about others
Yuqi-Du pushed a commit that referenced this pull request Jul 19, 2024
@amorton @Yuqi-Du
Fix failing tests.
ed8de84 
This commit fixes failing unit and integration tests.

It cherry picks multiple commits from the ajm/tables branch below.

-> SKIPPED - did not cherry pick the original see below <-
commit 0b53fba
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:34:14 2024 -0700

    Revert UT->IT cherry-picked merge

commit 951a092
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:32:20 2024 -0700

    Minor clean up of test contexts, javadocs

commit 28c9ebb
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:21:20 2024 -0700

    Minor clean up

commit 9801566
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 17:09:18 2024 -0700

    Fix import stmt

-> merge commit - not cherry picked <-
commit b14dfa2
Merge: 13678a5 a9cb436
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 16:49:10 2024 -0700

    Merge branch 'main' into ajm/tables

-> came from merge, not cherry picked <-
commit a9cb436
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 16:47:00 2024 -0700

    Update Quarkus Data API uses to 3.9.5 (from parent 3.6.x) (#1246)

-> merge commit - not cherry picked <-
commit 13678a5
Merge: c7eccc0 dd42485
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 12:29:49 2024 -0700

    Merge branch 'main' into ajm/tables

-> came from merge, not cherry picked <-
commit dd42485
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Tue Jul 9 11:40:21 2024 -0700

    Fix a problem that would prevent Quarkus 3.12 upgrade (due to change in Smallrye lib) (#1248)

-> came from merge, not cherry picked <-
commit 15cd3f6
Author: YuqiDu <istimdu@gmail.com>
Date:   Tue Jul 9 10:31:03 2024 -0700

    fix http port to 8181, refactor application.yaml as alphabetic order (#1247)

-> came from merge, not cherry picked <-
commit ce2b337
Author: YuqiDu <istimdu@gmail.com>
Date:   Tue Jul 9 09:19:11 2024 -0700

    Bridge-Removal - Detach the quarkus-common-module dependency (OFF WE GO!) (#1191)

    Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com>

commit c7eccc0
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:31:31 2024 +1200

    fmt fix

commit 64930f5
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:28:42 2024 +1200

    Unit test fixes for Namespace commands

-> merge commit - not cherry picked <-
commit e7a6d15
Merge: baa6ea5 5796eca
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:18:55 2024 +1200

    Merge branch 'main' into ajm/tables

commit baa6ea5
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 19:14:03 2024 +1200

    Fixes for Namespace Commands

    so they work on DatabaseSchemaObject

commit cfbbc8c
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 14:57:20 2024 +1200

    fix CreateCollectionResolverVectorizeDisabledTest

-> SKIPPED - later reverted , broke IT's <-
commit c50d7fd
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 19:30:57 2024 -0700

    Fixes #1245: change 3 unit tests to integration tests to speed up unit test runtime

    git cherry-pick 1996697

-> came from merge, not cherry picked <-
commit 5796eca
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 19:08:23 2024 -0700

    Refactor unit test profiles, try to speed things up (#1244)

-> came from merge, not cherry picked <-
commit 30c7ae0
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 18:36:41 2024 -0700

    Fix accidental dependencies to shaded packages (#1243)

-> merge commit, not cherry picked <-
commit 18a804b
Merge: 7ee94cd 35ecb00
Author: Tatu Saloranta <tatu.saloranta@datastax.com>
Date:   Mon Jul 8 18:33:51 2024 -0700

    Merge branch 'main' into ajm/tables

commit 7ee94cd
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 13:13:47 2024 +1200

    fix CreateCollectionResolverVectorDisabledTest

commit b12c484
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 12:45:23 2024 +1200

    Fix for failing Collection based tests

-> came from merge, not cherry picked <-
commit 35ecb00
Author: YuqiDu <istimdu@gmail.com>
Date:   Mon Jul 8 17:32:05 2024 -0700

    Bridge-Removal - miscellaneous cleanups (#1149)

    Co-authored-by: Tatu Saloranta <tatu.saloranta@datastax.com>

commit 4681ccd
Author: Aaron Morton <aaron.morton@datastax.com>
Date:   Tue Jul 9 11:52:31 2024 +1200

    fix for createCollection

    and other commands that run against the namespace

    FindIntegrationTest works, waiting to find out about others
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tatu-at-datastax tatu-at-datastax tatu-at-datastax approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Yuqi-Du @tatu-at-datastax