Skip to content

Opamp migration #789

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

Merged
LikeTheSalad merged 14 commits into from
Sep 22, 2025
Merged

Opamp migration #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b175c0d
Adding opamp lib to the catalog
LikeTheSalad Sep 9, 2025
ad0c4d8
Adapting CentralConfig to upstream opamp
LikeTheSalad Sep 9, 2025
cad1082
Validating OpampManager
LikeTheSalad Sep 10, 2025
60139ea
Clean up local opamp implementation
LikeTheSalad Sep 10, 2025
ab2d16e
Updating opampmanager constructor visibility
LikeTheSalad Sep 10, 2025
a80b1eb
Removing mockwebserver
LikeTheSalad Sep 10, 2025
1f477e5
Using wiremock for opamp test
LikeTheSalad Sep 11, 2025
c5fa523
Spotless
LikeTheSalad Sep 11, 2025
db9be7c
Excluding otel transitive dependency
LikeTheSalad Sep 11, 2025
c08d567
Update custom/src/main/java/co/elastic/otel/dynamicconfig/internal/Op…
LikeTheSalad Sep 17, 2025
dacfa6e
Adding test for opamp exponential backoff
LikeTheSalad Sep 18, 2025
af5b138
Improving test for opamp exponential backoff
LikeTheSalad Sep 18, 2025
081a779
Updating comment
LikeTheSalad Sep 18, 2025
7d23779
Updating comment
LikeTheSalad Sep 18, 2025
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
7 changes: 6 additions & 1 deletion custom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ val instrumentations = listOf<String>(

dependencies {
implementation(project(":common"))
implementation(project(":opamp"))
implementation(libs.opentelemetry.opamp) {
// exclude transitive dependency as it's provided through agent packaging
exclude(group = "io.opentelemetry", module = "opentelemetry-api")
}
implementation(libs.dslJson)
implementation(project(":inferred-spans"))
implementation(project(":universal-profiling-integration"))
implementation(project(":resources"))
Expand Down Expand Up @@ -49,6 +53,7 @@ dependencies {
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
testImplementation(libs.freemarker)
testImplementation(libs.wiremockjre8)
}

tasks {
Expand Down
84 changes: 39 additions & 45 deletions custom/src/main/java/co/elastic/otel/dynamicconfig/CentralConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
*/
package co.elastic.otel.dynamicconfig;

import co.elastic.opamp.client.CentralConfigurationManager;
import co.elastic.opamp.client.CentralConfigurationManagerImpl;
import co.elastic.opamp.client.CentralConfigurationProcessor;
import co.elastic.otel.dynamicconfig.internal.OpampManager;
import co.elastic.otel.logging.AgentLog;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
import java.io.IOException;
import java.text.MessageFormat;
import java.time.Duration;
import java.time.format.DateTimeParseException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -60,27 +60,31 @@ public static void init(SdkTracerProviderBuilder providerBuilder, ConfigProperti
logger.info("Starting OpAmp client for: " + serviceName + " on endpoint " + endpoint);
DynamicInstrumentation.setTracerConfigurator(
providerBuilder, DynamicConfiguration.UpdatableConfigurator.INSTANCE);
CentralConfigurationManager centralConfigurationManager =
CentralConfigurationManager.builder()
OpampManager opampManager =
OpampManager.builder()
.setServiceName(serviceName)
.setPollingInterval(Duration.ofSeconds(30))
.setConfigurationEndpoint(endpoint)
.setServiceEnvironment(environment)
.build();

centralConfigurationManager.start(
opampManager.start(
configuration -> {
logger.fine("Received configuration: " + configuration);
Configs.applyConfigurations(configuration, centralConfigurationManager);
return CentralConfigurationProcessor.Result.SUCCESS;
Configs.applyConfigurations(configuration, opampManager);
return OpampManager.CentralConfigurationProcessor.Result.SUCCESS;
});

Runtime.getRuntime()
.addShutdownHook(
new Thread(
() -> {
logger.info("=========== Shutting down OpAmp client for: " + serviceName);
centralConfigurationManager.stop();
logger.info("=========== Shutting down OpAMP client for: " + serviceName);
try {
opampManager.close();
} catch (IOException e) {
logger.log(Level.SEVERE, "Error during OpAMP shutdown", e);
}
}));
}

Expand Down Expand Up @@ -129,40 +133,35 @@ public static class Configs {
}

public static synchronized void applyConfigurations(
Map<String, String> configuration,
CentralConfigurationManager centralConfigurationManager) {
Map<String, String> configuration, OpampManager opampManager) {
Set<String> copyOfCurrentNonDefaultConfigsApplied =
new HashSet<>(currentNonDefaultConfigsApplied);
configuration.forEach(
(configurationName, configurationValue) -> {
copyOfCurrentNonDefaultConfigsApplied.remove(configurationName);
applyConfiguration(configurationName, configurationValue, centralConfigurationManager);
applyConfiguration(configurationName, configurationValue, opampManager);
currentNonDefaultConfigsApplied.add(configurationName);
});
if (!copyOfCurrentNonDefaultConfigsApplied.isEmpty()) {
// We have configs that were applied previously but have now been set back to default and
// have been removed from the configs being sent - so for all of these we need to set the
// config back to default
for (String configurationName : copyOfCurrentNonDefaultConfigsApplied) {
applyDefaultConfiguration(configurationName, centralConfigurationManager);
applyDefaultConfiguration(configurationName, opampManager);
currentNonDefaultConfigsApplied.remove(configurationName);
}
}
}

public static void applyDefaultConfiguration(
String configurationName, CentralConfigurationManager centralConfigurationManager) {
configNameToConfig.get(configurationName).updateToDefault(centralConfigurationManager);
String configurationName, OpampManager opampManager) {
configNameToConfig.get(configurationName).updateToDefault(opampManager);
}

public static void applyConfiguration(
String configurationName,
String configurationValue,
CentralConfigurationManager centralConfigurationManager) {
String configurationName, String configurationValue, OpampManager opampManager) {
if (configNameToConfig.containsKey(configurationName)) {
configNameToConfig
.get(configurationName)
.updateOrLog(configurationValue, centralConfigurationManager);
configNameToConfig.get(configurationName).updateOrLog(configurationValue, opampManager);
} else {
logger.warning(
"Ignoring unknown confguration option: '"
Expand Down Expand Up @@ -204,21 +203,19 @@ protected boolean getBoolean(String configurationValue, String error) {
}
}

public void updateOrLog(
String configurationValue, CentralConfigurationManager centralConfigurationManager) {
public void updateOrLog(String configurationValue, OpampManager opampManager) {
try {
update(configurationValue, centralConfigurationManager);
update(configurationValue, opampManager);
} catch (IllegalArgumentException e) {
logger.warning(e.getMessage());
}
}

abstract void update(
String configurationValue, CentralConfigurationManager centralConfigurationManager)
abstract void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException;

public void updateToDefault(CentralConfigurationManager centralConfigurationManager) {
update(defaultConfigStringValue, centralConfigurationManager);
public void updateToDefault(OpampManager opampManager) {
update(defaultConfigStringValue, opampManager);
}

protected DynamicConfiguration config() {
Expand All @@ -232,7 +229,7 @@ public static final class SendLogs extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
config().setSendingLogs(getBoolean(configurationValue));
}
Expand All @@ -244,7 +241,7 @@ public static final class SendMetrics extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
config().setSendingMetrics(getBoolean(configurationValue));
}
Expand All @@ -256,7 +253,7 @@ public static final class SendTraces extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
config().setSendingSpans(getBoolean(configurationValue));
}
Expand All @@ -268,7 +265,7 @@ public static final class DeactivateAllInstrumentations extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
if (getBoolean(configurationValue)) {
config().deactivateAllInstrumentations();
Expand All @@ -284,7 +281,7 @@ public static final class DeactivateInstrumentations extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
config().deactivateInstrumentations(configurationValue);
}
Expand All @@ -296,7 +293,7 @@ public static final class LoggingLevel extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
AgentLog.setLevel(configurationValue);
}
Expand All @@ -308,17 +305,14 @@ public static final class PollingInterval extends ConfigOption {
}

@Override
void update(String configurationValue, CentralConfigurationManager centralConfigurationManager)
void update(String configurationValue, OpampManager opampManager)
throws IllegalArgumentException {
if (centralConfigurationManager instanceof CentralConfigurationManagerImpl) {
try {
Duration duration = Duration.parse("PT" + configurationValue);
((CentralConfigurationManagerImpl) centralConfigurationManager)
.resetPeriodicDelay(duration);
} catch (DateTimeParseException e) {
logger.warning(
"Failed to update the polling interval, value passed was invalid: " + e.getMessage());
}
try {
Duration duration = Duration.parse("PT" + configurationValue);
opampManager.setPollingDelay(duration);
} catch (DateTimeParseException e) {
logger.warning(
"Failed to update the polling interval, value passed was invalid: " + e.getMessage());
}
}
}
Expand Down
Loading
Loading