otel_apm_service_map: Added support for deriving remote service and remote operation by kkondaka · Pull Request #6539 · opensearch-project/data-prepper

kkondaka · 2026-02-19T06:53:38Z

Description

otel_apm_service_map: Added support for deriving remote service and remote operation.
Derives operation differently for server and client spans based on various attributes.

Issues Resolved

Resolves #[Issue number to be closed when this PR is merged]

Check List

[ X] New functionality includes testing.
New functionality has a documentation issue. Please link to it in this PR.
- New functionality has javadoc added
[X ] Commits are signed with a real name per the DCO

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…emote operation Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

dlvenable · 2026-02-19T16:20:44Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+            "Amazon S3", "AWS::S3",
+            "s3", "AWS::S3");
+
+    public static Pair<String,String> computeRemoteOperationAndService(final Map<String, Object> spanAttributes) {


Does this need to be public? If so, lets return a model instead of a Pair.

dlvenable · 2026-02-19T16:23:17Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+    }
+
+    private static String deriveServiceFromNetwork(final Map<String, Object> spanAttributes, final String urlString) {
+        final String[][] addressPortPairs = {


This also can come from a configuration file.

dlvenable · 2026-02-19T16:23:22Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+        String remoteService = null;
+
+        // RPC attributes
+        final String rpcService = getStringAttribute(spanAttributes, "rpc.service");


There is a lot in here that can change or be added to. Let's find a way to avoid requiring code changes for these. Perhaps using a resources file that has the mappings. Then the code can read the file for these mappings.

@dlvenable it's not just about the list of things but the logic to extract the derived fields is not same. We cannot capture the logic in the resource file, right?

dlvenable · 2026-02-19T16:23:37Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

        return spanName != null ? spanName : "UnknownOperation";
    }

+    private static final Map<String, String> AWS_SERVICE_MAPPINGS = Map.of(


Let's put this into a file as well.

dlvenable · 2026-02-19T16:25:23Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+            if (isServerSpan(span)) {
+                operationName = computeOperationName(span.getName(), spanAttributes);
+            } else if (isClientSpan(span) || isProducerSpan(span)) {
+                final Pair<String, String> remoteOperationAndService = computeRemoteOperationAndService(spanAttributes);


Is this change going to affect service_map as well? Is that ok?

It is just adding an attribute. Not going to change any thing in the service map

dlvenable · 2026-02-19T16:26:20Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

        }
    }

+    private static boolean isServerSpan(Span span) {


These would be better as default methods in the Span interface.

Span is in data-prepper-api and it doesn't import io.opentelemetry.proto.trace.v1.Span. And this method should actually be. comparing with io.opentelemetry.proto.trace.v1.Span.SpanKind.SPAN_KIND_SERVER. I will keep it here for now. If needed we can refactor to a different file under otel-proto-common in future

That reasoning makes sense and we probably should not add this to the package. Once we get the EventFactory fully working we can probably solve this because we won't need to have it in data-prepper-api.

vamsimanohar · 2026-02-19T23:56:55Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

@kkondaka can we make changes for environment detection as well. there are more clauses for cloud specific environemnt?

Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

dlvenable · 2026-02-23T16:16:19Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java


        for (final Span span : spans) {
-            if (span != null && SPAN_KIND_SERVER.equals(span.getKind())) {
+                System.out.println("--checking-----SERVER SPAN---"+isServerSpan(span));


Remove println. This is probably failing the build.

dlvenable · 2026-02-23T16:24:05Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

        }
    }

+    private static boolean isServerSpan(Span span) {


That reasoning makes sense and we probably should not add this to the package. Once we get the EventFactory fully working we can probably solve this because we won't need to have it in data-prepper-api.

dlvenable · 2026-02-23T16:25:02Z

.../src/main/java/org/opensearch/dataprepper/plugins/otel/common/RemoteOperationAndService.java

+
+package org.opensearch.dataprepper.plugins.otel.common;
+
+public class RemoteOperationAndService {


Can these classes be package protected? If so, let's start there and open only as needed.

dlvenable · 2026-02-23T16:27:14Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+    }
+
+
+    public Map<String, String> getAwsServiceMappingsFromResources() {


This should have it's own class and it's own unit testing. This makes it more general purpose for extension.

dlvenable · 2026-02-23T16:27:50Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+                return reader.lines()
+                .filter(line -> line.contains(","))
+                .collect(Collectors.toMap(
+                    line -> line.split(",", 2)[0].trim(),


Add some error handling if the line doesn't split as expected.

Also, only split once and re-use that array.

dlvenable · 2026-02-23T16:28:17Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+        return new AddressPortAttributeKeys(str);
+    }
+
+    public List<AddressPortAttributeKeys> getAddressPortAttributeKeysList() {


This also should have its own class and its own unit tests. This makes is ready for expansion.

dlvenable · 2026-02-23T16:28:41Z

data-prepper-plugins/otel-proto-common/src/main/resources/aws_service_mappings

@@ -0,0 +1,12 @@
+AmazonDynamoDBv2,AWS::DynamoDB


Rename to aws_service_mappings.

dlvenable · 2026-02-23T16:29:32Z

...mon/src/main/java/org/opensearch/dataprepper/plugins/otel/common/OTelSpanDerivationUtil.java

+        final String address;
+        final String port;
+        public AddressPortAttributeKeys(final String str) {
+            this.address = str.split(",")[0];


Split once and re-use the array. Also, add error handling with a useful error message if there are not exactly two elements in the array.

dlvenable · 2026-02-23T16:32:43Z

.../src/main/java/org/opensearch/dataprepper/plugins/otel/common/RemoteOperationAndService.java

+        return remoteService;
+    }
+
+    public boolean isNull() {


This code would be clearer if you return Optional<RemoteOperationAndService> instead of having an isNull method.

An approach to make the call simple would be a static helper like this:

Optional<RemoteOperationAndService> fromNullableFields(final String operation, final String service) { if(operation == null || service == null) return Optional.empty(); return Optional.of(new RemoteOperationAndService(operation, service); }

We can't return empty if one of them is NULL. But we need to know that one of them is null so that we can set it to default value

Maybe the name is little misleading. I will rename it.

Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

…emote operation (#6539) * otel_apm_service_map: Added support for deriving remote service and remote operation Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Addressed review comments Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Addressed review comments Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> * Fixed license header check failures Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> --------- Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> (cherry picked from commit fa41484)

…emote operation (#6539) (#6565) * otel_apm_service_map: Added support for deriving remote service and remote operation * Addressed review comments * Addressed review comments * Fixed license header check failures --------- (cherry picked from commit fa41484) Signed-off-by: Krishna Kondaka <krishkdk@amazon.com> Co-authored-by: Krishna Kondaka <krishkdk@amazon.com>

otel_apm_service_map: Added support for deriving remote service and r…

bb5fc82

…emote operation Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

kkondaka requested review from KarstenSchnitter, dinujoh, dlvenable, engechas, graytaylor0, oeyh, san81, sb2k16 and srikanthjg as code owners February 19, 2026 06:53

dlvenable requested changes Feb 19, 2026

View reviewed changes

vamsimanohar reviewed Feb 19, 2026

View reviewed changes

Addressed review comments

2d9ca24

Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

dlvenable requested changes Feb 23, 2026

View reviewed changes

Addressed review comments

5fc58f6

Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

dlvenable previously approved these changes Feb 24, 2026

View reviewed changes

Fixed license header check failures

6d632b2

Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

kkondaka dismissed dlvenable’s stale review via 6d632b2 February 24, 2026 01:19

dlvenable approved these changes Feb 24, 2026

View reviewed changes

vamsimanohar approved these changes Feb 24, 2026

View reviewed changes

ps48 approved these changes Feb 24, 2026

View reviewed changes

kkondaka merged commit fa41484 into opensearch-project:main Feb 24, 2026
138 of 142 checks passed

kkondaka added the backport 2.14 label Feb 24, 2026

opensearch-trigger-bot bot mentioned this pull request Feb 24, 2026

[Backport 2.14] otel_apm_service_map: Added support for deriving remote service and remote operation #6565

Merged

dlvenable added this to the v2.14 milestone Feb 26, 2026


		package org.opensearch.dataprepper.plugins.otel.common;

		public class RemoteOperationAndService {

		}


		public Map<String, String> getAwsServiceMappingsFromResources() {

Conversation

kkondaka commented Feb 19, 2026

Description

Issues Resolved

Check List

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants