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

fix: otel configuration #607

Merged
merged 1 commit into from
Dec 9, 2024
Merged

fix: otel configuration #607

merged 1 commit into from
Dec 9, 2024

Conversation

gfyrag
Copy link
Contributor

@gfyrag gfyrag commented Dec 9, 2024

No description provided.

@gfyrag gfyrag requested a review from a team as a code owner December 9, 2024 11:23
Copy link

coderabbitai bot commented Dec 9, 2024

Walkthrough

The changes in this pull request focus on the NewComponent function within the Component struct in the deployments/pulumi/pkg/component.go file. Modifications include a shift from using pulumi.All to pulumix.Apply for handling OpenTelemetry resource attributes and metrics, improving the construction of environment variables. The logic for optional values has been enhanced to return empty strings for nil values, and error handling for the upgradeMode variable has been refined. Overall, these adjustments aim to simplify logic and improve error reporting without altering the function's structure.

Changes

File Change Summary
deployments/pulumi/pkg/component.go Updated NewComponent function to use pulumix.Apply for handling otel.ResourceAttributes and metrics, simplifying environment variable construction and improving error handling for upgradeMode.

Poem

In the meadow where we play,
Changes come to light today.
With cleaner code and safer paths,
We hop along, avoiding wraths.
Oh, what joy in every line,
A brighter world, so sweet and fine! 🐇✨


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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • 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/schema.v2.json

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.

@gfyrag gfyrag enabled auto-merge December 9, 2024 11:26
@gfyrag gfyrag added this pull request to the merge queue Dec 9, 2024
Merged via the queue into main with commit 5814540 Dec 9, 2024
7 of 8 checks passed
@gfyrag gfyrag deleted the fix/pulumi-otel branch December 9, 2024 11:33
Copy link

@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 (1)
deployments/pulumi/pkg/component.go (1)

193-204: Refactor string concatenation using strings.Join for efficiency and readability

In the function constructing the OTEL_RESOURCE_ATTRIBUTES string, using strings.Join with a slice of key-value pairs improves performance and readability compared to concatenating strings in a loop.

Apply this diff to refactor the code:

 Value: pulumix.Apply(otel.ResourceAttributes, func(rawResourceAttributes map[string]string) string {
-    ret := ""
     keys := collectionutils.Keys(rawResourceAttributes)
     slices.Sort(keys)
+    pairs := make([]string, 0, len(keys))
     for _, key := range keys {
-        ret += key + "=" + rawResourceAttributes[key] + ","
+        pairs = append(pairs, key + "=" + rawResourceAttributes[key])
     }
-    if len(ret) > 0 {
-        ret = ret[:len(ret)-1]
-    }
-    return ret
+    return strings.Join(pairs, ",")
 }).Untyped().(pulumi.StringOutput),

Also, add the following import at the top of the file if not already present:

import "strings"
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between bf3c12c and 6b67650.

📒 Files selected for processing (1)
  • deployments/pulumi/pkg/component.go (1 hunks)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants