fix conflicts

open-telemetry · Jan 14, 2024 · 6ad5050 · 6ad5050
1 parent 7764cbb
commit 6ad5050
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/exporter/cassandraexporter/config.go b/exporter/cassandraexporter/config.go
@@ -3,8 +3,9 @@
 
 package cassandraexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter"
 import (
-	"go.opentelemetry.io/collector/config/configopaque"
 	"time"
+
+	"go.opentelemetry.io/collector/config/configopaque"
 )
 
 type Config struct {
@@ -16,8 +17,7 @@ type Config struct {
 	LogsTable   string        `mapstructure:"logs_table"`
 	Replication Replication   `mapstructure:"replication"`
 	Compression Compression   `mapstructure:"compression"`
-	Auth        Auth        `mapstructure:"auth"`
-
+	Auth        Auth          `mapstructure:"auth"`
 }
 
 type Replication struct {

diff --git a/exporter/cassandraexporter/exporter_logs_test.go b/exporter/cassandraexporter/exporter_logs_test.go
@@ -5,9 +5,9 @@ package cassandraexporter
 
 import (
 	"errors"
-	"github.com/gocql/gocql"
 	"testing"
 
+	"github.com/gocql/gocql"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0
 	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector/component v0.92.1-0.20240112172857-83d463ceba06
+	go.opentelemetry.io/collector/config/configopaque v0.92.0
 	go.opentelemetry.io/collector/confmap v0.92.1-0.20240112172857-83d463ceba06
 	go.opentelemetry.io/collector/exporter v0.92.1-0.20240112172857-83d463ceba06
 	go.opentelemetry.io/collector/pdata v1.0.2-0.20240112172857-83d463ceba06

diff --git a/exporter/cassandraexporter/go.sum b/exporter/cassandraexporter/go.sum