Merge conflict

open-telemetry · Nov 6, 2023 · cbc0d05 · cbc0d05
1 parent f137638
commit cbc0d05
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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"`
 }