Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion otel-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<description>OpenTelemetry instrumentation plugin for AWS Lambda Durable Execution SDK</description>

<properties>
<opentelemetry.version>1.66.0</opentelemetry.version>
<opentelemetry.version>1.67.0</opentelemetry.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import io.opentelemetry.sdk.trace.IdGenerator;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.data.LinkData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
import java.time.Instant;
Expand Down Expand Up @@ -54,8 +56,10 @@ void generateTraceId_withoutArn_returnsRandom() {
@Test
void scopedIds_delegateOutsideScope() {
var providerGenerator = new DeterministicIdGenerator();
try (var provider =
SdkTracerProvider.builder().setIdGenerator(providerGenerator).build()) {
try (var provider = SdkTracerProvider.builder()
.setIdGenerator(providerGenerator)
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()))
.build()) {
var pluginTracer = provider.get("durable-plugin");
var unrelatedTracer = provider.get("unrelated-library");

Expand Down Expand Up @@ -85,8 +89,10 @@ void scopedIds_delegateOutsideScope() {
@Test
void scopedIds_bridgeAcrossGeneratorInstances() {
var agentGenerator = new DeterministicIdGenerator();
try (var provider =
SdkTracerProvider.builder().setIdGenerator(agentGenerator).build()) {
try (var provider = SdkTracerProvider.builder()
.setIdGenerator(agentGenerator)
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()))
.build()) {
var workflowTraceId = generator.generateTraceIdForExecution("arn:exec1", EXECUTION_START_TIME);
var workflowSpanId = generator.generateWorkflowSpanId("arn:exec1");
var workflow = generator.startSpan(
Expand All @@ -112,6 +118,7 @@ void scopedTraceId_isConsumedBeforeSamplerStartsNestedRoot() {
try (var provider = SdkTracerProvider.builder()
.setIdGenerator(agentGenerator)
.setSampler(sampler)
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()))
.build()) {
var tracer = provider.get("durable-plugin");
tracerReference.set(tracer);
Expand All @@ -134,8 +141,10 @@ void scopedTraceId_isConsumedBeforeSamplerStartsNestedRoot() {
void concurrentScopedIds_doNotOverwriteEachOther() throws Exception {
var agentGenerator = new DeterministicIdGenerator();
var executor = Executors.newFixedThreadPool(2);
try (var provider =
SdkTracerProvider.builder().setIdGenerator(agentGenerator).build()) {
try (var provider = SdkTracerProvider.builder()
.setIdGenerator(agentGenerator)
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()))
.build()) {
var tracer = provider.get("durable-plugin");
var barrier = new CyclicBarrier(2);
var traceId1 = generator.generateTraceIdForExecution("arn:exec1", EXECUTION_START_TIME);
Expand Down Expand Up @@ -165,7 +174,9 @@ void concurrentScopedIds_doNotOverwriteEachOther() throws Exception {
void installOn_preservesConfiguredFallbackGenerator() {
var fallbackTraceId = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
var fallbackSpanId = "cccccccccccccccc";
var builder = SdkTracerProvider.builder().setIdGenerator(fixedIds(fallbackTraceId, fallbackSpanId));
var builder = SdkTracerProvider.builder()
.setIdGenerator(fixedIds(fallbackTraceId, fallbackSpanId))
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()));
var installedGenerator = DeterministicIdGenerator.installOn(builder);

try (var provider = builder.build()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.data.LinkData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
import java.time.Duration;
Expand Down Expand Up @@ -71,6 +73,7 @@ public String getDescription() {
try (var provider = SdkTracerProvider.builder()
.setSampler(topology.equals("plain") ? configured : DurableSampler.wrap(configured))
.setIdGenerator(new DeterministicIdGenerator())
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()))
.build()) {
var opaque = new TracerProvider() {
public Tracer get(String name) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.sdk.trace.data.LinkData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
import java.time.Instant;
Expand Down Expand Up @@ -72,6 +74,7 @@ void durableStartCallbacksRetainTheirOwnSamplingAndRandomIds(
: SdkTracerProvider.builder()
.setSampler(DurableSampler.wrap(policy))
.setIdGenerator(new DeterministicIdGenerator())
.addSpanProcessor(SimpleSpanProcessor.create(SpanExporter.noop()))
.build()) {
observer.tracer = unrelated.get("processor");
var original = Context.current();
Expand Down
Loading