Add doAddStringLabel method

felixbarny · Feb 28, 2019 · 65e229e · 65e229e
1 parent bb8f094
commit 65e229e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/AbstractSpanImpl.java b/apm-agent-api/src/main/java/co/elastic/apm/api/AbstractSpanImpl.java
@@ -74,9 +74,14 @@ private void doSetTypes(Object span, String type, @Nullable String subtype, @Nul
         // co.elastic.apm.agent.plugin.api.AbstractSpanInstrumentation$SetTypesInstrumentation.doSetType
     }
 
-    // not renaming to doAddStringLabel so that API and agent versions don't have to match
+    // keep for backwards compatibility reasons
+    @Deprecated
     void doAddTag(String key, String value) {
-        // co.elastic.apm.agent.plugin.api.AbstractSpanInstrumentation$AddTagInstrumentation
+        // co.elastic.apm.agent.plugin.api.AbstractSpanInstrumentation$AddStringLabelInstrumentation
+    }
+
+    void doAddStringLabel(String key, String value) {
+        // co.elastic.apm.agent.plugin.api.AbstractSpanInstrumentation$AddStringLabelInstrumentation
     }
 
     void doAddNumberLabel(String key, Number value) {

diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/SpanImpl.java b/apm-agent-api/src/main/java/co/elastic/apm/api/SpanImpl.java
@@ -57,7 +57,7 @@ public Span addTag(String key, String value) {
     @Nonnull
     @Override
     public Span addLabel(String key, String value) {
-        doAddTag(key, value);
+        doAddStringLabel(key, value);
         return this;
     }
 

diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/TransactionImpl.java b/apm-agent-api/src/main/java/co/elastic/apm/api/TransactionImpl.java
@@ -59,7 +59,7 @@ public Transaction addTag(String key, String value) {
     @Nonnull
     @Override
     public Transaction addLabel(String key, String value) {
-        doAddTag(key, value);
+        doAddStringLabel(key, value);
         return this;
     }
 

diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Id.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Id.java
@@ -95,7 +95,8 @@ public void resetState() {
 
     public void copyFrom(Id other) {
         System.arraycopy(other.data, 0, data, 0, data.length);
-        onMutation(other.empty);
+        this.cachedStringRepresentation = other.cachedStringRepresentation;
+        this.empty = other.empty;
     }
 
     private void onMutation() {

diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java
@@ -106,7 +106,7 @@ public void verifyErrorSchema(JsonNode jsonNode) {
     private void verifyJsonSchema(JsonSchema schema, JsonNode jsonNode) {
         if (verifyJsonSchema) {
             Set<ValidationMessage> errors = schema.validate(jsonNode);
-            assertThat(errors).isEmpty();
+            assertThat(errors).withFailMessage("%s\n%s", errors, jsonNode).isEmpty();
         }
     }
 

diff --git a/...api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/AbstractSpanInstrumentation.java b/...api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/AbstractSpanInstrumentation.java
@@ -175,7 +175,7 @@ public static void getTraceId(@Advice.FieldValue(value = "span", typing = Assign
 
     public static class AddStringLabelInstrumentation extends AbstractSpanInstrumentation {
         public AddStringLabelInstrumentation() {
-            super(named("doAddTag"));
+            super(named("doAddTag").or(named("doAddStringLabel")));
         }
 
         @VisibleForAdvice