From 763079763688468587d0beb8733e99d4fe44c40b Mon Sep 17 00:00:00 2001
From: Rory Hunter <roryhunter2@gmail.com>
Date: Wed, 17 Aug 2022 21:35:13 +0100
Subject: [PATCH 1/5] Upgrade OpenTelemetry API and remove workaround

Closes #89414. Remove the workaround from #89135 that addresed #89107,
and instead upgrade the OpenTelemetry API, which contains a fix for the
underlying issue.
---
 modules/apm/build.gradle                      |  8 +++++---
 .../elasticsearch/tracing/apm/APMTracer.java  | 20 +++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/apm/build.gradle b/modules/apm/build.gradle
index 6bb1c544d096e..2b79dfe4b1572 100644
--- a/modules/apm/build.gradle
+++ b/modules/apm/build.gradle
@@ -12,10 +12,12 @@ esplugin {
   classname 'org.elasticsearch.tracing.apm.APM'
 }
 
+def otelVersion = '1.17.0'
+
 dependencies {
-  implementation "io.opentelemetry:opentelemetry-api:1.15.0"
-  implementation "io.opentelemetry:opentelemetry-context:1.15.0"
-  implementation "io.opentelemetry:opentelemetry-semconv:1.15.0-alpha"
+  implementation "io.opentelemetry:opentelemetry-api:${otelVersion}"
+  implementation "io.opentelemetry:opentelemetry-context:${otelVersion}"
+  implementation "io.opentelemetry:opentelemetry-semconv:${otelVersion}-alpha"
   runtimeOnly    "co.elastic.apm:elastic-apm-agent:1.33.0"
 }
 
diff --git a/modules/apm/src/main/java/org/elasticsearch/tracing/apm/APMTracer.java b/modules/apm/src/main/java/org/elasticsearch/tracing/apm/APMTracer.java
index a5d43bb8a6672..d1d7ce113b344 100644
--- a/modules/apm/src/main/java/org/elasticsearch/tracing/apm/APMTracer.java
+++ b/modules/apm/src/main/java/org/elasticsearch/tracing/apm/APMTracer.java
@@ -286,7 +286,7 @@ private void setSpanAttributes(ThreadContext threadContext, @Nullable Map<String
 
     @Override
     public void addError(String spanId, Throwable throwable) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.get(spanId));
+        final var span = Span.fromContextOrNull(spans.get(spanId));
         if (span != null) {
             span.recordException(throwable);
         }
@@ -294,7 +294,7 @@ public void addError(String spanId, Throwable throwable) {
 
     @Override
     public void setAttribute(String spanId, String key, boolean value) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.get(spanId));
+        final var span = Span.fromContextOrNull(spans.get(spanId));
         if (span != null) {
             span.setAttribute(key, value);
         }
@@ -302,7 +302,7 @@ public void setAttribute(String spanId, String key, boolean value) {
 
     @Override
     public void setAttribute(String spanId, String key, double value) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.get(spanId));
+        final var span = Span.fromContextOrNull(spans.get(spanId));
         if (span != null) {
             span.setAttribute(key, value);
         }
@@ -310,7 +310,7 @@ public void setAttribute(String spanId, String key, double value) {
 
     @Override
     public void setAttribute(String spanId, String key, long value) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.get(spanId));
+        final var span = Span.fromContextOrNull(spans.get(spanId));
         if (span != null) {
             span.setAttribute(key, value);
         }
@@ -318,7 +318,7 @@ public void setAttribute(String spanId, String key, long value) {
 
     @Override
     public void setAttribute(String spanId, String key, String value) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.get(spanId));
+        final var span = Span.fromContextOrNull(spans.get(spanId));
         if (span != null) {
             span.setAttribute(key, value);
         }
@@ -326,7 +326,7 @@ public void setAttribute(String spanId, String key, String value) {
 
     @Override
     public void stopTrace(String spanId) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.remove(spanId));
