Repository navigation
Normalize per-instance RabbitMQ names in Data Streams edge tags - #13589
Draft
arjunguhaswe wants to merge 2 commits into
Draft
arjunguhaswe wants to merge 2 commits into
arjunguhaswe wants to merge 2 commits into
Conversation
Server-named queues, direct reply-to, bus endpoints, node queues and names with a random UUID or long hex suffix put a new value into the DSM topic/exchange edge tags for every process or request, creating new pathway hashes each time. Normalize those names (for example amq.gen-* or callback-*) before building the DSM tags on produce and consume. Span tags and resource names keep the raw names. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 20, 2026
Contributor
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master results
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Does This Do
Data Streams Monitoring (DSM) now normalizes per-instance RabbitMQ queue, routing key and exchange names before putting them in the
topic:/exchange:edge tags, on both produce and consume:amq.gen-JzTY20BRgKO-HjmUJj0wLgamq.gen-*amq.rabbitmq.reply-to.g1h2AA5y...amq.rabbitmq.reply-toip-10-0-1-2_PaymentService_bus_ybyyyyb6tamq6nr4bdpwzyhwbo*_PaymentService_bus_*wolverine.control.3,wolverine.response.<uuid>wolverine.control.*,wolverine.response.*callback-8f14e45f-ceea-467a-9f3a-6b1f1e2c0a11callback-*membership-9f8e7d6c5b4a39281706f5e4d3c2b1a0membership-*8f14e45f-ceea-467a-9f3a-6b1f1e2c0a11*Anything else is unchanged (e.g.
orders,orders-v2,queue-abc123).Span tags, resource names and the propagation-disabled-destination check still use the raw names.
Motivation
These names are hashed into the DSM pathway, so every server-named, reply or per-host queue creates new DSM nodes and new (hash, parent) pairs. In an internal investigation of high DSM cardinality, this was a recurring contributor: pathways got dropped by the per-service hash quota and the map filled up with one-off queues.
Additional Notes
RabbitDsmNames.normalize()inrabbitmq-amqp-2.7, used byRabbitDecorator.startReceivingSpan(consume) andChannelPublishContextPropagationAdvice(produce: the routing key on the default exchange, else the exchange name). spring-rabbit goes through the same code.DataStreamsTagsper message today, and a cache keyed on the raw name would fill with exactly these names.normalizeQueueName.orders-1234567890123456). Feedback welcome on whether that is too broad.Testing
RabbitDsmNamesTest(JUnit 5,@TableTest): every pattern above plus negatives (orders-v2,queue-abc123, 15-hex suffix, 35-char near-UUID, 31 hex, malformed bus/wolverine names), and idempotence.RabbitMQTest: DSM assertions on server-named queues now expecttopic:amq.gen-*; new feature checkscallback-<uuid>→topic:callback-*andevents-<32 hex>→exchange:events-*; a bareUUID.randomUUID()queue →topic:*.test,forkedTest,latestDepTest,latestDepForkedTest,reactorTest,latestReactorTestpass; spotless clean.Jira ticket: DSM2-806
🤖 Generated with Claude Code