Skip to content
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
import com.google.common.collect.ImmutableList;
import com.google.logging.v2.WriteLogEntriesRequest;
import com.google.logging.v2.WriteLogEntriesResponse;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Scope;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import org.easymock.Capture;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -109,6 +115,7 @@ public void setup() {
@After
public void teardown() {
new ContextHandler().removeCurrentContext();
new ContextHandler().removeCurrentContextPriority();
}

private void mockCurrentContext(
Expand Down Expand Up @@ -204,4 +211,28 @@ public void testMonitoredResourcePopulationInWriteOptions() {
LogEntry actual = LogEntry.fromPb(rpcWriteArgument.getValue().getEntries(0));
assertEquals(expectedResource, actual.getResource());
}

@Test
public void testAutoPopulationWithOpenTelemetryContext() {
try (OpenTelemetrySdk openTelemetrySdk =
OpenTelemetrySdk.builder().setTracerProvider(SdkTracerProvider.builder().build()).build()) {
Tracer tracer = openTelemetrySdk.getTracer("ValidationTest");
Span otelSpan = tracer.spanBuilder("test-span").startSpan();

try (Scope scope = otelSpan.makeCurrent()) {
SpanContext spanContext = otelSpan.getSpanContext();
logging.write(ImmutableList.of(SIMPLE_LOG_ENTRY));

LogEntry actual = LogEntry.fromPb(rpcWriteArgument.getValue().getEntries(0));
String expectedTrace =
String.format(
LoggingImpl.RESOURCE_NAME_FORMAT, RESOURCE_PROJECT_ID, spanContext.getTraceId());
assertEquals(expectedTrace, actual.getTrace());
assertEquals(spanContext.getSpanId(), actual.getSpanId());
assertEquals(spanContext.isSampled(), actual.getTraceSampled());
} finally {
otelSpan.end();
}
}
}
}
Loading