Skip to content

Commit

Permalink
Fix OTel Resource Attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobat authored and radcortez committed Nov 13, 2023
1 parent 8d6d112 commit 13b73a9
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 34 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package io.quarkus.opentelemetry.deployment;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.NoSuchElementException;
import java.util.function.Consumer;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.test.QuarkusUnitTest;

public class InvalidAttributesConfigTest {
@RegisterExtension
static final QuarkusUnitTest TEST = new QuarkusUnitTest()
.overrideConfigKey("quarkus.otel.resource.attributes", "pod.id=${SOMETHING}")
.assertException(new Consumer<Throwable>() {
@Override
public void accept(final Throwable throwable) {
throwable.getCause().printStackTrace();
assertTrue(throwable.getCause() instanceof NoSuchElementException);
assertEquals("SRCFG00011: Could not expand value SOMETHING in property quarkus.otel.resource.attributes",
throwable.getCause().getMessage());
}
});

@Test
void test() {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import jakarta.enterprise.util.TypeLiteral;

import org.eclipse.microprofile.config.ConfigProvider;
import org.eclipse.microprofile.config.spi.Converter;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
Expand All @@ -20,8 +21,6 @@
import io.quarkus.opentelemetry.runtime.config.runtime.OTelRuntimeConfig;
import io.quarkus.runtime.annotations.Recorder;
import io.quarkus.runtime.configuration.DurationConverter;
import io.smallrye.config.ConfigValue;
import io.smallrye.config.NameIterator;
import io.smallrye.config.SmallRyeConfig;
import io.vertx.core.Vertx;

Expand Down Expand Up @@ -89,46 +88,58 @@ private Map<String, String> getOtelConfigs() {
// load new properties
for (String propertyName : config.getPropertyNames()) {
if (propertyName.startsWith("quarkus.otel.")) {
ConfigValue configValue = config.getConfigValue(propertyName);
if (configValue.getValue() != null) {
NameIterator name = new NameIterator(propertyName);
name.next();
oTelConfigs.put(name.getName().substring(name.getPosition() + 1), getValue(configValue));
}
String value = getValue(config, propertyName);
oTelConfigs.put(propertyName.substring(8), value);
}
}
return oTelConfigs;
}

/**
* Transforms the value to what OTel expects
* TODO: this is super simplistic, and should be more modular if needed
*/
private String getValue(ConfigValue configValue) {
String name = configValue.getName();
if (name.endsWith("timeout") || name.endsWith("delay")) {
String value = configValue.getValue();
if (DurationConverter.DIGITS.asPredicate().test(value)) {
// OTel regards values without a unit to me milliseconds instead of seconds
// that java.time.Duration assumes, so let's just not do any conversion and let OTel handle with it
return value;
}
Duration duration;
try {
duration = DurationConverter.parseDuration(value);
} catch (Exception ignored) {
// it's not a Duration, so we can't do much
return configValue.getValue();
}
try {
return duration.toMillis() + "ms";
} catch (Exception ignored) {
return duration.toSeconds() + "s";
}
private String getValue(SmallRyeConfig config, String propertyName) {
if (propertyName.endsWith("timeout") || propertyName.endsWith("delay")) {
return config.getValue(propertyName, OTelDurationConverter.INSTANCE);
} else {
return config.getValue(propertyName, String.class);
}
return configValue.getValue();
}
};
}

/**
* Transforms the value to what OTel expects
* TODO: this is super simplistic, and should be more modular if needed
*/
private static class OTelDurationConverter implements Converter<String> {
static OTelDurationConverter INSTANCE = new OTelDurationConverter();

@Override
public String convert(final String value) throws IllegalArgumentException, NullPointerException {
if (value == null) {
throw new NullPointerException();
}

if (DurationConverter.DIGITS.asPredicate().test(value)) {
// OTel regards values without a unit to me milliseconds instead of seconds
// that java.time.Duration assumes, so let's just not do any conversion and let OTel handle with it
return value;
}
Duration duration;
try {
duration = DurationConverter.parseDuration(value);
} catch (Exception ignored) {
// it's not a Duration, so we can't do much
return value;
}

if (duration == null) {
return value;
}

try {
return duration.toMillis() + "ms";
} catch (Exception ignored) {
return duration.toSeconds() + "s";
}
}
}
}

0 comments on commit 13b73a9

Please sign in to comment.