Skip to content

Commit 9c3ed81

Browse files
committed
updating namespace
1 parent ffbb4e8 commit 9c3ed81

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed
Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,22 @@
3737
* otel.jmx.enabled and otel.jmx.exporter.metrics.endpoint or the environment variable
3838
* OTEL_JMX_ENABLED_CONFIG and OTEL_JMX_ENDPOINT_CONFIG. These flags are disabled by default.
3939
*/
40-
public class OtelJMXMetricsCustomizerProvider implements AutoConfigurationCustomizerProvider {
40+
public class AWSJMXMetricsCustomizerProvider implements AutoConfigurationCustomizerProvider {
4141
private static final Duration DEFAULT_METRIC_EXPORT_INTERVAL = Duration.ofMinutes(1);
4242
private static final Logger logger =
43-
Logger.getLogger(OtelJMXMetricsCustomizerProvider.class.getName());
43+
Logger.getLogger(AWSJMXMetricsCustomizerProvider.class.getName());
4444

45-
private static final String OTEL_JMX_ENABLED_CONFIG = "otel.jmx.enabled";
46-
private static final String OTEL_JMX_ENDPOINT_CONFIG = "otel.jmx.exporter.metrics.endpoint";
45+
private static final String AWS_OTEL_JMX_ENABLED_CONFIG = "otel.aws.jmx.enabled";
46+
private static final String AWS_OTEL_JMX_ENDPOINT_CONFIG =
47+
"otel.aws.jmx.exporter.metrics.endpoint";
4748

4849
public void customize(AutoConfigurationCustomizer autoConfiguration) {
4950
autoConfiguration.addMeterProviderCustomizer(this::customizeMeterProvider);
5051
}
5152

5253
private boolean isOtelJMXEnabled(ConfigProperties configProps) {
53-
return configProps.getBoolean(OTEL_JMX_ENABLED_CONFIG, false)
54-
&& configProps.getString(OTEL_JMX_ENDPOINT_CONFIG, "") != "";
54+
return configProps.getBoolean(AWS_OTEL_JMX_ENABLED_CONFIG, false)
55+
&& configProps.getString(AWS_OTEL_JMX_ENDPOINT_CONFIG, "") != "";
5556
}
5657

5758
private SdkMeterProviderBuilder customizeMeterProvider(
@@ -89,15 +90,17 @@ public MetricExporter createExporter(ConfigProperties configProps) {
8990

9091
String otelJMXEndpoint;
9192
if (protocol.equals(OtlpConfigUtil.PROTOCOL_HTTP_PROTOBUF)) {
92-
otelJMXEndpoint = configProps.getString(OTEL_JMX_ENDPOINT_CONFIG, "http://localhost:4314");
93+
otelJMXEndpoint =
94+
configProps.getString(AWS_OTEL_JMX_ENDPOINT_CONFIG, "http://localhost:4314");
9395
logger.log(
94-
Level.FINE, String.format("Otel JMX metrics export endpoint: %s", otelJMXEndpoint));
96+
Level.FINE, String.format("AWS Otel JMX metrics export endpoint: %s", otelJMXEndpoint));
9597
return OtlpHttpMetricExporter.builder()
9698
.setEndpoint(otelJMXEndpoint)
9799
.setDefaultAggregationSelector(this::getAggregation)
98100
.build();
99101
}
100-
throw new ConfigurationException("Unsupported Otel JMX metrics export protocol: " + protocol);
102+
throw new ConfigurationException(
103+
"Unsupported AWS Otel JMX metrics export protocol: " + protocol);
101104
}
102105

103106
private Aggregation getAggregation(InstrumentType instrumentType) {

awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
software.amazon.opentelemetry.javaagent.providers.AwsAgentPropertiesCustomizerProvider
1717
software.amazon.opentelemetry.javaagent.providers.AwsTracerCustomizerProvider
1818
software.amazon.opentelemetry.javaagent.providers.AwsApplicationSignalsCustomizerProvider
19-
software.amazon.opentelemetry.javaagent.providers.OtelJMXMetricsCustomizerProvider
19+
software.amazon.opentelemetry.javaagent.providers.AWSJMXMetricsCustomizerProvider

0 commit comments

Comments
 (0)