Skip to content

chore: Enable local env vars for caddy tracing#37199

Closed
nidhi-nair wants to merge 1 commit intoreleasefrom
chore/caddy-tracing
Closed

chore: Enable local env vars for caddy tracing#37199
nidhi-nair wants to merge 1 commit intoreleasefrom
chore/caddy-tracing

Conversation

@nidhi-nair
Copy link
Contributor

@nidhi-nair nidhi-nair commented Nov 4, 2024

Description

Tip

Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team).

Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR.

Fixes #Issue Number
or
Fixes Issue URL

Warning

If no issue exists, please create an issue first, and check with the maintainers if the issue is valid.

Automation

/ok-to-test tags=""

🔍 Cypress test results

Caution

If you modify the content in this section, you are likely to disrupt the CI result for your PR.

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

  • New Features

    • Introduced automatic healing and monitoring capabilities to enhance application robustness.
    • Added support for OpenTelemetry monitoring with the new environment variable OTEL_SERVICE_NAME.
  • Bug Fixes

    • Improved handling of environment variables to prevent application crashes due to missing configurations.
  • Documentation

    • Enhanced logging and error handling for better initialization and recovery processes.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Nov 4, 2024

Walkthrough

The changes introduce a new environment variable, OTEL_SERVICE_NAME, set to appsmith-caddy, in both the entrypoint.sh and run-caddy.sh scripts to enhance OpenTelemetry monitoring capabilities. Additionally, the entrypoint.sh script has been updated to improve the handling of environment variables, ensuring that certain variables are unset if they are empty, thereby preventing application crashes. New functions for automatic healing and monitoring have also been added, while logging and error handling enhancements improve the initialization process.

Changes

File Path Change Summary
deploy/docker/fs/opt/appsmith/entrypoint.sh Added OTEL_SERVICE_NAME variable in init_loading_pages. Enhanced environment variable handling and added setup_auto_heal and setup_monitoring functions. Improved logging and error handling.
deploy/docker/fs/opt/appsmith/run-caddy.sh Added OTEL_SERVICE_NAME variable export before executing the Caddy server. Maintained existing logic.

Possibly related PRs

  • chore: Enable netty metrics based on env var #36108: The addition of the OTEL_SERVICE_NAME environment variable in both the main PR and the retrieved PR indicates a focus on enhancing monitoring capabilities, suggesting a direct relationship in terms of improving observability within the application.

Suggested labels

skip-changelog

Suggested reviewers

  • sondermanish

Poem

In scripts where variables dance and play,
OTEL_SERVICE_NAME joins the fray.
With healing and monitoring now in sight,
Our app's robustness shines ever so bright!
Logs and checks, a safety net spun,
In the world of code, we’ve only just begun! 🌟


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>, please review it.
    • Generate unit testing code 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 testing code 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@nidhi-nair
Copy link
Contributor Author

/build-deploy-preview skip-tests=true

@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Nov 4, 2024
@github-actions
Copy link

github-actions bot commented Nov 4, 2024

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/11660465265.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 37199.
recreate: .

@github-actions
Copy link

github-actions bot commented Nov 4, 2024

Deploy-Preview-URL: https://ce-37199.dp.appsmith.com

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.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (3)
deploy/docker/fs/opt/appsmith/run-caddy.sh (1)

21-22: LGTM! Consider adding environment variable validation.

The addition of OpenTelemetry service name is well-placed and follows the distributed tracing best practices.

Consider adding validation to ensure consistent tracing behavior:

+if [[ -z "${OTEL_SERVICE_NAME-}" ]]; then
 export OTEL_SERVICE_NAME=appsmith-caddy
+fi
deploy/docker/fs/opt/appsmith/entrypoint.sh (2)

Line range hint 513-527: Add log rotation for auto-heal and monitoring logs.

While the logging setup is good, continuous logging without rotation could lead to disk space issues. Consider implementing log rotation using logrotate.

 function setup_auto_heal(){
    if [[ ${APPSMITH_AUTO_HEAL-} = 1 ]]; then
      # By default APPSMITH_AUTO_HEAL=0
      # To enable auto heal set APPSMITH_AUTO_HEAL=1
+     # Setup log rotation
+     cat > /etc/logrotate.d/appsmith-auto-heal << EOF
+     $APPSMITH_LOG_DIR/cron/auto_heal.log {
+       daily
+       rotate 7
+       compress
+       delaycompress
+       missingok
+       notifempty
+     }
+EOF
      bash /opt/appsmith/auto_heal.sh $APPSMITH_AUTO_HEAL_CURL_TIMEOUT >> "$APPSMITH_LOG_DIR"/cron/auto_heal.log 2>&1 &
    fi
 }

Line range hint 279-307: Add retry mechanism for critical database operations.

While the error handling is good, critical operations like MongoDB replica set initialization could benefit from a retry mechanism with exponential backoff.

 init_replica_set() {
+  local max_retries=3
+  local retry_count=0
+  local backoff=5
   if [[ $shouldPerformInitdb -gt 0 && $isUriLocal -eq 0 ]]; then
     tlog "Initializing Replica Set for local database"
     # Start installed MongoDB service - Dependencies Layer
     mongod --fork --port 27017 --dbpath "$MONGO_DB_PATH" --logpath "$MONGO_LOG_PATH"
     tlog "Waiting 10s for MongoDB to start"
     sleep 10
     tlog "Creating MongoDB user"
-    mongosh "127.0.0.1/appsmith" --eval "db.createUser({
+    while [[ $retry_count -lt $max_retries ]]; do
+      if mongosh "127.0.0.1/appsmith" --eval "db.createUser({
         user: '$APPSMITH_MONGODB_USER',
         pwd: '$APPSMITH_MONGODB_PASSWORD',
         roles: [{
             role: 'root',
             db: 'admin'
         }, 'readWrite']
       }
-    )"
+    )"; then
+        break
+      fi
+      retry_count=$((retry_count + 1))
+      sleep $((backoff * retry_count))
+    done
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between f2c3125 and 4f21fc9.

📒 Files selected for processing (2)
  • deploy/docker/fs/opt/appsmith/entrypoint.sh (1 hunks)
  • deploy/docker/fs/opt/appsmith/run-caddy.sh (1 hunks)
🔇 Additional comments (1)
deploy/docker/fs/opt/appsmith/entrypoint.sh (1)

506-506: Consider validating OpenTelemetry endpoint configuration.

While setting OTEL_SERVICE_NAME is good, the script should validate that required OpenTelemetry endpoint configurations (OTEL_EXPORTER_OTLP_ENDPOINT) are properly set before enabling tracing.

@nidhi-nair nidhi-nair closed this Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-changelog Adding this label to a PR prevents it from being listed in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant