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

add envs for biz starter #885

Merged
merged 12 commits into from
Mar 25, 2024
Merged

add envs for biz starter #885

merged 12 commits into from
Mar 25, 2024

Conversation

lvjing2
Copy link
Collaborator

@lvjing2 lvjing2 commented Mar 25, 2024

模块启动时增加 envs 参数,这个在 jdk 多租户里能用上

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Enhanced application launching capabilities to include environment variables alongside arguments.
    • Introduced the ability to handle environment variables in the business installation process.
  • Refactor

    • Updated constructors and methods across various components to support the inclusion of environment variables.

Copy link
Contributor

coderabbitai bot commented Mar 25, 2024

Walkthrough

The recent updates introduce enhanced flexibility by incorporating environment variables into the execution and startup processes. This is achieved through modifications across various components, including the addition of new methods and parameters that allow passing and utilizing environment variables alongside traditional arguments. This holistic change aims to offer more dynamic and context-aware execution capabilities.

Changes

Files Change Summary
.../bootstrap/MainMethodRunner.java
.../container/model/BizModel.java
.../api/ArkClient.java
.../spi/model/Biz.java
Added support for environment variables in method parameters and processing logic.

🐰✨
In the land of code, where the bytes do roam,
A rabbit hopped in, making it home.
With a flick and a hop, it weaved a change,
Environment variables, now within range.
Through fields of Java, it danced with glee,
"Now apps can adapt, as easy as can be!"
🌟🐾

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

Copy link

codecov bot commented Mar 25, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 78.84%. Comparing base (e74c7ea) to head (3a566fe).
Report is 1 commits behind head on master.

Files Patch % Lines
...c/main/java/com/alipay/sofa/ark/api/ArkClient.java 57.14% 3 Missing ⚠️
.../com/alipay/sofa/ark/container/model/BizModel.java 60.00% 2 Missing ⚠️
...om/alipay/sofa/ark/bootstrap/MainMethodRunner.java 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master     #885      +/-   ##
============================================
+ Coverage     78.76%   78.84%   +0.07%     
  Complexity      831      831              
============================================
  Files           162      162              
  Lines          6767     6777      +10     
  Branches       1006     1007       +1     
============================================
+ Hits           5330     5343      +13     
+ Misses          917      911       -6     
- Partials        520      523       +3     

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

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between e74c7ea and 3a566fe.
Files selected for processing (6)
  • sofa-ark-parent/core-impl/archive/src/main/java/com/alipay/sofa/ark/bootstrap/AbstractLauncher.java (2 hunks)
  • sofa-ark-parent/core-impl/archive/src/main/java/com/alipay/sofa/ark/bootstrap/MainMethodRunner.java (2 hunks)
  • sofa-ark-parent/core-impl/archive/src/test/java/com/alipay/sofa/ark/bootstrap/MainMethodRunnerTest.java (2 hunks)
  • sofa-ark-parent/core-impl/container/src/main/java/com/alipay/sofa/ark/container/model/BizModel.java (2 hunks)
  • sofa-ark-parent/core/api/src/main/java/com/alipay/sofa/ark/api/ArkClient.java (4 hunks)
  • sofa-ark-parent/core/spi/src/main/java/com/alipay/sofa/ark/spi/model/Biz.java (3 hunks)
Additional comments: 11
sofa-ark-parent/core-impl/archive/src/test/java/com/alipay/sofa/ark/bootstrap/MainMethodRunnerTest.java (1)
  • 39-39: The addition of a null parameter in the MainMethodRunner constructor call within the testRunner method aligns with the updated constructor signature to support environment variables. Please ensure the test still effectively validates MainMethodRunner functionality, including the handling of null environment variables.
sofa-ark-parent/core/spi/src/main/java/com/alipay/sofa/ark/spi/model/Biz.java (1)
  • 38-44: The addition of the start(String[] args, Map<String, String> envs) method to the Biz interface is a crucial step towards supporting environment variables in business application startups. Please consider enhancing the method's documentation to clarify the expected behavior when envs is null or empty.
sofa-ark-parent/core-impl/archive/src/main/java/com/alipay/sofa/ark/bootstrap/MainMethodRunner.java (3)
  • 20-21: The addition of imports for HashMap and Map is necessary for supporting environment variables. Good job on keeping the imports organized.
  • 36-46: The introduction of the envs field and its initialization in the constructor are well-implemented. Initializing envs with an empty HashMap if it's null is a good practice to avoid potential NullPointerException.
  • 54-54: The comment about adding envs into the tenant of JDK in the run method indicates future work is needed to utilize envs. Please ensure this implementation is completed to fully support environment variables.
sofa-ark-parent/core-impl/archive/src/main/java/com/alipay/sofa/ark/bootstrap/AbstractLauncher.java (2)
  • 112-112: The addition of a null parameter in the createMainMethodRunner method's constructor call to MainMethodRunner aligns with the updated constructor to support environment variables. This change is necessary for compatibility.
  • 172-172: The addition of a newline in the getMainClass method is a minor formatting change and does not impact functionality.
