add defaulting behavior for addEvent overload

Azure · Jun 23, 2021 · 5402c76 · 5402c76
1 parent c46413e
commit 5402c76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java b/...opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java
@@ -199,7 +199,7 @@ public Context getSharedSpanBuilder(String spanName, Context context) {
      */
     @Override
     public void addEvent(String eventName, Map<String, Object> traceEventAttributes, OffsetDateTime timestamp) {
-        addEvent(eventName, traceEventAttributes, timestamp, Context.NONE);
+        addEvent(eventName, traceEventAttributes, timestamp, new Context(PARENT_SPAN_KEY, Span.current()));
     }
 
     /**

diff --git a/...telemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java b/...telemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java
@@ -595,7 +595,7 @@ public void addEventWithChildSpan() {
     }
 
     @Test
-    public void addEventWithoutContext() {
+    public void addEventWithoutEventSpanContext() {
         // Arrange
         final String eventName = "event-0";
         OffsetDateTime eventTime = OffsetDateTime.parse("2021-01-01T18:35:24.00Z");
@@ -608,7 +608,7 @@ public void addEventWithoutContext() {
         assertEquals(PARENT_SPAN_KEY, recordEventsSpan.getName());
         List<EventData> eventData = recordEventsSpan.toSpanData().getEvents();
         assertNotNull(eventData);
-        assertEquals(0, eventData.size());
+        assertEquals(1, eventData.size());
     }
 
     private static void assertSpanWithExplicitParent(Context updatedContext, String parentSpanId) {

diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/tracing/Tracer.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/tracing/Tracer.java
@@ -253,7 +253,8 @@ default void addEvent(String name, Map<String, Object> attributes, OffsetDateTim
     }
 
     /**
-     * Adds an event to the current span with the provided {@code timestamp} and {@code attributes}.
+     * Adds an event to the span present in the {@code Context} with the provided {@code timestamp}
+     * and {@code attributes}.
      * <p>This API does not provide any normalization if provided timestamps are out of range of the current
      * span timeline</p>
      * <p>Supported attribute values include String, double, boolean, long, String [], double [], long [].