Universal bootdelegation

CHANGELOG.asciidoc

@@ -28,6 +28,10 @@ endif::[]
 
 [float]
 ===== Features
+* Experimental support for runtime attachment now also for OSGi containers, JBoss, and WildFly
+* New mitigation of OSGi bootdelegation errors (`NoClassDefFoundError`).
+  You can remove any `org.osgi.framework.bootdelegation` related configuration.
+  This release also removes the configuration option `boot_delegation_packages`.
 * Overhaul of the `ExecutorService` instrumentation that avoids issues like ``ClassCastException``s - {pull}1206[#1206]
 * Support for `ForJoinPool` and `ScheduledExecutorService` (see <<supported-async-frameworks>>)
 * Support for `ExecutorService#invokeAny` and `ExecutorService#invokeAll`

apm-agent-core/src/main/java/co/elastic/apm/agent/bci/AgentMain.java

@@ -34,8 +34,7 @@
  * This class is loaded by the system classloader,
  * and adds the rest of the agent to the bootstrap class loader search.
  * <p>
- * This is required to instrument Java core classes like {@link Runnable} and to enable boot delegation in OSGi environments.
- * See {@link OsgiBootDelegationEnabler}.
+ * This is required to instrument Java core classes like {@link Runnable}.
  * </p>
  * <p>
  * Note that this relies on the fact that the system classloader is a parent-first classloader and first asks the bootstrap classloader

apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfiguration.java

@@ -482,34 +482,6 @@ public class CoreConfiguration extends ConfigurationOptionProvider {
             "the higher of both thresholds will determine which spans will be discarded.")
         .buildWithDefault(TimeDuration.of("0ms"));
 
-    private final ConfigurationOption<String> appendPackagesToBootDelegationProperty = ConfigurationOption.stringOption()
-        .key("boot_delegation_packages")
-        .tags("added[1.7.0]")
-        .configurationCategory(CORE_CATEGORY)
-        .description("A comma-separated list of packages to be appended to the boot delegation system property. \n" +
-            "If set with an empty string, nothing will be appended to the boot delegation system property.\n" +
-            "Values to set in known environments:\n\n" +
-            "Nexus:\n\n" +
-            "----\n" +
-            "boot_delegation_packages=com.sun.*, javax.transaction, javax.transaction.*, javax.xml.crypto, javax.xml.crypto.*, sun.*," +
-            "co.elastic.apm.agent.*\n" +
-            "----\n\n" +
-            "Pentaho and RedHat JBoss Fuse:\n\n" +
-            "----\n" +
-            "boot_delegation_packages=org.apache.karaf.jaas.boot, org.apache.karaf.jaas.boot.principal, org.apache.karaf.management.boot, " +
-            "sun.*, com.sun.*, javax.transaction, javax.transaction.*, javax.xml.crypto, javax.xml.crypto.*, org.apache.xerces.jaxp.datatype, " +
-            "org.apache.xerces.stax, org.apache.xerces.parsers, org.apache.xerces.jaxp, org.apache.xerces.jaxp.validation, " +
-            "org.apache.xerces.dom, co.elastic.apm.agent.*\n" +
-            "----\n")
-        .buildWithDefault("co.elastic.apm.agent.*");
-
-    private final ConfigurationOption<Boolean> atlassianNewBootDelegation = ConfigurationOption.booleanOption()
-        .key("use_atlassian_new_boot_delegation")
-        .configurationCategory(CORE_CATEGORY)
-        .tags("internal")
-        .description("In new Atlassian OSGi there is a config to append to boot delegation packages instead of overriding the default.")
-        .buildWithDefault(false);
-
     private final ConfigurationOption<Boolean> centralConfig = ConfigurationOption.booleanOption()
         .key("central_config")
         .tags("added[1.8.0]")
@@ -690,21 +662,6 @@ public TimeDuration getTraceMethodsDurationThreshold() {
         return traceMethodsDurationThreshold.get();
     }
 
-    public @Nullable String getPackagesToAppendToBootdelegationProperty() {
-        String value = appendPackagesToBootDelegationProperty.get();
-        if (value != null) {
-            value = value.trim();
-            if (value.isEmpty()) {
-                value = null;
-            }
-        }
-        return value;
-    }
-
-    public boolean useAtlassianNewBootDelegationConfig() {
-        return atlassianNewBootDelegation.get();
-    }
-
     public Map<String, String> getGlobalLabels() {
         return globalLabels.get();
     }

apm-agent-core/src/main/resources/META-INF/services/co.elastic.apm.agent.context.LifecycleListener

@@ -1,5 +1,4 @@
 co.elastic.apm.agent.configuration.StartupInfo
-co.elastic.apm.agent.bci.OsgiBootDelegationEnabler
 co.elastic.apm.agent.bci.MatcherTimerLifecycleListener
 co.elastic.apm.agent.metrics.builtin.JvmMemoryMetrics
 co.elastic.apm.agent.metrics.builtin.SystemMetrics

apm-agent-core/src/test/java/co/elastic/apm/agent/util/VersionUtilsTest.java

@@ -1,3 +1,27 @@
+/*-
+ * #%L
+ * Elastic APM Java agent
+ * %%
+ * Copyright (C) 2018 - 2020 Elastic and contributors
+ * %%
+ * 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.
+ * #L%
+ */
 package co.elastic.apm.agent.util;
 
 import org.assertj.core.api.Assertions;

apm-agent-plugins/apm-bootdelegation-plugin/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-agent-plugins</artifactId>
+        <groupId>co.elastic.apm</groupId>
+        <version>1.17.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-bootdelegation-plugin</artifactId>
+    <name>${project.groupId}:${project.artifactId}</name>
+
+    <properties>
+        <apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
+    </properties>
+
+</project>