+        final var span = Span.fromContextOrNull(spans.remove(spanId));
         if (span != null) {
             logger.trace("Finishing trace [{}]", spanId);
             span.end();
@@ -335,18 +335,12 @@ public void stopTrace(String spanId) {
 
     @Override
     public void addEvent(String spanId, String eventName) {
-        final var span = spanFromContextOrNullWithoutLogging(spans.get(spanId));
+        final var span = Span.fromContextOrNull(spans.get(spanId));
         if (span != null) {
             span.addEvent(eventName);
         }
     }
 
-    private static Span spanFromContextOrNullWithoutLogging(Context context) {
-        // Span.fromContextOrNull(null) is super-expensive today, see https://github.com/elastic/elasticsearch/issues/89107
-        // and https://github.com/open-telemetry/opentelemetry-java/pull/4663
-        return context == null ? null : Span.fromContextOrNull(context);
-    }
-
     private static class MapKeyGetter implements TextMapGetter<Map<String, String>> {
 
         @Override

From 5a44a5ad71decdcc34eda86f0a3fe81bcb145a97 Mon Sep 17 00:00:00 2001
From: Rory Hunter <pugnascotia@users.noreply.github.com>
Date: Wed, 17 Aug 2022 21:37:33 +0100
Subject: [PATCH 2/5] Update docs/changelog/89438.yaml

---
 docs/changelog/89438.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 docs/changelog/89438.yaml

diff --git a/docs/changelog/89438.yaml b/docs/changelog/89438.yaml
new file mode 100644
index 0000000000000..48f4779606999
--- /dev/null
+++ b/docs/changelog/89438.yaml
@@ -0,0 +1,6 @@
+pr: 89438
+summary: Upgrade `OpenTelemetry` API and remove workaround
+area: Infra/Core
+type: upgrade
+issues:
+ - 89414

From 1a62af44e935bebd2ac87ec1ffd8cafdfcc94993 Mon Sep 17 00:00:00 2001
From: Rory Hunter <pugnascotia@users.noreply.github.com>
Date: Wed, 17 Aug 2022 21:49:42 +0100
Subject: [PATCH 3/5] Update 89438.yaml

---
 docs/changelog/89438.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog/89438.yaml b/docs/changelog/89438.yaml
index 48f4779606999..503b2f9a96d9e 100644
--- a/docs/changelog/89438.yaml
+++ b/docs/changelog/89438.yaml
@@ -1,5 +1,5 @@
 pr: 89438
-summary: Upgrade `OpenTelemetry` API and remove workaround
+summary: Upgrade OpenTelemetry API to 1.17.0
 area: Infra/Core
 type: upgrade
 issues:

From b5e03db79be974b4c668a83868ad67d72ca14fe1 Mon Sep 17 00:00:00 2001
From: Rory Hunter <roryhunter2@gmail.com>
Date: Wed, 17 Aug 2022 21:50:39 +0100
Subject: [PATCH 4/5] Update gradle/verification-metadata.xml

---
 gradle/verification-metadata.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e6eae1a422579..ab4c1b120cfd6 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1254,19 +1254,19 @@
             <sha256 value="5432d2e9a1bdc8a0e835c6bce52b9d767fbf688cc8892432cff97c3389894b46" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.opentelemetry" name="opentelemetry-api" version="1.15.0">
-         <artifact name="opentelemetry-api-1.15.0.jar">
-            <sha256 value="765999a64656f71c5ae22ba5942993f117af0ee277ef3f08d6e90dc765a3ed57" origin="Generated by Gradle"/>
+      <component group="io.opentelemetry" name="opentelemetry-api" version="1.17.0">
+         <artifact name="opentelemetry-api-1.17.0.jar">
+            <sha256 value="dce58a21caef0c6be082ce5ec86ad75f3017744a029a454e068871c110ae029c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.opentelemetry" name="opentelemetry-context" version="1.15.0">
-         <artifact name="opentelemetry-context-1.15.0.jar">
-            <sha256 value="fa47bc74477de40b6654454f33819fc619389d1b9bdb914bf78eea36d13998c9" origin="Generated by Gradle"/>
+      <component group="io.opentelemetry" name="opentelemetry-context" version="1.17.0">
+         <artifact name="opentelemetry-context-1.17.0.jar">
+            <sha256 value="ac5b7a7bda673b08d62d4dafe23a105ec4a7d0b7a967cda5597dcca994988227" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.opentelemetry" name="opentelemetry-semconv" version="1.15.0-alpha">
-         <artifact name="opentelemetry-semconv-1.15.0-alpha.jar">
-            <sha256 value="a9c5d6178299f82325da14334e08b7926e9525ed9aaca6323ce83786913ba369" origin="Generated by Gradle"/>
+      <component group="io.opentelemetry" name="opentelemetry-semconv" version="1.17.0-alpha">
+         <artifact name="opentelemetry-semconv-1.17.0-alpha.jar">
+            <sha256 value="272f310e8c3e9adad07a2b8910a520ce5c58d1e209661d57b5bd30e8b1614402" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.ous" name="jtoml" version="2.0.0">

From bb9db08c8fe3f3054981cc85e11ecefcb7270548 Mon Sep 17 00:00:00 2001
From: Rory Hunter <pugnascotia@users.noreply.github.com>
Date: Thu, 18 Aug 2022 14:00:27 +0100
Subject: [PATCH 5/5] Delete docs/changelog/89438.yaml

---
 docs/changelog/89438.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 docs/changelog/89438.yaml

diff --git a/docs/changelog/89438.yaml b/docs/changelog/89438.yaml
deleted file mode 100644
index 503b2f9a96d9e..0000000000000
--- a/docs/changelog/89438.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-pr: 89438
-summary: Upgrade OpenTelemetry API to 1.17.0
-area: Infra/Core
-type: upgrade
-issues:
- - 89414