From 1a7a0d945d7c65dbe8609576dc078bcd36fce17c Mon Sep 17 00:00:00 2001 From: Sylvain Juge Date: Thu, 2 Jun 2022 16:31:07 +0200 Subject: [PATCH 1/4] remove transaction.status from otel transactions --- .../src/test/resources/specs/otel_bridge.feature | 1 + .../elastic/apm/agent/opentelemetry/sdk/OTelSpan.java | 11 ----------- .../test/java/specs/OTelBridgeStepsDefinitions.java | 5 +++++ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/apm-agent-core/src/test/resources/specs/otel_bridge.feature b/apm-agent-core/src/test/resources/specs/otel_bridge.feature index f19d8b9f77..634143bae2 100644 --- a/apm-agent-core/src/test/resources/specs/otel_bridge.feature +++ b/apm-agent-core/src/test/resources/specs/otel_bridge.feature @@ -70,6 +70,7 @@ Feature: OpenTelemetry bridge And OTel span ends Then Elastic bridged object is a transaction Then Elastic bridged transaction outcome is "" + Then Elastic bridged transaction result is null Examples: | status | outcome | | unset | unknown | diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/sdk/OTelSpan.java b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/sdk/OTelSpan.java index b664ea2143..1e5206ff27 100644 --- a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/sdk/OTelSpan.java +++ b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/sdk/OTelSpan.java @@ -88,17 +88,6 @@ public Span addEvent(String name, Attributes attributes, long timestamp, TimeUni @Override public Span setStatus(StatusCode statusCode, String description) { - if (span instanceof Transaction) { - Transaction t = (Transaction) span; - switch (statusCode) { - case OK: - t.withResultIfUnset("OK"); - break; - case ERROR: - t.withResultIfUnset("Error"); - break; - } - } switch (statusCode) { case ERROR: span.withUserOutcome(Outcome.FAILURE); diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java index 0abf5923b9..acbf8906db 100644 --- a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java +++ b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java @@ -308,6 +308,11 @@ public void bridgedObjectOutcome(String ignoredContextType, String outcome) { } + @Then("Elastic bridged transaction result is null") + public void bridgedTransactionResultNull(){ + assertThat(getBridgedTransaction().getResult()).isNull(); + } + @Then("Elastic bridged span service target type is {string} and name is {string}") public void bridgedSpanTargetServiceType(String type, String name) { ServiceTarget serviceTarget = getBridgedSpan().getContext().getServiceTarget(); From a3fee1586a692197991009387efded42d3cff77d Mon Sep 17 00:00:00 2001 From: SylvainJuge Date: Thu, 2 Jun 2022 16:45:35 +0200 Subject: [PATCH 2/4] Update apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java Co-authored-by: Felix Barnsteiner --- .../src/test/java/specs/OTelBridgeStepsDefinitions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java index acbf8906db..2b4c316626 100644 --- a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java +++ b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java @@ -309,7 +309,7 @@ public void bridgedObjectOutcome(String ignoredContextType, String outcome) { } @Then("Elastic bridged transaction result is null") - public void bridgedTransactionResultNull(){ + public void bridgedTransactionResultNull() { assertThat(getBridgedTransaction().getResult()).isNull(); } From 382c243eeebb38e2679db87cfaa12f40cb523360 Mon Sep 17 00:00:00 2001 From: Sylvain Juge Date: Thu, 2 Jun 2022 17:01:40 +0200 Subject: [PATCH 3/4] slightly better wording --- apm-agent-core/src/test/resources/specs/otel_bridge.feature | 2 +- .../src/test/java/specs/OTelBridgeStepsDefinitions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apm-agent-core/src/test/resources/specs/otel_bridge.feature b/apm-agent-core/src/test/resources/specs/otel_bridge.feature index 634143bae2..901d93154e 100644 --- a/apm-agent-core/src/test/resources/specs/otel_bridge.feature +++ b/apm-agent-core/src/test/resources/specs/otel_bridge.feature @@ -70,7 +70,7 @@ Feature: OpenTelemetry bridge And OTel span ends Then Elastic bridged object is a transaction Then Elastic bridged transaction outcome is "" - Then Elastic bridged transaction result is null + Then Elastic bridged transaction result is not set Examples: | status | outcome | | unset | unknown | diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java index 2b4c316626..2a43d35e30 100644 --- a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java +++ b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java @@ -308,7 +308,7 @@ public void bridgedObjectOutcome(String ignoredContextType, String outcome) { } - @Then("Elastic bridged transaction result is null") + @Then("Elastic bridged transaction result is not set") public void bridgedTransactionResultNull() { assertThat(getBridgedTransaction().getResult()).isNull(); } From e19296cf55bd330c22e0426072f99c69896d3128 Mon Sep 17 00:00:00 2001 From: Sylvain Juge Date: Thu, 2 Jun 2022 17:32:53 +0200 Subject: [PATCH 4/4] update changelog --- CHANGELOG.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 6abc9d3d0b..a499f47f4e 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -38,7 +38,8 @@ the agent will now include the database name in the dependency, thus `mysql/my-d [float] ===== Bug fixes -* Fix missing attributes in bridged OTel transactions {pull}2657[#2657] +* Fix missing attributes in bridged OTel transactions - {pull}2657[#2657] +* Fix `transaction.result` with bridged OTel transactions - {pull}2660[#2660] [[release-notes-1.x]] === Java Agent version 1.x