This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 11e3e4cc22 [improvement] disable default OpenTelemetry exporters to
prevent connection errors (#3461)
11e3e4cc22 is described below
commit 11e3e4cc22004de382180da32811dee40ce64fca
Author: Yang Chen <[email protected]>
AuthorDate: Thu Jun 12 23:40:28 2025 +0800
[improvement] disable default OpenTelemetry exporters to prevent connection
errors (#3461)
---
.../src/main/resources/application.yml | 8 ------
.../hertzbeat/otel/config/OpenTelemetryConfig.java | 30 ++++++++++++++--------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/hertzbeat-manager/src/main/resources/application.yml
b/hertzbeat-manager/src/main/resources/application.yml
index 9a5e7124d5..a63c2dc8ff 100644
--- a/hertzbeat-manager/src/main/resources/application.yml
+++ b/hertzbeat-manager/src/main/resources/application.yml
@@ -62,14 +62,6 @@ sureness:
8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5
dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp'
-otel:
- traces:
- exporter: none
- metrics:
- exporter: none
- logs:
- exporter: none
-
---
spring:
config:
diff --git
a/hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/OpenTelemetryConfig.java
b/hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/OpenTelemetryConfig.java
index 167458f472..44774dbd3a 100644
---
a/hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/OpenTelemetryConfig.java
+++
b/hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/OpenTelemetryConfig.java
@@ -98,29 +98,37 @@ public class OpenTelemetryConfig {
}
/**
- * Provides an AutoConfigurationCustomizerProvider to tailor the
auto-configured OpenTelemetry SDK.
- * This includes setting up GrepTimeDB exporters for logs and traces, and
customizing the resource.
- * Active only if 'greptime.enabled' is true.
- *
- * @param greptimeProperties Configuration for GrepTimeDB.
- * @return AutoConfigurationCustomizerProvider instance.
+ * Provides default OpenTelemetry configuration that always executes.
*/
@Bean
- @ConditionalOnProperty(name = "warehouse.store.greptime.enabled",
havingValue = "true")
- public AutoConfigurationCustomizerProvider
greptimeOtelCustomizer(GreptimeProperties greptimeProperties) {
- log.info("GreptimeDB is enabled. Applying OpenTelemetry SDK
customizations.");
-
+ public AutoConfigurationCustomizerProvider defaultOtelCustomizer() {
+ log.info("Applying default OpenTelemetry SDK customizations.");
return providerCustomizer -> providerCustomizer
.addPropertiesCustomizer(sdkConfigProperties -> {
Map<String, String> newProperties = new HashMap<>();
newProperties.put("otel.metrics.exporter", "none");
- newProperties.put("otel.traces.exporter", "otlp");
+ newProperties.put("otel.traces.exporter", "none");
newProperties.put("otel.logs.exporter", "none");
return newProperties;
})
.addResourceCustomizer((resource, configProperties) -> {
log.info("Customizing auto-configured OpenTelemetry
Resource with service name: {}.", HERTZBEAT_SERVICE_NAME);
return resource.merge(Resource.builder().put(SERVICE_NAME,
HERTZBEAT_SERVICE_NAME).build());
+ });
+ }
+
+ /**
+ * Provides GrepTimeDB-specific OpenTelemetry configuration when enabled.
+ */
+ @Bean
+ @ConditionalOnProperty(name = "warehouse.store.greptime.enabled",
havingValue = "true")
+ public AutoConfigurationCustomizerProvider
greptimeOtelCustomizer(GreptimeProperties greptimeProperties) {
+ log.info("GreptimeDB is enabled. Applying additional OpenTelemetry SDK
customizations for GrepTimeDB.");
+ return providerCustomizer -> providerCustomizer
+ .addPropertiesCustomizer(sdkConfigProperties -> {
+ Map<String, String> newProperties = new HashMap<>();
+ newProperties.put("otel.traces.exporter", "otlp");
+ return newProperties;
})
.addSpanExporterCustomizer((originalSpanExporter,
configProperties) -> {
String traceEndpoint = greptimeProperties.httpEndpoint() +
"/v1/otlp/v1/traces";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
