Move implementation and add tests

Author: trask

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java

@@ -11,6 +11,7 @@
 import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.internal.ExtendedAttributesMap;
@@ -135,18 +136,12 @@ public void emit() {
       return;
     }
 
-    if (severity != Severity.UNDEFINED_SEVERITY_NUMBER
-        && severity.getSeverityNumber() < logger.minimumSeverity) {
-      return;
-    }
-
     Context context = this.context == null ? Context.current() : this.context;
-    if (logger.traceBased) {
-      Span span = Span.fromContext(context);
-      if (span.getSpanContext().isValid() && !span.getSpanContext().getTraceFlags().isSampled()) {
-        return;
-      }
+    Span span = Span.fromContext(context);
+    if (shouldDropLog(span)) {
+      return;
     }
+    SpanContext spanContext = span.getSpanContext();
 
     long observedTimestampEpochNanos =
         this.observedTimestampEpochNanos == 0
@@ -163,7 +158,7 @@ public void emit() {
                 eventName,
                 timestampEpochNanos,
                 observedTimestampEpochNanos,
-                Span.fromContext(context).getSpanContext(),
+                spanContext,
                 severity,
                 severityText,
                 body,

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java

@@ -10,6 +10,7 @@
 import io.opentelemetry.api.logs.LogRecordBuilder;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.internal.AttributesMap;
@@ -125,6 +126,11 @@ public void emit() {
       return;
     }
     Context context = this.context == null ? Context.current() : this.context;
+    Span span = Span.fromContext(context);
+    if (shouldDropLog(span)) {
+      return;
+    }
+    SpanContext spanContext = span.getSpanContext();
     long observedTimestampEpochNanos =
         this.observedTimestampEpochNanos == 0
             ? this.loggerSharedState.getClock().now()
@@ -139,11 +145,28 @@ public void emit() {
                 instrumentationScopeInfo,
                 timestampEpochNanos,
                 observedTimestampEpochNanos,
-                Span.fromContext(context).getSpanContext(),
+                spanContext,
                 severity,
                 severityText,
                 body,
                 attributes,
                 eventName));
   }
+
+  /** Returns {@code true} when filters require dropping the log. */
+  protected boolean shouldDropLog(Span span) {
+    if (severity != Severity.UNDEFINED_SEVERITY_NUMBER
+        && severity.getSeverityNumber() < logger.minimumSeverity) {
+      return true;
+    }
+
+    if (logger.traceBased) {
+      SpanContext spanContext = span.getSpanContext();
+      if (spanContext.isValid() && !spanContext.getTraceFlags().isSampled()) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 }

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilderTest.java

@@ -140,4 +140,51 @@ void testConvenienceAttributeMethods() {
             equalTo(booleanKey("bk"), true),
             equalTo(longKey("ik"), 13L));
   }
+
+  @Test
+  void emitDropsBelowMinimumSeverity() {
+    LoggerConfig config =
+        LoggerConfig.builder().setMinimumSeverity(Severity.INFO.getSeverityNumber()).build();
+    SdkLogger logger = new SdkLogger(loggerSharedState, SCOPE_INFO, config);
+    builder = new SdkLogRecordBuilder(loggerSharedState, SCOPE_INFO, logger);
+
+    builder.setBody("too-low").setSeverity(Severity.DEBUG).emit();
+    assertThat(emittedLog.get()).isNull();
+
+    builder.setBody("allowed").setSeverity(Severity.INFO).emit();
+    assertThat(emittedLog.get().toLogRecordData()).hasBody("allowed");
+  }
+
+  @Test
+  void emitDropsUnsampledTraceWhenTraceBased() {
+    LoggerConfig config = LoggerConfig.builder().setTraceBased(true).build();
+    SdkLogger logger = new SdkLogger(loggerSharedState, SCOPE_INFO, config);
+    builder = new SdkLogRecordBuilder(loggerSharedState, SCOPE_INFO, logger);
+
+    SpanContext unsampledSpanContext =
+        SpanContext.create(
+            "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+            "bbbbbbbbbbbbbbbb",
+            TraceFlags.getDefault(),
+            TraceState.getDefault());
+    builder
+        .setBody("unsampled")
+        .setContext(Span.wrap(unsampledSpanContext).storeInContext(Context.root()))
+        .emit();
+    assertThat(emittedLog.get()).isNull();
+
+    SpanContext sampledSpanContext =
+        SpanContext.create(
+            "cccccccccccccccccccccccccccccccc",
+            "dddddddddddddddd",
+            TraceFlags.getSampled(),
+            TraceState.getDefault());
+    builder
+        .setBody("sampled")
+        .setContext(Span.wrap(sampledSpanContext).storeInContext(Context.root()))
+        .emit();
+    assertThat(emittedLog.get().toLogRecordData())
+        .hasSpanContext(sampledSpanContext)
+        .hasBody("sampled");
+  }
 }