Issue 1699 extend destination field

apm-agent-api/src/main/java/co/elastic/apm/api/AbstractSpanImpl.java

@@ -155,4 +155,12 @@ public void injectTraceHeaders(HeaderInjector headerInjector) {
     private void doInjectTraceHeaders(MethodHandle addHeader, HeaderInjector headerInjector) {
         // co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation.InjectTraceHeadersInstrumentation
     }
+
+    public void doSetDestinationAddress(@Nullable String address, int port) {
+
+    }
+
+    public void doSetDestinationService(@Nullable String resource) {
+
+    }
 }

apm-agent-api/src/main/java/co/elastic/apm/api/NoopSpan.java

@@ -165,4 +165,16 @@ public Span setOutcome(Outcome outcome) {
     public void injectTraceHeaders(HeaderInjector headerInjector) {
         // noop
     }
+
+    @Nonnull
+    @Override
+    public Span setDestinationAddress(@Nullable String address, int port) {
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    public Span setDestinationService(@Nullable String resource) {
+        return this;
+    }
 }

apm-agent-api/src/main/java/co/elastic/apm/api/NoopTransaction.java

@@ -205,4 +205,16 @@ public Transaction setOutcome(Outcome outcome) {
     public void injectTraceHeaders(HeaderInjector headerInjector) {
         // noop
     }
+
+    @Nonnull
+    @Override
+    public Span setDestinationAddress(@Nullable String address, int port) {
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    public Span setDestinationService(@Nullable String resource) {
+        return this;
+    }
 }

apm-agent-api/src/main/java/co/elastic/apm/api/Span.java

@@ -424,4 +424,9 @@ public interface Span {
      */
     void injectTraceHeaders(HeaderInjector headerInjector);
 
+    @Nonnull
+    Span setDestinationAddress(@Nullable String address, int port);
+
+    @Nonnull
+    Span setDestinationService(@Nullable String resource);
 }

apm-agent-api/src/main/java/co/elastic/apm/api/SpanImpl.java

@@ -25,6 +25,7 @@
 package co.elastic.apm.api;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * If the agent is active, it injects the implementation into this class.
@@ -116,4 +117,18 @@ public Span setOutcome(Outcome outcome) {
         doSetOutcome(outcome);
         return this;
     }
+
+    @Nonnull
+    @Override
+    public Span setDestinationAddress(@Nullable String address, int port) {
+        doSetDestinationAddress(address, port);
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    public Span setDestinationService(@Nullable String resource) {
+        doSetDestinationService(resource);
+        return this;
+    }
 }

apm-agent-api/src/main/java/co/elastic/apm/api/TransactionImpl.java

@@ -25,6 +25,7 @@
 package co.elastic.apm.api;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * If the agent is active, it injects the implementation from
@@ -164,4 +165,24 @@ public Transaction setOutcome(Outcome outcome) {
         doSetOutcome(outcome);
         return this;
     }
+
+    /**
+     * @deprecated - used only for {@link co.elastic.apm.api.Span}
+     */
+    @Nonnull
+    @Override
+    @Deprecated
+    public Transaction setDestinationAddress(@Nullable String address, int port) {
+        return this;
+    }
+
+    /**
+     * @deprecated - used only for {@link co.elastic.apm.api.Span}
+     */
+    @Nonnull
+    @Override
+    @Deprecated
+    public Transaction setDestinationService(@Nullable String resource) {
+        return this;
+    }
 }

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Destination.java

@@ -192,16 +192,23 @@ public static class Service implements Recyclable {
          * Eventually, we may decide to actively fetch a cluster name or similar and we could use that to detect "sameness".
          * For now, for HTTP we use scheme, host, and non-default port. For anything else, we use {@code span.subtype}
          * (for example- postgresql, elasticsearch).
+         *
+         * @deprecated will be removed
          */
         private final StringBuilder name = new StringBuilder();
 
         /**
          * For displaying icons or similar. Currently, this should be equal to the {@code span.type}.
+         *
+         * @deprecated will be removed
          */
         @Nullable
         private String type;
 
         public Service withResource(String resource) {
+            if (this.resource.length() > 0) {
+                this.resource.setLength(0);
+            }
             this.resource.append(resource);
             return this;
         }
@@ -210,27 +217,29 @@ public StringBuilder getResource() {
             return resource;
         }
 
+        @Deprecated
         public Service withName(String name) {
-            this.name.append(name);
             return this;
         }
 
+        @Deprecated
         public StringBuilder getName() {
             return name;
         }
 
-        public Service withType(String type) {
-            this.type = type;
+        @Deprecated
+        public Service withType(@Nullable String type) {
             return this;
         }
 
         @Nullable
+        @Deprecated
         public String getType() {
             return type;
         }
 
         public boolean hasContent() {
-            return resource.length() > 0 || name.length() > 0 || type != null;
+            return resource.length() > 0;
         }
 
         @Override

apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java

@@ -857,25 +857,31 @@ private void serializeDestination(Destination destination) {
         if (destination.hasContent()) {
             writeFieldName("destination");
             jw.writeByte(OBJECT_START);
+            boolean isNeedAddComma = false;
             if (destination.getAddress().length() > 0) {
                 writeField("address", destination.getAddress());
+                isNeedAddComma = true;
             }
             if (destination.getPort() > 0) {
-                writeField("port", destination.getPort());
+                writeLastField("port", destination.getPort());
+                isNeedAddComma = true;
             }
-            serializeService(destination.getService());
+            serializeService(isNeedAddComma, destination.getService());
             jw.writeByte(OBJECT_END);
             jw.writeByte(COMMA);
         }
     }
 
-    private void serializeService(Destination.Service service) {
+    private void serializeService(boolean isNeedAddComma, Destination.Service service) {
         if (service.hasContent()) {
+            if (isNeedAddComma) {
+                jw.writeByte(COMMA);
+            }
             writeFieldName("service");
             jw.writeByte(OBJECT_START);
-            writeField("name", service.getName());
+            writeEmptyField("name");
             writeField("resource", service.getResource());
-            writeLastField("type", service.getType());
+            writeLastEmptyField("type");
             jw.writeByte(OBJECT_END);
         }
     }
@@ -1238,6 +1244,17 @@ private void serializeUser(final User user) {
         jw.writeByte(OBJECT_END);
     }
 
+    void writeEmptyField(final String fieldName) {
+        writeFieldName(fieldName);
+        writeStringValue("");
+        jw.writeByte(COMMA);
+    }
+
+    void writeLastEmptyField(final String fieldName) {
+        writeFieldName(fieldName);
+        writeStringValue("");
+    }
+
     void writeField(final String fieldName, final StringBuilder value) {
         if (value.length() > 0) {
             writeFieldName(fieldName);

apm-agent-core/src/test/java/co/elastic/apm/agent/report/serialize/DslJsonSerializerTest.java

@@ -355,9 +355,7 @@ void testSpanDestinationContextSerialization() {
         Span span = new Span(MockTracer.create());
         span.getContext().getDestination().withAddress("whatever.com").withPort(80)
             .getService()
-            .withName("http://whatever.com")
-            .withResource("whatever.com:80")
-            .withType("external");
+            .withResource("whatever.com:80");
 
         JsonNode spanJson = readJsonString(serializer.toJsonString(span));
         JsonNode context = spanJson.get("context");
@@ -367,9 +365,9 @@ void testSpanDestinationContextSerialization() {
         assertThat(80).isEqualTo(destination.get("port").intValue());
         JsonNode service = destination.get("service");
         assertThat(service).isNotNull();
-        assertThat("http://whatever.com").isEqualTo(service.get("name").textValue());
         assertThat("whatever.com:80").isEqualTo(service.get("resource").textValue());
-        assertThat("external").isEqualTo(service.get("type").textValue());
+        assertThat(service.get("name").textValue()).isEqualTo("");
+        assertThat(service.get("type").textValue()).isEqualTo("");
     }
 
     @Test

apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/AbstractSpanInstrumentation.java

@@ -24,6 +24,9 @@
  */
 package co.elastic.apm.agent.pluginapi;
 
+import co.elastic.apm.agent.impl.context.AbstractContext;
+import co.elastic.apm.agent.impl.context.Destination;
+import co.elastic.apm.agent.impl.context.SpanContext;
 import co.elastic.apm.agent.impl.transaction.AbstractSpan;
 import co.elastic.apm.agent.impl.transaction.Outcome;
 import co.elastic.apm.agent.impl.transaction.Span;
@@ -369,4 +372,47 @@ public static void injectTraceHeaders(@Advice.FieldValue(value = "span", typing
             }
         }
     }
+
+    public static class SetDestinationAddressInstrumentation extends AbstractSpanInstrumentation {
+
+        public SetDestinationAddressInstrumentation() {
+            super(named("doSetDestinationAddress"));
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+        public static void setDestinationAddress(@Advice.FieldValue(value = "span", typing = Assigner.Typing.DYNAMIC) Object context,
+                                                 @Advice.Argument(0) @Nullable String address,
+                                                 @Advice.Argument(1) int port) {
+            if (context instanceof Span) {
+                SpanContext spanContext = ((Span) context).getContext();
+                if (address != null && port > 0 && !address.isBlank()) {
+                    spanContext.getDestination().withAddress(address).withPort(port);
+                }
+            }
+        }
+    }
+
+    public static class SetDestinationServiceInstrumentation extends AbstractSpanInstrumentation {
+
+        public SetDestinationServiceInstrumentation() {
+            super(named("doSetDestinationService"));
+        }
+
+        @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+        public static void setDestinationService(@Advice.FieldValue(value = "span", typing = Assigner.Typing.DYNAMIC) Object context,
+                                                 @Advice.Argument(0) @Nullable String resource) {
+            if (context instanceof Span) {
+                SpanContext spanContext = ((Span) context).getContext();
+                boolean isEmptyResource = resource == null || resource.isEmpty();
+                if (isEmptyResource) {
+                    resource = "";
+                }
+                Destination.Service service = spanContext.getDestination().getService();
+                // in case when is already auto detected, and with non-empty values - we override
+                if (!service.hasContent() || service.hasContent() && !isEmptyResource) {
+                    service.withResource(resource);
+                }
+            }
+        }
+    }
 }

apm-agent-plugins/apm-api-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation

@@ -24,6 +24,8 @@ co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation$AddBooleanLabelInstru
 co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation$ActivateInstrumentation
 co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation$IsSampledInstrumentation
 co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation$InjectTraceHeadersInstrumentation
+co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation$SetDestinationAddressInstrumentation
+co.elastic.apm.agent.pluginapi.AbstractSpanInstrumentation$SetDestinationServiceInstrumentation
 co.elastic.apm.agent.pluginapi.CaptureExceptionInstrumentation
 co.elastic.apm.agent.pluginapi.ApiScopeInstrumentation
 co.elastic.apm.agent.pluginapi.CaptureTransactionInstrumentation