Merge remote-tracking branch 'upstream/master' into google-http-client

Author: tobiasstadler

CHANGELOG.asciidoc

@@ -20,20 +20,39 @@ endif::[]
 
 === Unreleased
 
-[[release-notes-1.27.1]]
-==== 1.27.1 - YYYY/MM/DD
+[[release-notes-1.28.0]]
+==== 1.28.0 - YYYY/MM/DD
+
+[float]
+===== Breaking changes
 
 [float]
 ===== Features
-* When the MANIFEST.MF of the main jar contains the Implementation-Title attribute, it is used as the default service name - {pull}1921[#1921]
 
 [float]
 ===== Bug fixes
-* Fixing missing Micrometer metrics in Spring boot due to premature initialization - {pull}2255[#2255]
 
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
+[[release-notes-1.27.1]]
+==== 1.27.1 - 2021/11/30
+
+[float]
+===== Features
+* Add support to Jakarta EE for JSF - {pull}2254[#2254]
+
+[float]
+===== Features
+* When the MANIFEST.MF of the main jar contains the Implementation-Title attribute, it is used as the default service name - {pull}1921[#1921]
+
+[float]
+===== Bug fixes
+* Fixing missing Micrometer metrics in Spring boot due to premature initialization - {pull}2255[#2255]
+* Fixing hostname trimming of FQDN too aggressive - {pull}2286[#2286]
+* Fixing agent `unknown` version - {pull}2289[#2289]
+* Improve runtime attach configuration reliability - {pull}2283[#2283]
+
 [[release-notes-1.27.0]]
 ==== 1.27.0 - 2021/11/15
 

apm-agent-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.27.1-SNAPSHOT</version>
+        <version>1.27.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-api</artifactId>

apm-agent-attach-cli/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.27.1-SNAPSHOT</version>
+        <version>1.27.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-attach-cli/src/test/java/co/elastic/apm/attach/ElasticApmAttacherTest.java

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.27.1-SNAPSHOT</version>
+        <version>1.27.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-attach</artifactId>

apm-agent-attach/pom.xml

@@ -21,8 +21,8 @@
 import co.elastic.apm.agent.common.util.ResourceExtractionUtil;
 import net.bytebuddy.agent.ByteBuddyAgent;
 
+import javax.annotation.Nullable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,7 +55,7 @@ public class ElasticApmAttacher {
      * @throws IllegalStateException if there was a problem while attaching the agent to this VM
      */
     public static void attach() {
-        attach(loadProperties("elasticapm.properties"));
+        attach(loadPropertiesFromClasspath("elasticapm.properties"));
     }
 
     /**
@@ -69,10 +69,10 @@ public static void attach() {
      * @since 1.11.0
      */
     public static void attach(String propertiesLocation) {
-        attach(loadProperties(propertiesLocation));
+        attach(loadPropertiesFromClasspath(propertiesLocation));
     }
 
-    private static Map<String, String> loadProperties(String propertiesLocation) {
+    private static Map<String, String> loadPropertiesFromClasspath(String propertiesLocation) {
         Map<String, String> propertyMap = new HashMap<>();
         final Properties props = new Properties();
         try (InputStream resourceStream = ElasticApmAttacher.class.getClassLoader().getResourceAsStream(propertiesLocation)) {
@@ -105,24 +105,21 @@ public static void attach(Map<String, String> configuration) {
         attach(ByteBuddyAgent.ProcessProvider.ForCurrentVm.INSTANCE.resolve(), configuration);
     }
 
-    static File createTempProperties(Map<String, String> configuration) {
+    /**
+     * Store configuration to a temporary file
+     *
+     * @param configuration agent configuration
+     * @param folder        temporary folder, use {@literal null} to use default
+     * @return created file if any, {@literal null} if none was created
+     */
+    static File createTempProperties(Map<String, String> configuration, @Nullable File folder) {
         File tempFile = null;
         if (!configuration.isEmpty()) {
             Properties properties = new Properties();
             properties.putAll(configuration);
 
-            // when an external configuration file is used, we have to load it last to give it higher priority
-            String externalConfig = configuration.get("config_file");
-            if (null != externalConfig) {
-                try (FileInputStream stream = new FileInputStream(externalConfig)) {
-                    properties.load(stream);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
             try {
-                tempFile = File.createTempFile("elstcapm", ".tmp");
+                tempFile = File.createTempFile("elstcapm", ".tmp", folder);
                 try (FileOutputStream outputStream = new FileOutputStream(tempFile)) {
                     properties.store(outputStream, null);
                 }
@@ -148,10 +145,10 @@ public static void attach(String pid, Map<String, String> configuration) {
      *
      * @param pid           the PID of the JVM the agent should be attached on
      * @param configuration the agent configuration
-     * @param agentJarFile
+     * @param agentJarFile  the agent jar file
      */
     public static void attach(String pid, Map<String, String> configuration, File agentJarFile) {
-        File tempFile = createTempProperties(configuration);
+        File tempFile = createTempProperties(configuration, null);
         String agentArgs = tempFile == null ? null : TEMP_PROPERTIES_FILE_KEY + "=" + tempFile.getAbsolutePath();
 
         ByteBuddyAgent.attach(agentJarFile, pid, agentArgs, ElasticAttachmentProvider.get());

apm-agent-attach/src/main/java/co/elastic/apm/attach/ElasticApmAttacher.java

@@ -0,0 +1,67 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package co.elastic.apm.attach;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ElasticApmAttacherTest {
+
+    @Test
+    void testCreateTempProperties(@TempDir File tmp) throws Exception {
+        File tempProperties = ElasticApmAttacher.createTempProperties(Map.of("foo", "bär"), tmp);
+        assertThat(tempProperties).isNotNull();
+
+        assertThat(tempProperties.getParentFile())
+            .describedAs("property files should be created at root of tmp folder")
+            .isEqualTo(tmp);
+
+        Properties properties = readProperties(tempProperties);
+        assertThat(properties)
+            .hasSize(1)
+            .containsEntry("foo", "bär");
+    }
+
+    @Test
+    void testCreateEmptyConfigDoesNotCreateFile(@TempDir File tmp) {
+        File tempProperties = ElasticApmAttacher.createTempProperties(Map.of(), tmp);
+        assertThat(tempProperties).isNull();
+        assertThat(tmp.listFiles())
+            .describedAs("no file should be created in temp folder")
+            .isEmpty();
+    }
+
+    private Properties readProperties(File propertyFile) throws IOException {
+        Properties properties = new Properties();
+        try (FileReader fileReader = new FileReader(propertyFile)) {
+            properties.load(fileReader);
+        }
+        return properties;
+    }
+
+
+}

apm-agent-attach/src/test/java/co/elastic/apm/attach/ElasticApmAttacherTest.java

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.27.1-SNAPSHOT</version>
+        <version>1.27.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-benchmarks</artifactId>

apm-agent-benchmarks/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.27.1-SNAPSHOT</version>
+        <version>1.27.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-cached-lookup-key/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.27.1-SNAPSHOT</version>
+        <version>1.27.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>