fix rebase merge conflicts

opensearch-project · Aug 10, 2023 · 52a6212 · 52a6212
1 parent 536572d
commit 52a6212
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 54 deletions.
diff --git a/...elemetry/src/main/java/org/opensearch/telemetry/diagnostics/DiagnosticsEventListener.java b/...elemetry/src/main/java/org/opensearch/telemetry/diagnostics/DiagnosticsEventListener.java
@@ -16,7 +16,7 @@
 import org.opensearch.telemetry.tracing.listeners.TraceEventListener;
 import org.opensearch.telemetry.tracing.Span;
 import org.opensearch.telemetry.tracing.Tracer;
-import org.opensearch.telemetry.tracing.listeners.TraceEventsService;
+import org.opensearch.telemetry.tracing.TraceEventsService;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...racing/listeners/TraceEventsRunnable.java → ...elemetry/tracing/TraceEventsRunnable.java b/...racing/listeners/TraceEventsRunnable.java → ...elemetry/tracing/TraceEventsRunnable.java
@@ -6,11 +6,12 @@
  * compatible open source license.
  */
 
-package org.opensearch.telemetry.tracing.listeners;
+package org.opensearch.telemetry.tracing;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.telemetry.tracing.Span;
+import org.opensearch.telemetry.tracing.listeners.RunnableEventListener;
+import org.opensearch.telemetry.tracing.listeners.TraceEventListener;
 
 /**
  * Runnable implementation that wraps another Runnable and adds trace event listener functionality.
@@ -69,7 +70,7 @@ public Runnable unwrap() {
      */
     public static void invokeOnRunnableStart(TraceEventsService traceEventsService) {
         if (traceEventsService.isTracingEnabled()) {
-            Span span = traceEventsService.getTracer().getCurrentSpan();
+            Span span = traceEventsService.getTracer().getCurrentSpan().getSpan();
             // repeat it for all the spans in the hierarchy
             while (span != null) {
                 if (!span.hasEnded()) {
@@ -91,7 +92,7 @@ public static void invokeOnRunnableStart(TraceEventsService traceEventsService)
      */
     public static void invokeOnRunnableComplete(TraceEventsService traceEventsService) {
         if (traceEventsService.isTracingEnabled()) {
-            Span span = traceEventsService.getTracer().getCurrentSpan();
+            Span span = traceEventsService.getTracer().getCurrentSpan().getSpan();
             while (span != null) {
                 if (!span.hasEnded()) {
                     Span finalSpan = span;

diff --git a/...tracing/listeners/TraceEventsService.java → ...telemetry/tracing/TraceEventsService.java b/...tracing/listeners/TraceEventsService.java → ...telemetry/tracing/TraceEventsService.java
@@ -6,15 +6,13 @@
  * compatible open source license.
  */
 
-package org.opensearch.telemetry.tracing.listeners;
+package org.opensearch.telemetry.tracing;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.telemetry.diagnostics.DiagnosticSpan;
 import org.opensearch.telemetry.diagnostics.DiagnosticsEventListener;
-import org.opensearch.telemetry.tracing.Span;
-import org.opensearch.telemetry.tracing.Tracer;
-import org.opensearch.telemetry.tracing.TracerWrapper;
+import org.opensearch.telemetry.tracing.listeners.TraceEventListener;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/TracerWrapper.java b/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/TracerWrapper.java
@@ -11,7 +11,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.telemetry.tracing.listeners.SpanEventListener;
-import org.opensearch.telemetry.tracing.listeners.TraceEventsService;
 
 import java.io.IOException;
 
@@ -36,7 +35,7 @@ public class TracerWrapper implements Tracer {
      * @param delegate the underlying Tracer implementation
      * @param traceEventsService  traceEventListenerService
      */
-    public TracerWrapper(Tracer delegate, TraceEventsService traceEventsService) {
+    TracerWrapper(Tracer delegate, TraceEventsService traceEventsService) {
         assert delegate != null;
         this.tracer = delegate;
         this.traceEventsService = traceEventsService;

diff --git a/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/noop/NoopTracer.java b/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/noop/NoopTracer.java
@@ -8,13 +8,10 @@
 
 package org.opensearch.telemetry.tracing.noop;
 
-import org.opensearch.telemetry.tracing.Span;
 import org.opensearch.telemetry.tracing.SpanScope;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.telemetry.tracing.SpanContext;
 
-import java.util.Map;
-
 /**
  * No-op implementation of Tracer.
  * This class provides a Tracer implementation that does nothing and is used as a placeholder
@@ -48,31 +45,6 @@ public SpanScope startSpan(String spanName) {
         return SpanScope.NO_OP;
     }
 
-    /**
-     * Starts a new no-op span with the given spanName and attributes.
-     * The method always returns a {@link SpanScope#NO_OP} instance, indicating that no actual
-     * span-scoping is required.
-     *
-     * @param spanName   the name of the no-op span.
-     * @param attributes a map of attributes to be associated with the no-op span.
-     * @return a {@link SpanScope#NO_OP} instance.
-     */
-    @Override
-    public SpanScope startSpan(String spanName, Map<String, String> attributes) {
-        return SpanScope.NO_OP;
-    }
-
-    /**
-     * Returns the current no-op span.
-     * Since the NoopTracer does not perform any actual tracing, this method always returns null.
-     *
-     * @return null, as there is no current span in the NoopTracer.
-     */
-    @Override
-    public Span getCurrentSpan() {
-        return null;
-    }
-
     /**
      * Closes the NoopTracer.
      * Since the NoopTracer does not have any resources that need to be released, this method does nothing.

diff --git a/...g/listeners/TraceEventsRunnableTests.java → ...try/tracing/TraceEventsRunnableTests.java b/...g/listeners/TraceEventsRunnableTests.java → ...try/tracing/TraceEventsRunnableTests.java
@@ -6,10 +6,9 @@
  * compatible open source license.
  */
 
-package org.opensearch.telemetry.tracing.listeners;
+package org.opensearch.telemetry.tracing;
 
-import org.opensearch.telemetry.tracing.Span;
-import org.opensearch.telemetry.tracing.Tracer;
+import org.opensearch.telemetry.tracing.listeners.TraceEventListener;
 import org.opensearch.test.OpenSearchTestCase;
 
 import org.mockito.Mockito;
@@ -37,7 +36,7 @@ public void setUp() throws Exception {
         delegate = Mockito.mock(Runnable.class);
 
         Mockito.when(traceEventsService.getTracer()).thenReturn(tracer);
-        Mockito.when(tracer.getCurrentSpan()).thenReturn(span);
+        Mockito.when(tracer.getCurrentSpan()).thenReturn(new SpanContext(span));
         Mockito.when(span.getParentSpan()).thenReturn(null);
 
         traceEventsService.registerTraceEventListener("listener1", traceEventListener1);
@@ -51,7 +50,7 @@ public void setUp() throws Exception {
     public void testRun_InvokeOnRunnableStartAndOnRunnableComplete() {
         Span span1 = Mockito.mock(Span.class);
         Span span2 = Mockito.mock(Span.class);
-        Mockito.when(traceEventsService.getTracer().getCurrentSpan()).thenReturn(span1, span1);
+        Mockito.when(traceEventsService.getTracer().getCurrentSpan()).thenReturn(new SpanContext(span1), new SpanContext(span1));
         Mockito.when(span1.hasEnded()).thenReturn(false);
         Mockito.when(span2.hasEnded()).thenReturn(false);
         Mockito.when(span1.getParentSpan()).thenReturn(span2);

diff --git a/...ng/listeners/TraceEventsServiceTests.java → ...etry/tracing/TraceEventsServiceTests.java b/...ng/listeners/TraceEventsServiceTests.java → ...etry/tracing/TraceEventsServiceTests.java
@@ -6,12 +6,10 @@
  * compatible open source license.
  */
 
-package org.opensearch.telemetry.tracing.listeners;
+package org.opensearch.telemetry.tracing;
 
 import org.opensearch.telemetry.diagnostics.DiagnosticSpan;
-import org.opensearch.telemetry.tracing.Span;
-import org.opensearch.telemetry.tracing.Tracer;
-import org.opensearch.telemetry.tracing.TracerWrapper;
+import org.opensearch.telemetry.tracing.listeners.TraceEventListener;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.util.Map;

diff --git a/...tracing/listeners/TracerWrapperTests.java → ...telemetry/tracing/TracerWrapperTests.java b/...tracing/listeners/TracerWrapperTests.java → ...telemetry/tracing/TracerWrapperTests.java
@@ -6,13 +6,9 @@
  * compatible open source license.
  */
 
-package org.opensearch.telemetry.tracing.listeners;
+package org.opensearch.telemetry.tracing;
 
-import org.opensearch.telemetry.tracing.Span;
-import org.opensearch.telemetry.tracing.SpanContext;
-import org.opensearch.telemetry.tracing.SpanScope;
-import org.opensearch.telemetry.tracing.Tracer;
-import org.opensearch.telemetry.tracing.TracerWrapper;
+import org.opensearch.telemetry.tracing.listeners.TraceEventListener;
 import org.opensearch.test.OpenSearchTestCase;
 
 import static org.mockito.Mockito.any;
@@ -50,6 +46,7 @@ public void setUp() throws Exception {
         spanScope = mock(SpanScope.class);
 
         when(tracer.startSpan(anyString())).thenReturn(spanScope);
+        when(tracer.startSpan(anyString(), any())).thenReturn(spanScope);
         when(tracer.getCurrentSpan()).thenReturn(spanContext);
         when(traceEventsService.isTracingEnabled()).thenReturn(true);
         when(traceEventsService.getTracer()).thenReturn(tracer);