Skip to content

Merging PR 35546 to SB3.#36134

Merged
trande4884 merged 5 commits into
Azure:feature/spring-boot-3from
trande4884:tande_PR35546
Jul 27, 2023
Merged

Merging PR 35546 to SB3.#36134
trande4884 merged 5 commits into
Azure:feature/spring-boot-3from
trande4884:tande_PR35546

Conversation

@trande4884

@trande4884 trande4884 commented Jul 27, 2023

Copy link
Copy Markdown
Member

  • Merging

  • Revert "Merging"

This reverts commit ade7932.

  • Exposing diagnostic threshold's at the client level in Spring SDK.

  • Revert "Revert "Merging""

This reverts commit 6bab94e.

  • Updating changelog.

  • Removing unused import.

  • Adding defaults to application.properties

  • Fixing copy/paste error in code.

  • Fixing PR comments.

  • Fixing PR comments.

  • Fixing PR comments.

  • Adding test case.

  • Adding javaagent sample to readme.

  • Updating readme wording.

  • Removing unused imports.

  • Fixing bad merge resolution.

  • Update sdk/spring/azure-spring-data-cosmos/CHANGELOG.md

Changing wording.

  • Update sdk/spring/azure-spring-data-cosmos/README.md

Wording change.

Description

Please add an informative description that covers that changes made by the pull request and link all relevant issues.

If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.

All SDK Contribution checklist:

  • The pull request does not introduce [breaking changes]
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

@trande4884 @kushagraThapar
Client Level Diagnostics for Spring SDK (Azure#35546)
e29729c 
* Merging

* Revert "Merging"

This reverts commit ade7932.

* Exposing diagnostic threshold's at the client level in Spring SDK.

* Revert "Revert "Merging""

This reverts commit 6bab94e.

* Updating changelog.

* Removing unused import.

* Adding defaults to application.properties

* Fixing copy/paste error in code.

* Fixing PR comments.

* Fixing PR comments.

* Fixing PR comments.

* Adding test case.

* Adding javaagent sample to readme.

* Updating readme wording.

* Removing unused imports.

* Fixing bad merge resolution.

* Update sdk/spring/azure-spring-data-cosmos/CHANGELOG.md

Changing wording.

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>

* Update sdk/spring/azure-spring-data-cosmos/README.md

Wording change.

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>

---------

Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>
@github-actions github-actions Bot added the azure-spring All azure-spring related issues label Jul 27, 2023
@azure-sdk

azure-sdk commented Jul 27, 2023

Copy link
Copy Markdown
Collaborator

API change check

APIView has identified API level changes in this PR and created following API reviews.

azure-spring-data-cosmos

@trande4884

trande4884 commented Jul 27, 2023

Copy link
Copy Markdown
Member Author

/azp run java - spring - tests

@azure-pipelines

azure-pipelines Bot commented Jul 27, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

kushagraThapar
kushagraThapar requested changes Jul 27, 2023
View reviewed changes
Comment thread sdk/spring/azure-spring-data-cosmos/CHANGELOG.md Outdated
Comment thread ...azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java
@Value("${azure.cosmos.responseContinuationTokenLimitInKb}")
private int responseContinuationTokenLimitInKb;

@Value("${azure.cosmos.diagnosticsThresholds.pointOperationLatencyThresholdInMS}")

@kushagraThapar kushagraThapar Jul 27, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I am not sure how the build is passing, but since you have added these here, you should add these to the readme.md file as well - since this sample file is referred there.
Same goes for AppConfigurationCodeSnippet.

Now I realize this was the same issue on main branch as well, where I fixed it later with some of my code changes for the readme.

@trande4884 trande4884 Jul 27, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

These were already in the commit, I just messed up when resolving merge conflicts. Fixed.

Comment thread ...g-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java
@Value("${azure.cosmos.responseContinuationTokenLimitInKb}")
private int responseContinuationTokenLimitInKb;

@Value("${azure.cosmos.diagnosticsThresholds.pointOperationLatencyThresholdInMS}")

@kushagraThapar kushagraThapar Jul 27, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Same for this - pls reflect these changes on the readme.md

@trande4884 trande4884 Jul 27, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

These were already in the commit, I just messed up when resolving merge conflicts. Fixed.

trande4884 and others added 4 commits July 27, 2023 12:33
@trande4884 @kushagraThapar
Update sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
3359add 
Co-authored-by: Kushagra Thapar <kushuthapar@gmail.com>
@trande4884 @kushagraThapar
Update README.md
04a3a1a 
Adding readme file changes.

Co-Authored-By: Kushagra Thapar <kushuthapar@gmail.com>
@trande4884
Merge branch 'tande_PR35546' of https://github.com/trande4884/azure-s…
b1ebc99 
…dk-for-java-trande into tande_PR35546
@trande4884
Update README.md
66b829a 
Adding changes to readme file
@trande4884

trande4884 commented Jul 27, 2023

Copy link
Copy Markdown
Member Author

/azp run java - spring - tests

@azure-pipelines

azure-pipelines Bot commented Jul 27, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

kushagraThapar
kushagraThapar approved these changes Jul 27, 2023
View reviewed changes

@kushagraThapar kushagraThapar left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks Trevor!

@trande4884
trande4884 merged commit 97c4eb0 into Azure:feature/spring-boot-3 Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kushagraThapar kushagraThapar kushagraThapar approved these changes
@FabianMeiswinkel FabianMeiswinkel Awaiting requested review from FabianMeiswinkel
@backwind1233 backwind1233 Awaiting requested review from backwind1233
@chenrujun chenrujun Awaiting requested review from chenrujun
@hui1110 hui1110 Awaiting requested review from hui1110
@Netyyyy Netyyyy Awaiting requested review from Netyyyy
@saragluna saragluna Awaiting requested review from saragluna
@stliu stliu Awaiting requested review from stliu
@yiliuTo yiliuTo Awaiting requested review from yiliuTo
@xinlian12 xinlian12 Awaiting requested review from xinlian12
@moarychan moarychan Awaiting requested review from moarychan
@aayush3011 aayush3011 Awaiting requested review from aayush3011
@simorenoh simorenoh Awaiting requested review from simorenoh
@fangjian0423 fangjian0423 Awaiting requested review from fangjian0423
@jeet1995 jeet1995 Awaiting requested review from jeet1995
@Pilchie Pilchie Awaiting requested review from Pilchie

Assignees

No one assigned

Labels

azure-spring All azure-spring related issues

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@trande4884 @azure-sdk @kushagraThapar