From 2448662d860cdd3d4de590c788fa1d2e01abeaba Mon Sep 17 00:00:00 2001 From: albertteoh Date: Fri, 25 Aug 2023 21:22:03 +1000 Subject: [PATCH] Default to spanmetrics connector Signed-off-by: albertteoh --- docker-compose/monitor/Makefile | 2 +- plugin/metrics/prometheus/options.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose/monitor/Makefile b/docker-compose/monitor/Makefile index c6948ec1f8c..17ae4a63fa9 100644 --- a/docker-compose/monitor/Makefile +++ b/docker-compose/monitor/Makefile @@ -20,7 +20,6 @@ run-dev: _run-connector .PHONY: _run-connector _run-connector: export OTEL_IMAGE_TAG = 0.80.0 _run-connector: export OTEL_CONFIG_SRC = ./otel-collector-config-connector.yml -_run-connector: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = true _run-connector: docker compose -f docker-compose.yml up @@ -31,6 +30,7 @@ run-dev-processor: export JAEGER_IMAGE_TAG = dev # Fix to a version before the breaking changes were introduced. run-dev-processor: export OTEL_IMAGE_TAG = 0.70.0 run-dev-processor: export OTEL_CONFIG_SRC = ./otel-collector-config-processor.yml +run-dev-processor: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = false run-dev-processor: docker compose -f docker-compose.yml up diff --git a/plugin/metrics/prometheus/options.go b/plugin/metrics/prometheus/options.go index ae31944230a..98dfc66150f 100644 --- 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,