fix lint

keisku · Jun 18, 2022 · 7956d62 · 7956d62
1 parent 1a4e73f
commit 7956d62
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/exporter/datadogexporter/internal/model/internal/instrumentationscope/metadata.go b/exporter/datadogexporter/internal/model/internal/instrumentationscope/metadata.go
@@ -16,6 +16,7 @@ package instrumentationscope // import "github.com/open-telemetry/opentelemetry-
 
 import (
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/model/internal/utils"
+
  "go.opentelemetry.io/collector/pdata/pcommon"
 )
 

diff --git a/exporter/datadogexporter/internal/model/translator/metrics_translator.go b/exporter/datadogexporter/internal/model/translator/metrics_translator.go
@@ -22,11 +22,12 @@ import (
  "strconv"
 
  "github.com/DataDog/datadog-agent/pkg/quantile"
+ "go.opentelemetry.io/collector/pdata/pmetric"
+ "go.uber.org/zap"
+
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/model/attributes"
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/model/internal/instrumentationlibrary"
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/model/internal/instrumentationscope"
- "go.opentelemetry.io/collector/pdata/pmetric"
- "go.uber.org/zap"
 )
 
 const metricName string = "metric name"

diff --git a/exporter/datadogexporter/internal/model/translator/metrics_translator_test.go b/exporter/datadogexporter/internal/model/translator/metrics_translator_test.go
@@ -24,7 +24,6 @@ import (
 
  "github.com/DataDog/datadog-agent/pkg/quantile"
  "github.com/DataDog/datadog-agent/pkg/quantile/summary"
- "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/model/attributes"
  gocache "github.com/patrickmn/go-cache"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
@@ -34,6 +33,8 @@ import (
  "go.uber.org/zap"
  "go.uber.org/zap/zapcore"
  "go.uber.org/zap/zaptest/observer"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/model/attributes"
 )
 
 func TestIsCumulativeMonotonic(t *testing.T) {

diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go
@@ -72,15 +72,15 @@ func translatorFromConfig(logger *zap.Logger, cfg *config.Config, hostProvider p
  options = append(options, translator.WithResourceAttributesAsTags())
  }
 
- if cfg.Metrics.ExporterConfig.InstrumentationScopeMetadataAsTags && cfg.Metrics.ExporterConfig.InstrumentationLibraryMetadataAsTags {
+ if cfg.Metrics.ExporterConfig.InstrumentationScopeMetadataAsTags && cfg.Metrics.ExporterConfig.InstrumentationLibraryMetadataAsTags { // nolint SA1019
  return nil, fmt.Errorf("cannot use both instrumentation_library_metadata_as_tags(deprecated) and instrumentation_scope_metadata_as_tags")
  }
 
  if cfg.Metrics.ExporterConfig.InstrumentationScopeMetadataAsTags {
  options = append(options, translator.WithInstrumentationScopeMetadataAsTags())
  }
 
- if cfg.Metrics.ExporterConfig.InstrumentationLibraryMetadataAsTags {
+ if cfg.Metrics.ExporterConfig.InstrumentationLibraryMetadataAsTags { // nolint SA1019
  options = append(options, translator.WithInstrumentationLibraryMetadataAsTags())
  }