Skip to content

docs(agent-extension-api): mark ConfigProperties @Nullable where null is possible #18090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeitlinger wants to merge 4 commits into
base: main
Choose a base branch
from
+10 −5
Open

docs(agent-extension-api): mark ConfigProperties @Nullable where null is possible #18090

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da08786
docs(agent-extension-api): mark ConfigProperties @Nullable where null…
zeitlinger Apr 20, 2026
3b1b729
Merge branch 'main' into declarative-config-nullable-sdk-config
trask Apr 29, 2026
3a03460
fix: preserve non-null extension config contract
zeitlinger May 18, 2026
f282f69
fix: keep ignored types config non-null
zeitlinger May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,10 @@ private static void installBytebuddyAgent(
AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
installOpenTelemetrySdk(extensionClassLoader);

ConfigProperties sdkConfig = AutoConfigureUtil.getConfig(autoConfiguredSdk);
@Nullable ConfigProperties sdkConfig = AutoConfigureUtil.getConfig(autoConfiguredSdk);
ConfigProperties sdkConfigOrEmpty = getConfigOrEmpty(sdkConfig);

setBootstrapPackages(sdkConfig, extensionClassLoader);
setBootstrapPackages(sdkConfigOrEmpty, extensionClassLoader);
Comment thread
zeitlinger marked this conversation as resolved.
ConfiguredResourceAttributesHolder.initialize(
SdkAutoconfigureAccess.getResource(autoConfiguredSdk).getAttributes());

Expand All @@ -165,7 +166,7 @@ private static void installBytebuddyAgent(
}

agentBuilder = agentBuilder.with(new ClassLoadListener());
agentBuilder = configureIgnoredTypes(sdkConfig, extensionClassLoader, agentBuilder);
agentBuilder = configureIgnoredTypes(sdkConfigOrEmpty, extensionClassLoader, agentBuilder);

int numberOfLoadedExtensions = 0;
for (AgentExtension agentExtension : loadOrdered(AgentExtension.class, extensionClassLoader)) {
Expand All @@ -176,7 +177,7 @@ private static void installBytebuddyAgent(
new Object[] {agentExtension.extensionName(), agentExtension.getClass().getName()});
}
try {
agentBuilder = agentExtension.extend(agentBuilder, sdkConfig);
agentBuilder = agentExtension.extend(agentBuilder, sdkConfigOrEmpty);
numberOfLoadedExtensions++;
} catch (Exception | LinkageError e) {
logger.log(
Expand Down Expand Up @@ -266,6 +267,10 @@ private static void installEarlyInstrumentation(
agentBuilder.installOn(instrumentation);
}

private static ConfigProperties getConfigOrEmpty(@Nullable ConfigProperties config) {
return config != null ? config : EmptyConfigProperties.INSTANCE;
}

private static void setBootstrapPackages(
ConfigProperties config, ClassLoader extensionClassLoader) {
BootstrapPackagesBuilderImpl builder = new BootstrapPackagesBuilderImpl();
Expand All @@ -287,7 +292,7 @@ private static AgentBuilder configureIgnoredTypes(
IgnoredTypesBuilderImpl builder = new IgnoredTypesBuilderImpl();
for (IgnoredTypesConfigurer configurer :
loadOrdered(IgnoredTypesConfigurer.class, extensionClassLoader)) {
configurer.configure(builder, config != null ? config : EmptyConfigProperties.INSTANCE);
configurer.configure(builder, config);
}

Trie<Boolean> ignoredTasksTrie = builder.buildIgnoredTasksTrie();
Expand Down
Loading