Merge branch 'default-connector' into improve-local-dev

jaegertracing · Aug 28, 2023 · 98ddd13 · 98ddd13
2 parents e7ac86f + 2448662
commit 98ddd13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose/monitor/docker-compose.yml b/docker-compose/monitor/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     environment:
       - METRICS_STORAGE_TYPE=prometheus
       - PROMETHEUS_SERVER_URL=http://prometheus:9090
-      - PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR=${PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR}
+      - PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR=${PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR:-true}
       - PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE:-}
       - PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT:-}
       - OTEL_IMAGE_TAG=${OTEL_IMAGE_TAG:-0.80.0}

diff --git a/plugin/metrics/prometheus/options.go b/plugin/metrics/prometheus/options.go
@@ -41,7 +41,7 @@ const (
 	defaultConnectTimeout = 30 * time.Second
 	defaultTokenFilePath  = ""
 
-	defaultSupportSpanmetricsConnector = false
+	defaultSupportSpanmetricsConnector = true
 	defaultMetricNamespace             = ""
 	defaultLatencyUnit                 = "ms"
 	defaultNormalizeCalls              = false
@@ -64,7 +64,7 @@ func NewOptions(primaryNamespace string) *Options {
 		ServerURL:      defaultServerURL,
 		ConnectTimeout: defaultConnectTimeout,
 
-		SupportSpanmetricsConnector: false,
+		SupportSpanmetricsConnector: defaultSupportSpanmetricsConnector,
 		MetricNamespace:             defaultMetricNamespace,
 		LatencyUnit:                 defaultLatencyUnit,
 		NormalizeCalls:              defaultNormalizeCalls,