sofa-ark-parent/core/api/src/main/java/com/alipay/sofa/ark/api/ArkClient.java (3)
  • 64-68: The introduction of a static envs field to store environment variables is a significant change. Consider the implications for thread safety and potential side effects across different parts of the application. It might be beneficial to review the usage pattern of these environment variables to ensure they are managed safely.
  • 146-152: The addition of getEnvs() and setEnvs(Map<String, String> envs) methods provides a structured way to access and modify environment variables. Ensure that the usage of these methods is consistent and thread-safe across the application.
  • 161-174: The modifications to the installBiz() method and the introduction of the doInstallBiz() method to support environment variables are well-implemented. These changes enhance the flexibility of business application installations. Ensure that the handling of environment variables in these methods is thoroughly tested, especially with regards to null or empty values.
sofa-ark-parent/core-impl/container/src/main/java/com/alipay/sofa/ark/container/model/BizModel.java (1)
  • 275-281: The addition of the start(String[] args, Map<String, String> envs) method and the modification of the existing start(String[] args) method to delegate to doStart(String[] args, Map<String, String> envs) are well-implemented. These changes align with the objective of supporting environment variables. Please ensure that null or empty envs values are correctly handled in these methods.

@lvjing2 lvjing2 requested a review from gaosaroma March 25, 2024 06:43
Copy link
Collaborator

@gaosaroma gaosaroma left a comment

Choose a reason for hiding this comment

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

LGTM

@lvjing2 lvjing2 merged commit 12d4da4 into master Mar 25, 2024
2 of 4 checks passed
@lvjing2 lvjing2 deleted the youji-dev branch March 25, 2024 13:36
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between 3a566fe and e7ddf49.
Files selected for processing (1)
  • sofa-ark-parent/core-impl/container/src/main/java/com/alipay/sofa/ark/container/model/BizModel.java (2 hunks)
Files skipped from review as they are similar to previous changes (1)
  • sofa-ark-parent/core-impl/container/src/main/java/com/alipay/sofa/ark/container/model/BizModel.java

lvjing2 added a commit that referenced this pull request Mar 30, 2024
* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

* add start class in manifest

* fix test

* remove unused field

* add envs for biz start

