Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix - remove cloud relocation because it's not needed anymore - #476

Merged
cleverchuk merged 1 commit into
mainfrom
cc/NH-136475
Apr 29, 2026
Merged

Fix - remove cloud relocation because it's not needed anymore#476
cleverchuk merged 1 commit into
mainfrom
cc/NH-136475

Conversation

@cleverchuk

Copy link
Copy Markdown
Contributor

Summary

Remove the cloud package relocation from the shadow JAR configuration and deduplicate the com.google relocation rule.

Details

The cloud relocation (cloudcom.solarwinds.joboe.shaded.cloud) was inadvertently rewriting OpenTelemetry semantic convention attribute names that contain cloud (e.g., cloud.platform, cloud.provider) into shaded equivalents at build time. This caused the agent to emit incorrect attribute keys at runtime.

Removing this relocation fixes the attribute name corruption. No actual classes under a bare cloud.* package exist in the dependency tree, so the rule served no useful shading purpose.

Additionally, the com.google relocation in this block was a duplicate — it already exists earlier in the file. The google relocation (for proto-generated classes outside the com.google namespace) is retained and moved to the end of the relocation list for clarity.

Changes

  • Removed cloudcom.solarwinds.joboe.shaded.cloud relocation
  • Removed duplicate com.googlecom.solarwinds.joboe.shaded.google relocation
  • Moved googlecom.solarwinds.joboe.shaded.google2 relocation to end of block

Test Plan:

Manual verification

Test services data

  1. e-1712644058766987264
  2. e-1712643928659124224
  3. e-1742334541200846848
  4. e-1777406072376840192

Copilot AI review requested due to automatic review settings April 29, 2026 15:37
@cleverchuk
cleverchuk requested review from a team as code owners April 29, 2026 15:37

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Adjusts the central ShadowJar relocation rules (in buildSrc) to prevent OpenTelemetry semantic convention attribute key corruption caused by an overly broad relocation, while also removing a duplicate relocation entry.

Changes:

  • Removed the cloudcom.solarwinds.joboe.shaded.cloud relocation that was rewriting semantic attribute names (e.g., cloud.platform).
  • Removed a duplicate com.googlecom.solarwinds.joboe.shaded.google relocation rule.
  • Moved the bare googlecom.solarwinds.joboe.shaded.google2 relocation to the end of the relocation list for clarity.

Comment thread buildSrc/src/main/kotlin/solarwinds.shadow-conventions.gradle.kts
Comment thread buildSrc/src/main/kotlin/solarwinds.shadow-conventions.gradle.kts

@cheempz cheempz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@cleverchuk
cleverchuk merged commit b4c7c64 into main Apr 29, 2026
39 checks passed
@cleverchuk
cleverchuk deleted the cc/NH-136475 branch April 29, 2026 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants