Skip to content

remove transaction.status from otel transactions #2660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SylvainJuge merged 4 commits into from
Jun 2, 2022
Merged

remove transaction.status from otel transactions #2660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a7a0d9
remove transaction.status from otel transactions
SylvainJuge Jun 2, 2022
a3fee15
Update apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/s…
SylvainJuge Jun 2, 2022
382c243
slightly better wording
SylvainJuge Jun 2, 2022
e19296c
update changelog
SylvainJuge Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions apm-agent-core/src/test/resources/specs/otel_bridge.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Feature: OpenTelemetry bridge
And OTel span ends
Then Elastic bridged object is a transaction
Then Elastic bridged transaction outcome is "<outcome>"
Then Elastic bridged transaction result is not set
Examples:
| status | outcome |
| unset | unknown |
Expand Down
11 changes: 0 additions & 11 deletions ...m-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/sdk/OTelSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 5 additions & 0 deletions ...pentelemetry/apm-opentelemetry-plugin/src/test/java/specs/OTelBridgeStepsDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,11 @@ public void bridgedObjectOutcome(String ignoredContextType, String outcome) {

}

@Then("Elastic bridged transaction result is not set")
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();
Expand Down