(cherry picked from commit 12d4da4)
lvjing2 added a commit that referenced this pull request Mar 31, 2024
* netty support 0.9.x (#843)

* modify test for zip fill to support jdk9+

* fix export import config

* support multi sdk

* format test

* support netty 0.9

(cherry picked from commit 92daff0)

* Update README.md (#846)

(cherry picked from commit 815ea32)

* support multi sdk

(cherry picked from commit 5f7fe98)

* format test

(cherry picked from commit 0f8c409)

* using 0.9 netty

(cherry picked from commit 233f6d7)

* no lib for netty ark plugin

(cherry picked from commit 68c3509)

* set scope = provided for netty

(cherry picked from commit 957f714)

* fix test error "No Ark Container Jar File Found"

(cherry picked from commit e6bfade)

* fix test error (#854)

(cherry picked from commit 917941c)

* fix test error (#855)

* fix test error

* just warn for stop tomcat

* fix test error

(cherry picked from commit c8c384c)

* fix test error (#856)

(cherry picked from commit a77b061)

* update guava version to aviod guava cache pin problem (#853)

* update guava version

* update guava version in container jar

* remove file

---------

Co-authored-by: leo james <leojames.googol@gmail.com>

(cherry picked from commit 51ba5e0)

* update version

* no maven tree when single bundle

* update version

* Update README.md (#869)

(cherry picked from commit 5971b2a)

* add log for file not found

(cherry picked from commit 0d7ca0c)

* simplify artifact id parser

(cherry picked from commit 1969cdb)

* Update sofa-ark-parent/core-impl/archive/src/test/java/com/alipay/sofa/ark/loader/test/jar/JarUtilsTest.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit 8134069)

* fix ark plugin  (#877)

* no export apache for web and netty ark plugin

* no lib in ark plugin

(cherry picked from commit af25776)

* parse artifact id with accuracy first (#878)

* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

(cherry picked from commit e6ab184)

* add start class in manifest (#883)

* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

* add start class in manifest

* fix test

* remove unused field

(cherry picked from commit e74c7ea)

* <feature> add bizFailedEvent (#881)

* <feature> add bizFailedEvent

* format

* add notes

* rename BizFailedEvent to AfterBizFailedEvent

* refactor

---------

Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 1a30e63)

* add envs for biz starter (#885)

* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

* add start class in manifest

* fix test

* remove unused field

* add envs for biz start

(cherry picked from commit 12d4da4)

* add envs for install operation (#887)

* add envs for install operation

* fix format

* fix potential resource leaks when install biz

(cherry picked from commit 24bd60d)

* set args as empty array when args = null for startup (#888)

* add envs for install operation

* fix format

* fix potential resource leaks when install biz

* fix null args throw exception for springboot

(cherry picked from commit e4adbcb)

* add bizStateChangeLog (#889)

* add more info for biz.toString()

* format

* format

* update bizinfo

* format

* rename to bizStateRecord

* format

(cherry picked from commit 6659991)

* 1、增加zookeeper注册节点环境变量,新增配置参数com.alipay.sofa.ark.config.env。默认为sofa-ark (#890)

* 1、增加zookeeper注册节点环境变量,新增配置参数com.alipay.sofa.ark.config.env。默认为sofa-ark
2、升级curator版本,重构NodeCache已过时

* 1、增加zookeeper注册节点环境变量,新增配置参数com.alipay.sofa.ark.config.env。默认为sofa-ark
2、升级curator版本,重构NodeCache已过时

---------

Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 5395cbf)

* fix no ark log in ark container (#891)

* update logback in ark container

* fix ark container log

(cherry picked from commit 75fa690)

* update biz state record name (#892)

* update logback in ark container

* fix ark container log

* modify biz state record name

(cherry picked from commit 6412923)

* rename typo (#893)

* update logback in ark container

* fix ark container log

* modify biz state record name

* format code

(cherry picked from commit 6602b96)

* update version

* code format

* remove springboot 1.x 2.x adapter

---------

Co-authored-by: g-stream <ylchen.changshu@gmail.com>
Co-authored-by: Lipeng <44571204+gaosaroma@users.noreply.github.com>
Co-authored-by: hadoop835 <chenjian835@163.com>
lvjing2 added a commit that referenced this pull request Mar 31, 2024
* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

* add start class in manifest

* fix test

* remove unused field

* add envs for biz start

(cherry picked from commit 12d4da4)
lvjing2 added a commit that referenced this pull request Apr 1, 2024
* Update README.md (#869)

(cherry picked from commit 5971b2a)

* add log for file not found

(cherry picked from commit 0d7ca0c)

* simplify artifact id parser

(cherry picked from commit 1969cdb)

* Update sofa-ark-parent/core-impl/archive/src/test/java/com/alipay/sofa/ark/loader/test/jar/JarUtilsTest.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit 8134069)

* fix ark plugin  (#877)

* no export apache for web and netty ark plugin

* no lib in ark plugin

(cherry picked from commit af25776)

* parse artifact id with accuracy first (#878)

* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

(cherry picked from commit e6ab184)

* add start class in manifest (#883)

* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

* add start class in manifest

* fix test

* remove unused field

(cherry picked from commit e74c7ea)

* <feature> add bizFailedEvent (#881)

* <feature> add bizFailedEvent

* format

* add notes

* rename BizFailedEvent to AfterBizFailedEvent

* refactor

---------

Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 1a30e63)

* add envs for biz starter (#885)

* no export apache for web and netty ark plugin

* no lib in ark plugin

* parse artifact id with accuracy first

* fix test error

* add start class in manifest

* fix test

* remove unused field

* add envs for biz start

(cherry picked from commit 12d4da4)

* add envs for install operation (#887)

* add envs for install operation

* fix format

* fix potential resource leaks when install biz

(cherry picked from commit 24bd60d)

* set args as empty array when args = null for startup (#888)

* add envs for install operation

* fix format

* fix potential resource leaks when install biz

* fix null args throw exception for springboot

(cherry picked from commit e4adbcb)

* add bizStateChangeLog (#889)

* add more info for biz.toString()

* format

* format

* update bizinfo

* format

* rename to bizStateRecord

* format

(cherry picked from commit 6659991)

* 1、增加zookeeper注册节点环境变量,新增配置参数com.alipay.sofa.ark.config.env。默认为sofa-ark (#890)

* 1、增加zookeeper注册节点环境变量,新增配置参数com.alipay.sofa.ark.config.env。默认为sofa-ark
2、升级curator版本,重构NodeCache已过时

* 1、增加zookeeper注册节点环境变量,新增配置参数com.alipay.sofa.ark.config.env。默认为sofa-ark
2、升级curator版本,重构NodeCache已过时

---------

Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 5395cbf)

* fix no ark log in ark container (#891)

* update logback in ark container

* fix ark container log

(cherry picked from commit 75fa690)

* update biz state record name (#892)

* update logback in ark container

* fix ark container log

* modify biz state record name

(cherry picked from commit 6412923)

* rename typo (#893)

* update logback in ark container

* fix ark container log

* modify biz state record name

* format code

(cherry picked from commit 6602b96)

* code format

* remove springboot 1.x 2.x adapter

* update version

---------

Co-authored-by: Lipeng <44571204+gaosaroma@users.noreply.github.com>
Co-authored-by: hadoop835 <chenjian835@163.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.

None yet

2 participants