Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,14 @@
package com.solarwinds.opentelemetry.extensions.config.provider;

import com.google.auto.service.AutoService;
import com.solarwinds.joboe.config.JavaRuntimeVersionChecker;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectionModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectorPropertyModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ResourceModelAccessor;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;

@AutoService(DeclarativeConfigurationCustomizerProvider.class)
Expand All @@ -39,11 +34,6 @@ public class CustomConfigCustomizerProvider implements DeclarativeConfigurationC
public void customize(DeclarativeConfigurationCustomizer customizer) {
customizer.addModelCustomizer(
configurationModel -> {
TracerProviderModel tracerProvider = configurationModel.getTracerProvider();
if (tracerProvider != null) {
addProcessors(tracerProvider);
}

ResourceModel resourceModel = configurationModel.getResource();
if (resourceModel == null) {
resourceModel = new ResourceModel();
Expand Down Expand Up @@ -88,24 +78,4 @@ private void addResourceDetector(ResourceModel resourceModel) {
detectionDevelopment.setDetectors(newDetectors);
ResourceModelAccessor.setDetection(resourceModel, detectionDevelopment);
}

private void addProcessors(TracerProviderModel model) {
if (JavaRuntimeVersionChecker.isJdkVersionSupported()) {
List<SpanProcessorModel> processors =
Collections.singletonList(
new SpanProcessorModel()
.setExtensionProperty(
ProfilingSpanProcessorComponentProvider.COMPONENT_NAME,
new HashMap<String, Object>()));

List<SpanProcessorModel> spanProcessorModels = model.getProcessors();
if (spanProcessorModels == null) {
spanProcessorModels = new ArrayList<>();
}

ArrayList<SpanProcessorModel> allProcessors = new ArrayList<>(spanProcessorModels);
allProcessors.addAll(processors);
model.setProcessors(allProcessors);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,26 @@
package com.solarwinds.opentelemetry.extensions.config.provider;

import com.google.auto.service.AutoService;
import com.solarwinds.joboe.config.ConfigManager;
import com.solarwinds.joboe.config.ConfigProperty;
import com.solarwinds.joboe.config.InvalidConfigException;
import com.solarwinds.joboe.config.JavaRuntimeVersionChecker;
import com.solarwinds.joboe.core.profiler.ProfilerSetting;
import com.solarwinds.opentelemetry.extensions.SolarwindsProfilingSpanProcessor;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
import io.opentelemetry.sdk.trace.SpanProcessor;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;

@AutoService(ComponentProvider.class)
public class ProfilingSpanProcessorComponentProvider implements ComponentProvider {

public static final String COMPONENT_NAME = "swo/profilingSpanProcessor";
public static final String COMPONENT_NAME = "swo_profiler";

private static final List<String> DEFAULT_EXCLUDE_PACKAGES =
Arrays.asList("java", "javax", "com.sun", "sun", "sunw");

@Override
public Class<SpanProcessor> getType() {
Expand All @@ -39,6 +50,46 @@ public String getName() {

@Override
public SpanProcessor create(DeclarativeConfigProperties declarativeConfigProperties) {
try {
ProfilerSetting convert = convert(declarativeConfigProperties);
ConfigManager.setConfig(ConfigProperty.PROFILER, convert);
} catch (InvalidConfigException e) {
throw new RuntimeException(e);
}

return new SolarwindsProfilingSpanProcessor();
}

ProfilerSetting convert(DeclarativeConfigProperties profilerSettings)
throws InvalidConfigException {

boolean enabled =
JavaRuntimeVersionChecker.isJdkVersionSupported()
&& profilerSettings.getBoolean("enabled", false);
int circuitBreakerDurationThreshold =
profilerSettings.getInt("circuit_breaker_duration_threshold", 100);
int circuitBreakerCountThreshold =
profilerSettings.getInt("circuit_breaker_count_threshold", 2);

int interval = profilerSettings.getInt("interval", 20);
if (interval != 0
&& interval
< ProfilerSetting
.MIN_INTERVAL) { // special case for interval 0, it means profiler on standby
throw new InvalidConfigException(
"Profiling interval should be >= "
+ ProfilerSetting.MIN_INTERVAL
+ " but found "
+ interval);
}

List<String> excludePackages =
profilerSettings.getScalarList("exclude_packages", String.class, DEFAULT_EXCLUDE_PACKAGES);
return new ProfilerSetting(
enabled,
new HashSet<>(excludePackages),
interval,
circuitBreakerDurationThreshold,
circuitBreakerCountThreshold);
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectionModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectorPropertyModel;
Expand Down Expand Up @@ -57,64 +55,6 @@ class CustomConfigCustomizerProviderTest {
private ArgumentCaptor<Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel>>
functionArgumentCaptor;

@Test
void verifyThatProfilingProcessorIsAddedWhenJdkVersionIsSupported() {
try (MockedStatic<JavaRuntimeVersionChecker> javaRuntimeVersionCheckerMockedStatic =
mockStatic(JavaRuntimeVersionChecker.class)) {
javaRuntimeVersionCheckerMockedStatic
.when(JavaRuntimeVersionChecker::isJdkVersionSupported)
.thenReturn(true);

OpenTelemetryConfigurationModel openTelemetryConfigurationModel =
new OpenTelemetryConfigurationModel()
.setTracerProvider(new TracerProviderModel().setProcessors(Collections.emptyList()));

doNothing()
.when(declarativeConfigurationCustomizerMock)
.addModelCustomizer(functionArgumentCaptor.capture());

tested.customize(declarativeConfigurationCustomizerMock);
functionArgumentCaptor.getValue().apply(openTelemetryConfigurationModel);

TracerProviderModel tracerProvider = openTelemetryConfigurationModel.getTracerProvider();
assertNotNull(tracerProvider);

List<SpanProcessorModel> processors = tracerProvider.getProcessors();
assertNotNull(
processors
.get(0)
.getExtensionProperties()
.get(ProfilingSpanProcessorComponentProvider.COMPONENT_NAME));
}
}

@Test
void verifyThatProfilingProcessorIsNotAddedWhenJdkVersionIsNotSupported() {
try (MockedStatic<JavaRuntimeVersionChecker> javaRuntimeVersionCheckerMockedStatic =
mockStatic(JavaRuntimeVersionChecker.class)) {
javaRuntimeVersionCheckerMockedStatic
.when(JavaRuntimeVersionChecker::isJdkVersionSupported)
.thenReturn(false);

OpenTelemetryConfigurationModel openTelemetryConfigurationModel =
new OpenTelemetryConfigurationModel()
.setTracerProvider(new TracerProviderModel().setProcessors(Collections.emptyList()));

doNothing()
.when(declarativeConfigurationCustomizerMock)
.addModelCustomizer(functionArgumentCaptor.capture());

tested.customize(declarativeConfigurationCustomizerMock);
functionArgumentCaptor.getValue().apply(openTelemetryConfigurationModel);

TracerProviderModel tracerProvider = openTelemetryConfigurationModel.getTracerProvider();
assertNotNull(tracerProvider);

List<SpanProcessorModel> processors = tracerProvider.getProcessors();
assertTrue(processors.isEmpty());
}
}

@Test
void verifyThatResourceDetectorIsAlwaysAdded() {
try (MockedStatic<JavaRuntimeVersionChecker> javaRuntimeVersionCheckerMockedStatic =
Expand Down
Loading
Loading