Adding exception event to http errors

CHANGELOG.asciidoc

@@ -32,7 +32,7 @@ ${next_release_notes}
 [float]
 ===== Features
 
-* New feature: {pull}000[#000]
+* Adding exception event to failed http responses: {pull}237[#237]
 ////
 
 [[release-notes-0.11.0]]

android-sdk/src/main/java/co/elastic/apm/android/sdk/traces/http/impl/okhttp/OtelOkHttpEventListener.java

@@ -32,6 +32,7 @@
 import co.elastic.apm.android.sdk.traces.http.HttpTraceConfiguration;
 import co.elastic.apm.android.sdk.traces.http.data.HttpRequest;
 import co.elastic.apm.android.sdk.traces.http.impl.okhttp.utils.WrapperSpanCloser;
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
@@ -126,6 +127,10 @@ public void responseHeadersEnd(@NonNull Call call, @NonNull Response response) {
 
  if (isHttpError(code)) {
  span.setStatus(StatusCode.ERROR);
+ span.addEvent(SemanticAttributes.EXCEPTION_EVENT_NAME, Attributes.builder()
+ .put(SemanticAttributes.EXCEPTION_TYPE, String.valueOf(code))
+ .put(SemanticAttributes.EXCEPTION_ESCAPED, false)
+ .put(SemanticAttributes.EXCEPTION_MESSAGE, response.message()).build());
  }
  }
  }

android-test/android-test-common/src/main/java/co/elastic/apm/android/test/common/spans/verifiers/BaseSpanVerifier.java

@@ -3,9 +3,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 
 import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.sdk.trace.data.EventData;
 import io.opentelemetry.sdk.trace.data.SpanData;
 
 @SuppressWarnings("unchecked")
@@ -86,4 +89,23 @@ public T isOfKind(SpanKind kind) {
  assertEquals(kind, span.getKind());
  return (T) this;
  }
+
+ @Override
+ public T hasEvent(String eventName, Attributes attributes) {
+ boolean foundEvent = false;
+
+ for (EventData event : span.getEvents()) {
+ if (event.getName().equals(eventName)) {
+ assertEquals(attributes, event.getAttributes());
+ foundEvent = true;
+ break;
+ }
+ }
+
+ if (!foundEvent) {
+ fail("Event not found");
+ }
+
+ return (T) this;
+ }
 }

android-test/android-test-common/src/main/java/co/elastic/apm/android/test/common/spans/verifiers/SpanVerifier.java

@@ -1,5 +1,6 @@
 package co.elastic.apm.android.test.common.spans.verifiers;
 
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.sdk.trace.data.SpanData;
 
@@ -27,4 +28,6 @@ public interface SpanVerifier<T extends SpanVerifier<?>> {
  T startedAt(long timeInNanoseconds);
 
  T isOfKind(SpanKind kind);
+
+ T hasEvent(String eventName, Attributes attributes);
 }

android-test/app/src/test/java/co/elastic/apm/android/test/network/okhttp/OkHttpSpansTest.java

@@ -29,6 +29,7 @@
 import co.elastic.apm.android.test.testutils.AppWithoutInitializedAgent;
 import co.elastic.apm.android.test.testutils.base.BaseRobolectricTest;
 import co.elastic.apm.android.test.testutils.base.BaseRobolectricTestApplication;
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Scope;
@@ -96,7 +97,10 @@ public void verifyHttpSpanStructure_whenReceivingHttpError() {
  .isOfKind(SpanKind.CLIENT)
  .hasAttribute("url.full", "http://localhost:" + webServer.getPort() + "/")
  .hasAttribute("http.request.method", "GET")
- .hasAttribute("http.response.status_code", 500);
+ .hasAttribute("http.response.status_code", 500)
+ .hasEvent("exception", Attributes.builder().put("exception.type", "500")
+ .put("exception.escaped", false)
+ .put("exception.message", "Server Error").build());
  }
 
  @Test