Commit 3d1ff30
Kiran Kumar Veeravelly
feat(osgi): add opt-in Apache Felix plugin framework
Add an opt-in plugin-loading mode backed by an embedded Apache Felix OSGi
framework, enabled with the system property -Dplugin.framework=osgi. The
default classpath loader remains the default when the flag is not set. When
the flag is not set, plugin discovery is functionally identical to today: the
same ServiceLoader-based providers are returned in the same order, the OSGi
framework never starts, and no OSGi code path executes. The only added work in
legacy mode is the construction of a couple of inert Spring beans.
The new plugin-framework-osgi module embeds the Felix lifecycle
(FelixPluginManager), bootstraps it in OSGi mode through a Spring-managed
runner (OsgiFrameworkRunner), and exposes a PluginProvider backed by the OSGi
service registry (OsgiPluginRegistry). At startup in OSGi mode,
StaticBundleLoader installs each legacy plugin JAR through BundleAdapter, which
installs already-OSGi JARs directly and wraps legacy (non-OSGi) JARs by
generating a versioned OSGi manifest. Wrapped plugins' @DataPrepperPlugin
classes are registered as OSGi services (LegacyPluginBundleActivator). Data
Prepper API packages are exported to bundles with semver version attributes
read from data-prepper-api build metadata (DataPrepperOsgiPackages,
DataPrepperApiVersion), consistent with the data-prepper-api
backward-compatibility contract from #6607, so a plugin built on 2.15 resolves
on a 2.16 host. DataPrepperOsgiPackages also exports the framework package
org.opensearch.dataprepper.plugin.osgi so adapted bundles can load the
LegacyPluginBundleActivator from the system bundle.
StaticBundleLoader installs, resolves, and starts bundles with fail-fast
behavior, a startup summary log, and Micrometer metrics.
BundleResolutionErrorTranslator turns Felix resolution failures into readable
diagnostics, and BundleHealthCheck verifies framework, bundle, and classloader
isolation state. BundleClassLoaderScope manages the thread context classloader
at the plugin invocation boundary so ServiceLoader and SPI resolve against the
bundle classloader. PluginHealthProbe is a seam for future functional health
checks.
The OsgiFrameworkRunner bean is always instantiated by Spring but does nothing
unless -Dplugin.framework=osgi is set, because it returns early in its
@PostConstruct method. The Felix framework JAR ships on the runtime classpath
as a small (<1MB) library with zero transitive dependencies, but it is not
exercised in legacy mode.
Scope is limited to classloader isolation and deploy-time validation. Bundles
install once at startup and stop once at shutdown, the same lifecycle as
classpath plugins today. No production hot-reload is included. The
PluginHotLoader helper is test-scoped only and not on the production classpath.
Wiring changes: settings.gradle adds the module, a Felix version-catalog
entry, and the bnd plugin; build-resources.gradle adds the module to
coreProjects; data-prepper-core declares a runtimeOnly dependency on the new
module; PluginProviderLoader is made public with a registerProvider() hook and
caches the framework-mode flag at construction; a test in
data-prepper-plugin-framework's PluginProviderLoaderTest verifies the
mode-caching behavior. Legacy behavior is unchanged. A new, permanent, minimal
example plugin data-prepper-plugins/echo-processor is added to the build to
demonstrate a minimal @DataPrepperPlugin and the SPI path.
Resolves #6760
Signed-off-by: Kiran Kumar Veeravelly <veeravkk@amazon.com>1 parent 4818896 commit 3d1ff30
46 files changed
Lines changed: 5477 additions & 6 deletions
File tree
- data-prepper-core
- data-prepper-plugin-framework/src
- main/java/org/opensearch/dataprepper/plugin
- test/java/org/opensearch/dataprepper/plugin
- data-prepper-plugins/echo-processor
- src
- main
- java/org/opensearch/dataprepper/plugins/processor/echo
- resources/META-INF
- test/java/org/opensearch/dataprepper/plugins/processor/echo
- plugin-framework-osgi
- src
- main/java/org/opensearch/dataprepper/plugin/osgi
- test/java/org/opensearch/dataprepper/plugin/osgi
- fixture
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
| 23 | + | |
23 | 24 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
Lines changed: 42 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
4 | 9 | | |
5 | 10 | | |
6 | 11 | | |
| |||
9 | 14 | | |
10 | 15 | | |
11 | 16 | | |
| 17 | + | |
12 | 18 | | |
13 | 19 | | |
14 | 20 | | |
| 21 | + | |
15 | 22 | | |
16 | 23 | | |
17 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
18 | 29 | | |
19 | | - | |
| 30 | + | |
20 | 31 | | |
21 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
22 | 37 | | |
23 | 38 | | |
24 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
25 | 54 | | |
26 | 55 | | |
27 | 56 | | |
28 | | - | |
29 | | - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
30 | 67 | | |
31 | 68 | | |
32 | 69 | | |
| |||
Lines changed: 29 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
4 | 9 | | |
5 | 10 | | |
6 | 11 | | |
| |||
66 | 71 | | |
67 | 72 | | |
68 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
69 | 98 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
Lines changed: 58 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
Lines changed: 76 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
0 commit comments