Skip to content

Update EventBridge DSM topic naming #11603

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.

Sign up for GitHub

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

Merged
gh-worker-dd-mergequeue-cf854d merged 7 commits into from
Jul 1, 2026
+101 −4
Merged

Update EventBridge DSM topic naming #11603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88fb9c6
Update EventBridge DSM topic naming
jeastham1993 Jun 9, 2026
15b84bb
Align EventBridge DSM tags with exchange/topic format
jeastham1993 Jun 9, 2026
ad40fa8
Merge branch 'master' into james.eastham/dsm-event-bridge
jeastham1993 Jun 22, 2026
2f4e2bb
Merge branch 'master' into james.eastham/dsm-event-bridge
jeastham1993 Jun 22, 2026
0a84bd3
Merge branch 'master' into james.eastham/dsm-event-bridge
jeastham1993 Jun 30, 2026
d6e8822
Fix EventBridge test formatting
jeastham1993 Jun 30, 2026
e4167ed
Merge branch 'master' into james.eastham/dsm-event-bridge
jeastham1993 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 50 additions & 4 deletions ...rc/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

public class EventBridgeInterceptor implements ExecutionInterceptor {
private static final Logger log = LoggerFactory.getLogger(EventBridgeInterceptor.class);
private static final String DEFAULT_EVENT_BUS_NAME = "default";
private static final String EVENT_BUS_ARN_PREFIX = "event-bus/";

public static final ExecutionAttribute<Context> CONTEXT_ATTRIBUTE =
InstanceStore.of(ExecutionAttribute.class)
Expand Down Expand Up @@ -57,7 +59,8 @@ public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes execu
}

String traceContext =
getTraceContextToInject(executionAttributes, entry.eventBusName(), startTime);
getTraceContextToInject(
executionAttributes, entry.eventBusName(), entry.detailType(), startTime);
detailBuilder.setLength(detailBuilder.length() - 1); // Remove the last bracket
if (detailBuilder.length() > 1) {
detailBuilder.append(", "); // Only add a comma if detail is not empty.
Expand All @@ -79,14 +82,19 @@ public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes execu
}

private String getTraceContextToInject(
ExecutionAttributes executionAttributes, String eventBusName, long startTime) {
ExecutionAttributes executionAttributes,
String eventBusName,
String detailType,
long startTime) {
Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE);
String resourceName =
eventBusName == null || eventBusName.isEmpty() ? DEFAULT_EVENT_BUS_NAME : eventBusName;
StringBuilder jsonBuilder = new StringBuilder();
jsonBuilder.append('{');

// Inject context
if (traceConfig().isDataStreamsEnabled()) {
DataStreamsTags tags = DataStreamsTags.createWithBus(OUTBOUND, eventBusName);
DataStreamsTags tags = buildDataStreamsTags(eventBusName, detailType);
DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags);
context = context.with(dsmContext);
}
Expand All @@ -103,10 +111,48 @@ private String getTraceContextToInject(
.append(" \"")
.append(RESOURCE_NAME_KEY)
.append("\": \"")
.append(eventBusName)
.append(resourceName)
.append('\"');

jsonBuilder.append('}');
return jsonBuilder.toString();
}

static DataStreamsTags buildDataStreamsTags(String eventBusName, String detailType) {
return new DataStreamsTags(
null,
OUTBOUND,
normalizeEventBusName(eventBusName),
normalizeDetailType(detailType),
"eventbridge",
null,
null,
null,
null,
null,
null,
null,
null,
null);
}

static String normalizeEventBusName(String eventBusName) {
if (eventBusName == null || eventBusName.isEmpty()) {
return DEFAULT_EVENT_BUS_NAME;
}

// EventBridge ARNs embed the full bus name after "event-bus/", including partner bus paths.
int arnBusNameStart = eventBusName.indexOf(EVENT_BUS_ARN_PREFIX);
if (arnBusNameStart >= 0) {
return eventBusName.substring(arnBusNameStart + EVENT_BUS_ARN_PREFIX.length());
}
return eventBusName;
}

static String normalizeDetailType(String detailType) {
if (detailType == null || detailType.isEmpty()) {
return null;
}
return detailType;
}
}
51 changes: 51 additions & 0 deletions ...est/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package datadog.trace.instrumentation.aws.v2.eventbridge;

import static org.junit.jupiter.api.Assertions.assertEquals;

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Add JUnit API to the test compile classpath

This module only adds Spock/Groovy to testImplementation and puts the JUnit 5 bundle on testRuntimeOnly in the shared Gradle setup, so this new Java test has no compile-time dependency for org.junit.jupiter.api.*. In this module, compileTestJava will fail as soon as it tries to compile this file unless the module adds a JUnit Jupiter API/implementation dependency or the test is written using the existing compile-time test dependencies.

Useful? React with 👍 / 👎.

import static org.junit.jupiter.api.Assertions.assertNull;

import datadog.trace.api.datastreams.DataStreamsTags;
import org.junit.jupiter.api.Test;

class EventBridgeInterceptorTest {

@Test
void buildsDataStreamsTagsFromArnAndDetailType() {
DataStreamsTags tags =
EventBridgeInterceptor.buildDataStreamsTags(
"arn:aws:events:us-east-1:123456789012:event-bus/test-bus", "order.created");

assertEquals(DataStreamsTags.DIRECTION_TAG + ":out", tags.getDirection());
assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange());
assertEquals(DataStreamsTags.TOPIC_TAG + ":order.created", tags.getTopic());
assertEquals(DataStreamsTags.TYPE_TAG + ":eventbridge", tags.getType());
}

@Test
void keepsPartnerBusPathWhenNormalizingArn() {
DataStreamsTags tags =
EventBridgeInterceptor.buildDataStreamsTags(
"arn:aws:events:us-east-1:123456789012:event-bus/aws.partner/example.com/acct/bus-name",
"detail-type");

assertEquals(
DataStreamsTags.EXCHANGE_TAG + ":aws.partner/example.com/acct/bus-name",
tags.getExchange());
assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic());
}

@Test
void defaultsToTheDefaultEventBusNameWhenMissing() {
DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags(null, "detail-type");

assertEquals(DataStreamsTags.EXCHANGE_TAG + ":default", tags.getExchange());
assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic());
}

@Test
void omitsTheTopicTagWhenDetailTypeIsMissing() {
DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags("test-bus", null);

assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange());
assertNull(tags.getTopic());
}
}