From b26e6808b35066b1549444ff42d6dabf88a35eda Mon Sep 17 00:00:00 2001
From: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co>
Date: Fri, 29 Sep 2023 21:35:04 +0200
Subject: [PATCH] Update the elastic-apm-agent version (#100064)

The latest version contains a fix to allow sending metrics to APM server. also adds a apm agent jvm options
"enable_experimental_instrumentations", "true"
which is required to enable the otel-metrics-instrumentation.

relates https://github.com/elastic/elasticsearch/pull/99832
---
 .../org/elasticsearch/server/cli/APMJvmOptions.java    |  3 ++-
 docs/changelog/100064.yaml                             |  5 +++++
 gradle/verification-metadata.xml                       | 10 +++++-----
 modules/apm/build.gradle                               |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 docs/changelog/100064.yaml

diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java
index 6d832dfff2758..e6dabb471bed7 100644
--- a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java
+++ b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java
@@ -53,7 +53,8 @@ class APMJvmOptions {
         "log_file", "_AGENT_HOME_/../../logs/apm.log",
 
         // ES does not use auto-instrumentation.
-        "instrument", "false"
+        "instrument", "false",
+        "enable_experimental_instrumentations", "true"
         );
 
     /**
diff --git a/docs/changelog/100064.yaml b/docs/changelog/100064.yaml
new file mode 100644
index 0000000000000..f595b7e8e0705
--- /dev/null
+++ b/docs/changelog/100064.yaml
@@ -0,0 +1,5 @@
+pr: 100064
+summary: Update the elastic-apm-agent version
+area: Infra/Core
+type: enhancement
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4ebb0c46159a3..7209c4478d159 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -69,11 +69,11 @@
             <sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="co.elastic.apm" name="elastic-apm-agent" version="1.36.0">
-         <artifact name="elastic-apm-agent-1.36.0.jar">
-            <sha256 value="3be90268557494f88fe252caf6358d4107aa9349852b8704b1e0ff4831cb74d6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
+       <component group="co.elastic.apm" name="elastic-apm-agent" version="1.43.0">
+           <artifact name="elastic-apm-agent-1.43.0.jar">
+               <sha256 value="a9910a9589b2cceb9a41936e297bb41c6aeef5496f7ba26017ba489291aa4aa8" origin="Generated by Gradle"/>
+           </artifact>
+       </component>
       <component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0">
          <artifact name="ecs-logging-core-1.2.0.jar">
             <sha256 value="0d6318af29848ea588b1c244834e3e762315c68de2bcfc9f1adf3f0633d22d37" origin="Generated by Gradle"/>
diff --git a/modules/apm/build.gradle b/modules/apm/build.gradle
index c8619c97d1068..c9002a71bf746 100644
--- a/modules/apm/build.gradle
+++ b/modules/apm/build.gradle
@@ -18,7 +18,7 @@ dependencies {
   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.36.0"
+  runtimeOnly    "co.elastic.apm:elastic-apm-agent:1.43.0"
 }
 
 tasks.named("dependencyLicenses").configure {