Skip to content

fix(otel): preserve configured service name #593

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

Open
zhongkechen wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −17
Open

fix(otel): preserve configured service name #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c02dc
fix(otel): preserve configured service name
zhongkechen Aug 4, 2026
00b8aff
Merge branch 'main' into codex/preserve-otel-service-name
zhongkechen Aug 4, 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
8 changes: 0 additions & 8 deletions otel-plugin/src/main/java/software/amazon/lambda/durable/otel/ExecutionOtelPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import static software.amazon.lambda.durable.otel.SpanAttributes.*;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanContext;
Expand All @@ -17,10 +16,8 @@
import io.opentelemetry.api.trace.TracerProvider;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
import io.opentelemetry.semconv.ServiceAttributes;
import java.time.Instant;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -87,7 +84,6 @@ public class ExecutionOtelPlugin implements DurableExecutionPlugin {
private static final Logger logger = LoggerFactory.getLogger(ExecutionOtelPlugin.class);
private static final String INSTRUMENTATION_NAME = "aws-durable-execution-sdk-java";
private static final String DEFAULT_WORKFLOW_SPAN_NAME = "Workflow";
private static final String SERVICE_NAME = "workflow";

private final SdkTracerProvider sdkTracerProvider;
private final Tracer tracer;
Expand Down Expand Up @@ -160,10 +156,6 @@ public ExecutionOtelPlugin(
String workflowSpanName) {
this.idGenerator = new DeterministicIdGenerator();

// Set service.name so this plugin's spans group under a distinct "workflow" node in X-Ray/OTLP backends.
var resource = Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME));
tracerProviderBuilder.addResource(resource);

this.sdkTracerProvider =
tracerProviderBuilder.setIdGenerator(idGenerator).build();
this.tracer = sdkTracerProvider.get(INSTRUMENTATION_NAME);
Expand Down
25 changes: 16 additions & 9 deletions otel-plugin/src/test/java/software/amazon/lambda/durable/otel/ExecutionOtelPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
import static org.junit.jupiter.api.Assertions.*;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
Expand All @@ -20,6 +23,8 @@
class ExecutionOtelPluginTest {

private static final String ARN = "arn:aws:lambda:us-east-1:123:function:test:$LATEST/durable/exec1";
private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
private static final String CONFIGURED_SERVICE_NAME = "durable-execution-conformance";

private InMemorySpanExporter spanExporter;
private ExecutionOtelPlugin plugin;
Expand All @@ -29,8 +34,11 @@ void setUp() {
DeterministicIdGenerator.clearSharedStateForTest();
OtelPluginAutoConfigurationState.resetInstalledForTest();
spanExporter = InMemorySpanExporter.create();
var resource = Resource.create(Attributes.of(SERVICE_NAME, CONFIGURED_SERVICE_NAME));
plugin = new ExecutionOtelPlugin(
SdkTracerProvider.builder().addSpanProcessor(SimpleSpanProcessor.create(spanExporter)),
SdkTracerProvider.builder()
.setResource(resource)
.addSpanProcessor(SimpleSpanProcessor.create(spanExporter)),
() -> null,
false,
"Workflow");
Expand Down Expand Up @@ -97,17 +105,16 @@ void terminalInvocation_exportsWorkflowAndInvocationSpans() {
}

@Test
void spans_carryWorkflowServiceName() {
void spans_preserveConfiguredServiceName() {
plugin.onInvocationStart(new InvocationInfo("req-1", ARN, true, Instant.now()));
plugin.onInvocationEnd(new InvocationEndInfo("req-1", ARN, true, InvocationStatus.SUCCEEDED, null));

var workflowSpan = spanByName(spanExporter.getFinishedSpanItems(), "Workflow");
assertEquals(
"workflow",
workflowSpan
.getResource()
.getAttribute(io.opentelemetry.api.common.AttributeKey.stringKey("service.name")),
"Spans should carry service.name=workflow");
for (var span : spanExporter.getFinishedSpanItems()) {
assertEquals(
CONFIGURED_SERVICE_NAME,
span.getResource().getAttribute(SERVICE_NAME),
"Plugin must preserve the caller-configured service.name");
}
}

@Test
Expand Down
Loading