From cbc0d054c0ed86da88168fd7151a7d6f8544fde4 Mon Sep 17 00:00:00 2001 From: "colin.desmond" Date: Mon, 6 Nov 2023 10:29:51 +0000 Subject: [PATCH] Merge conflict --- exporter/azuremonitorexporter/config.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/exporter/azuremonitorexporter/config.go b/exporter/azuremonitorexporter/config.go index e473494a4b3c..9187187f36cc 100644 --- a/exporter/azuremonitorexporter/config.go +++ b/exporter/azuremonitorexporter/config.go @@ -13,9 +13,10 @@ import ( // Config defines configuration for Azure Monitor type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` - Endpoint string `mapstructure:"endpoint"` - InstrumentationKey configopaque.String `mapstructure:"instrumentation_key"` - MaxBatchSize int `mapstructure:"maxbatchsize"` - MaxBatchInterval time.Duration `mapstructure:"maxbatchinterval"` - SpanEventsEnabled bool `mapstructure:"spaneventsenabled"` + Endpoint string `mapstructure:"endpoint"` + ConnectionString configopaque.String `mapstructure:"connection_string"` + InstrumentationKey configopaque.String `mapstructure:"instrumentation_key"` + MaxBatchSize int `mapstructure:"maxbatchsize"` + MaxBatchInterval time.Duration `mapstructure:"maxbatchinterval"` + SpanEventsEnabled bool `mapstructure:"spaneventsenabled"` }