Remove todos

Signed-off-by: Tomas Longo <tomas.longo@sap.com>
opensearch-project · Feb 13, 2025 · 77feae9 · 77feae9
1 parent a1c3d6c
commit 77feae9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/...ommon/src/test/java/org/opensearch/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java b/...ommon/src/test/java/org/opensearch/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java
@@ -209,14 +209,6 @@ public void testParseExportTraceServiceRequest() throws IOException {
             validateSpans(spans);
         }
 
-        @Test
-        // TODO tlongo is this test still relevant?
-        public void testParseExportTraceServiceRequest_ScopeSpansTakesPrecedenceOverInstrumentationLibrarySpans() throws IOException {
-            final ExportTraceServiceRequest exportTraceServiceRequest = buildExportTraceServiceRequestFromJsonFile(TEST_REQUEST_BOTH_SPAN_TYPES_JSON_FILE);
-            final List<Span> spans = decoderUnderTest.parseExportTraceServiceRequest(exportTraceServiceRequest, Instant.now());
-            validateSpans(spans);
-        }
-
         @Test
         public void testParseExportTraceServiceRequest_NoSpans() throws IOException {
             final ExportTraceServiceRequest exportTraceServiceRequest = buildExportTraceServiceRequestFromJsonFile(TEST_REQUEST_NO_SPANS_JSON_FILE);

diff --git a/...c/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcService.java b/...c/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcService.java
@@ -98,8 +98,6 @@ private void processRequest(final ExportTraceServiceRequest request, final Strea
         try {
             if (buffer.isByteBuffer()) {
                 Map<String, ExportTraceServiceRequest> requestsMap = oTelProtoDecoder.splitExportTraceServiceRequestByTraceId(request);
-                // TODO tlongo remove
-                ExportTraceServiceRequest tmp;
                 for (Map.Entry<String, ExportTraceServiceRequest> entry: requestsMap.entrySet()) {
                     buffer.writeBytes(entry.getValue().toByteArray(), entry.getKey(), bufferWriteTimeoutInMillis);
                 }

diff --git a/...ntegrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java b/...ntegrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java
@@ -263,8 +263,8 @@ private List<Map<String, Object>> getExpectedDocuments(ExportTraceServiceRequest
         for(int i=0; i<exportTraceServiceRequests.length; i++) {
             exportTraceServiceRequests[i].getResourceSpansList().forEach( resourceSpans -> {
                 final String resourceName = getServiceName(resourceSpans);
-                resourceSpans.getScopeSpansList().forEach( instrumentationLibrarySpans -> {
-                    instrumentationLibrarySpans.getSpansList().forEach(span -> {
+                resourceSpans.getScopeSpansList().forEach( scopeSpans -> {
+                    scopeSpans.getSpansList().forEach(span -> {
                         expectedDocuments.add(getExpectedEsDocumentSource(span, resourceName));
                     });
                 });