Skip to content

Commit 75db101

Browse files
committed
Fix linting and unexport batcher and dimensions structs
1 parent 0370024 commit 75db101

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

receiver/datadogreceiver/internal/translator/batcher.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import (
1010
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity"
1111
)
1212

13-
type Batcher struct {
13+
type batcher struct {
1414
pmetric.Metrics
1515

1616
resourceMetrics map[identity.Resource]pmetric.ResourceMetrics
1717
scopeMetrics map[identity.Scope]pmetric.ScopeMetrics
1818
metrics map[identity.Metric]pmetric.Metric
1919
}
2020

21-
func newBatcher() Batcher {
22-
return Batcher{
21+
func newBatcher() batcher {
22+
return batcher{
2323
Metrics: pmetric.NewMetrics(),
2424
resourceMetrics: make(map[identity.Resource]pmetric.ResourceMetrics),
2525
scopeMetrics: make(map[identity.Scope]pmetric.ScopeMetrics),
@@ -30,7 +30,7 @@ func newBatcher() Batcher {
3030
// Dimensions stores the properties of the series that are needed in order
3131
// to unique identify the series. This is needed in order to batch metrics by
3232
// resource, scope, and datapoint attributes
33-
type Dimensions struct {
33+
type dimensions struct {
3434
name string
3535
metricType pmetric.MetricType
3636
resourceAttrs pcommon.Map
@@ -47,9 +47,9 @@ var metricTypeMap = map[string]pmetric.MetricType{
4747
"sketch": pmetric.MetricTypeExponentialHistogram,
4848
}
4949

50-
func parseSeriesProperties(name string, metricType string, tags []string, host string, version string, stringPool *StringPool) Dimensions {
50+
func parseSeriesProperties(name string, metricType string, tags []string, host string, version string, stringPool *StringPool) dimensions {
5151
resourceAttrs, scopeAttrs, dpAttrs := tagsToAttributes(tags, host, stringPool)
52-
return Dimensions{
52+
return dimensions{
5353
name: name,
5454
metricType: metricTypeMap[metricType],
5555
buildInfo: version,
@@ -59,7 +59,7 @@ func parseSeriesProperties(name string, metricType string, tags []string, host s
5959
}
6060
}
6161

62-
func (b Batcher) Lookup(dim Dimensions) (pmetric.Metric, identity.Metric) {
62+
func (b batcher) Lookup(dim dimensions) (pmetric.Metric, identity.Metric) {
6363
resource := dim.Resource()
6464
resourceID := identity.OfResource(resource)
6565
resourceMetrics, ok := b.resourceMetrics[resourceID]
@@ -90,21 +90,21 @@ func (b Batcher) Lookup(dim Dimensions) (pmetric.Metric, identity.Metric) {
9090
return metric, metricID
9191
}
9292

93-
func (d Dimensions) Resource() pcommon.Resource {
93+
func (d dimensions) Resource() pcommon.Resource {
9494
resource := pcommon.NewResource()
9595
d.resourceAttrs.CopyTo(resource.Attributes()) // TODO(jesus.vazquez) review this copy
9696
return resource
9797
}
9898

99-
func (d Dimensions) Scope() pcommon.InstrumentationScope {
99+
func (d dimensions) Scope() pcommon.InstrumentationScope {
100100
scope := pcommon.NewInstrumentationScope()
101101
scope.SetName("otelcol/datadogreceiver")
102102
scope.SetVersion(d.buildInfo)
103103
d.scopeAttrs.CopyTo(scope.Attributes())
104104
return scope
105105
}
106106

107-
func (d Dimensions) Metric() pmetric.Metric {
107+
func (d dimensions) Metric() pmetric.Metric {
108108
metric := pmetric.NewMetric()
109109
metric.SetName(d.name)
110110
switch d.metricType {

receiver/datadogreceiver/internal/translator/metrics_translator.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
package translator // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator"
55

66
import (
7-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity"
7+
"sync"
8+
89
"go.opentelemetry.io/collector/component"
910
"go.opentelemetry.io/collector/pdata/pcommon"
10-
"sync"
11+
12+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity"
1113
)
1214

1315
type MetricsTranslator struct {

receiver/datadogreceiver/receiver.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"encoding/json"
99
"errors"
1010
"fmt"
11-
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator"
1211
"io"
1312
"net/http"
1413

@@ -18,6 +17,8 @@ import (
1817
"go.opentelemetry.io/collector/receiver"
1918
"go.opentelemetry.io/collector/receiver/receiverhelper"
2019
"go.uber.org/zap"
20+
21+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver/internal/translator"
2122
)
2223

2324
type datadogReceiver struct {

0 commit comments

Comments
 (0)