Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 3086b1d

Browse files
mx-psimx-psi
authored
[pkg/otlp/metrics] Make NewTranslator take a component.TelemetrySettings instead of a logger (#218)
* [pkg/otlp/metrics] Make NewTranslator take a component.TelemetrySettings instead of a logger * Add changelog entry * make gen-licenses
1 parent 5432be0 commit 3086b1d

11 files changed

+111
-18
lines changed

‎.chloggen/mx-psi_counter-hostname.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: breaking
3+
4+
# The name of the component (e.g. pkg/quantile)
5+
component: pkg/otlp/metrics
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Change signature of `NewTranslator` to accept `component.TelemetrySettings` instead of `zap.Logger`
9+
10+
# The PR related to this change
11+
issues: [218]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

‎LICENSE-3rdparty.csv‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,24 @@ pkg/otlp/metrics,github.com/golang/protobuf/ptypes,BSD-3-Clause,Copyright 2010 T
173173
pkg/otlp/metrics,github.com/golang/protobuf/ptypes/any,BSD-3-Clause,Copyright 2010 The Go Authors. All rights reserved
174174
pkg/otlp/metrics,github.com/golang/protobuf/ptypes/duration,BSD-3-Clause,Copyright 2010 The Go Authors. All rights reserved
175175
pkg/otlp/metrics,github.com/golang/protobuf/ptypes/timestamp,BSD-3-Clause,Copyright 2010 The Go Authors. All rights reserved
176+
pkg/otlp/metrics,github.com/hashicorp/go-version,MPL-2.0,"copyright doctrines of fair use, fair dealing, or other equivalents"
176177
pkg/otlp/metrics,github.com/json-iterator/go,MIT,Copyright (c) 2016 json-iterator
178+
pkg/otlp/metrics,github.com/knadh/koanf/maps,MIT,"Copyright (c) 2019, Kailash Nadh. https://github.com/knadh"
179+
pkg/otlp/metrics,github.com/knadh/koanf/providers/confmap,MIT,"Copyright (c) 2019, Kailash Nadh. https://github.com/knadh"
180+
pkg/otlp/metrics,github.com/knadh/koanf/v2,MIT,"Copyright (c) 2019, Kailash Nadh. https://github.com/knadh"
181+
pkg/otlp/metrics,github.com/mitchellh/copystructure,MIT,Copyright (c) 2014 Mitchell Hashimoto
182+
pkg/otlp/metrics,github.com/mitchellh/mapstructure,MIT,Copyright (c) 2013 Mitchell Hashimoto
183+
pkg/otlp/metrics,github.com/mitchellh/reflectwalk,MIT,Copyright (c) 2013 Mitchell Hashimoto
177184
pkg/otlp/metrics,github.com/modern-go/concurrent,Apache-2.0,Copyright (c) 2018 Tao Wen
178185
pkg/otlp/metrics,github.com/modern-go/reflect2,Apache-2.0,Copyright (c) 2018 Tao Wen
179186
pkg/otlp/metrics,github.com/patrickmn/go-cache,MIT,"Copyright (c) 2012-2017 Patrick Mylund Nielsen and the go-cache contributors | This is a list of people who have contributed code to go-cache. They, or their | employers, are the copyright holders of the contributed code. Contributed code | is subject to the license restrictions listed in LICENSE (as they were when the | code was contributed.) | Dustin Sallings <[email protected]> | Jason Mooberry <[email protected]> | Sergey Shepelev <[email protected]> | Alex Edwards <[email protected]>"
180187
pkg/otlp/metrics,github.com/philhofer/fwd,MIT,"Copyright (c) 2014-2015, Philip Hofer"
181188
pkg/otlp/metrics,github.com/tinylib/msgp/msgp,MIT,Copyright (c) 2014 Philip Hofer | Copyright (c) 2009 The Go Authors (license at http://golang.org) where indicated
189+
pkg/otlp/metrics,go.opentelemetry.io/collector/component,Apache-2.0,Copyright The OpenTelemetry Authors
190+
pkg/otlp/metrics,go.opentelemetry.io/collector/config/configtelemetry,Apache-2.0,Copyright The OpenTelemetry Authors
191+
pkg/otlp/metrics,go.opentelemetry.io/collector/confmap,Apache-2.0,Copyright The OpenTelemetry Authors
192+
pkg/otlp/metrics,go.opentelemetry.io/collector/confmap/internal/mapstructure,Apache-2.0,Copyright The OpenTelemetry Authors
193+
pkg/otlp/metrics,go.opentelemetry.io/collector/featuregate,Apache-2.0,Copyright The OpenTelemetry Authors
182194
pkg/otlp/metrics,go.opentelemetry.io/collector/pdata/internal,Apache-2.0,Copyright The OpenTelemetry Authors
183195
pkg/otlp/metrics,go.opentelemetry.io/collector/pdata/internal/data,Apache-2.0,Copyright The OpenTelemetry Authors
184196
pkg/otlp/metrics,go.opentelemetry.io/collector/pdata/internal/data/protogen/collector/logs/v1,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -194,6 +206,16 @@ pkg/otlp/metrics,go.opentelemetry.io/collector/pdata/internal/otlp,Apache-2.0,Co
194206
pkg/otlp/metrics,go.opentelemetry.io/collector/pdata/pcommon,Apache-2.0,Copyright The OpenTelemetry Authors
195207
pkg/otlp/metrics,go.opentelemetry.io/collector/pdata/pmetric,Apache-2.0,Copyright The OpenTelemetry Authors
196208
pkg/otlp/metrics,go.opentelemetry.io/collector/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
209+
pkg/otlp/metrics,go.opentelemetry.io/otel/attribute,Apache-2.0,Copyright The OpenTelemetry Authors
210+
pkg/otlp/metrics,go.opentelemetry.io/otel/codes,Apache-2.0,Copyright The OpenTelemetry Authors
211+
pkg/otlp/metrics,go.opentelemetry.io/otel/internal,Apache-2.0,Copyright The OpenTelemetry Authors
212+
pkg/otlp/metrics,go.opentelemetry.io/otel/internal/attribute,Apache-2.0,Copyright The OpenTelemetry Authors
213+
pkg/otlp/metrics,go.opentelemetry.io/otel/metric,Apache-2.0,Copyright The OpenTelemetry Authors
214+
pkg/otlp/metrics,go.opentelemetry.io/otel/metric/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
215+
pkg/otlp/metrics,go.opentelemetry.io/otel/metric/noop,Apache-2.0,Copyright The OpenTelemetry Authors
216+
pkg/otlp/metrics,go.opentelemetry.io/otel/trace,Apache-2.0,Copyright The OpenTelemetry Authors
217+
pkg/otlp/metrics,go.opentelemetry.io/otel/trace/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
218+
pkg/otlp/metrics,go.opentelemetry.io/otel/trace/noop,Apache-2.0,Copyright The OpenTelemetry Authors
197219
pkg/otlp/metrics,go.uber.org/multierr,MIT,"Copyright (c) 2017-2021 Uber Technologies, Inc"
198220
pkg/otlp/metrics,go.uber.org/zap,MIT,"Copyright (c) 2016-2017 Uber Technologies, Inc"
199221
pkg/otlp/metrics,go.uber.org/zap/buffer,MIT,"Copyright (c) 2016-2017 Uber Technologies, Inc"

‎pkg/otlp/metrics/go.mod‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
github.com/lightstep/go-expohisto v1.0.0
1313
github.com/patrickmn/go-cache v2.1.0+incompatible
1414
github.com/stretchr/testify v1.8.4
15+
go.opentelemetry.io/collector/component v0.91.0
1516
go.opentelemetry.io/collector/pdata v1.0.0
1617
go.uber.org/zap v1.26.0
1718
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
@@ -21,13 +22,26 @@ require (
2122
github.com/davecgh/go-spew v1.1.1 // indirect
2223
github.com/dustin/go-humanize v1.0.1 // indirect
2324
github.com/gogo/protobuf v1.3.2 // indirect
25+
github.com/hashicorp/go-version v1.6.0 // indirect
2426
github.com/json-iterator/go v1.1.12 // indirect
27+
github.com/knadh/koanf/maps v0.1.1 // indirect
28+
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
29+
github.com/knadh/koanf/v2 v2.0.1 // indirect
30+
github.com/mitchellh/copystructure v1.2.0 // indirect
31+
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
32+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2533
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2634
github.com/modern-go/reflect2 v1.0.2 // indirect
2735
github.com/philhofer/fwd v1.1.2 // indirect
2836
github.com/pmezard/go-difflib v1.0.0 // indirect
2937
github.com/tinylib/msgp v1.1.8 // indirect
38+
go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect
39+
go.opentelemetry.io/collector/confmap v0.91.0 // indirect
40+
go.opentelemetry.io/collector/featuregate v1.0.0 // indirect
3041
go.opentelemetry.io/collector/semconv v0.90.1 // indirect
42+
go.opentelemetry.io/otel v1.21.0 // indirect
43+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
44+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
3145
go.uber.org/multierr v1.11.0 // indirect
3246
golang.org/x/net v0.18.0 // indirect
3347
golang.org/x/sys v0.14.0 // indirect

‎pkg/otlp/metrics/go.sum‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,40 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
77
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
88
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
99
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
10+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
11+
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
1012
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1113
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
1214
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
1315
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
1416
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
1517
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
16-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
18+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1719
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1820
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
1921
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
22+
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
23+
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
2024
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
2125
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
2226
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
2327
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
28+
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
29+
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
30+
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
31+
github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU=
32+
github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
33+
github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
2434
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
2535
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
2636
github.com/lightstep/go-expohisto v1.0.0 h1:UPtTS1rGdtehbbAF7o/dhkWLTDI73UifG8LbfQI7cA4=
2737
github.com/lightstep/go-expohisto v1.0.0/go.mod h1:xDXD0++Mu2FOaItXtdDfksfgxfV0z1TMPa+e/EUd0cs=
38+
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
39+
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
40+
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY=
41+
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
42+
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
43+
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
2844
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
2945
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
3046
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -49,10 +65,24 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w
4965
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
5066
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
5167
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
68+
go.opentelemetry.io/collector/component v0.91.0 h1:aBT1i2zGyfh9PalYJLfXVvQp+osHyalwyDFselI1CtA=
69+
go.opentelemetry.io/collector/component v0.91.0/go.mod h1:2KBHvjNFdU7oOjsObQeC4Ta2Ef607OISU5obznW00fw=
70+
go.opentelemetry.io/collector/config/configtelemetry v0.91.0 h1:mEwvqrYfwUJ7LwYfpcF9M8z7LHFoYaKhEPhnERD/88E=
71+
go.opentelemetry.io/collector/config/configtelemetry v0.91.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU=
72+
go.opentelemetry.io/collector/confmap v0.91.0 h1:7U2MT+u74oEzq/WWrpXSLKB7nX5jPNC4drwtQdYfwKk=
73+
go.opentelemetry.io/collector/confmap v0.91.0/go.mod h1:uxV+fZ85kG31oovL6Cl3fAMQ3RRPwUvfAbbA9WT1Yhk=
74+
go.opentelemetry.io/collector/featuregate v1.0.0 h1:5MGqe2v5zxaoo73BUOvUTunftX5J8RGrbFsC2Ha7N3g=
75+
go.opentelemetry.io/collector/featuregate v1.0.0/go.mod h1:xGbRuw+GbutRtVVSEy3YR2yuOlEyiUMhN2M9DJljgqY=
5276
go.opentelemetry.io/collector/pdata v1.0.0 h1:ECP2jnLztewsHmL1opL8BeMtWVc7/oSlKNhfY9jP8ec=
5377
go.opentelemetry.io/collector/pdata v1.0.0/go.mod h1:TsDFgs4JLNG7t6x9D8kGswXUz4mme+MyNChHx8zSF6k=
5478
go.opentelemetry.io/collector/semconv v0.90.1 h1:2fkQZbefQBbIcNb9Rk1mRcWlFZgQOk7CpST1e1BK8eg=
5579
go.opentelemetry.io/collector/semconv v0.90.1/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw=
80+
go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
81+
go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
82+
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
83+
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
84+
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
85+
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
5686
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
5787
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
5888
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

‎pkg/otlp/metrics/histograms_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
13+
"go.opentelemetry.io/collector/component/componenttest"
1314
"go.uber.org/zap"
1415
"go.uber.org/zap/zapcore"
1516
"go.uber.org/zap/zaptest/observer"
@@ -85,7 +86,7 @@ func TestDeltaHistogramTranslatorOptions(t *testing.T) {
8586

8687
for _, testinstance := range tests {
8788
t.Run(testinstance.name, func(t *testing.T) {
88-
translator, err := NewTranslator(zap.NewNop(), testinstance.options...)
89+
translator, err := NewTranslator(componenttest.NewNopTelemetrySettings(), testinstance.options...)
8990
if testinstance.err != "" {
9091
assert.EqualError(t, err, testinstance.err)
9192
return
@@ -150,7 +151,7 @@ func TestCumulativeHistogramTranslatorOptions(t *testing.T) {
150151

151152
for _, testinstance := range tests {
152153
t.Run(testinstance.name, func(t *testing.T) {
153-
translator, err := NewTranslator(zap.NewNop(), testinstance.options...)
154+
translator, err := NewTranslator(componenttest.NewNopTelemetrySettings(), testinstance.options...)
154155
require.NoError(t, err)
155156
AssertTranslatorMap(t, translator, testinstance.otlpfile, testinstance.ddogfile)
156157
})
@@ -277,9 +278,10 @@ func TestExponentialHistogramTranslatorOptions(t *testing.T) {
277278

278279
for _, testinstance := range tests {
279280
t.Run(testinstance.name, func(t *testing.T) {
281+
set := componenttest.NewNopTelemetrySettings()
280282
core, observed := observer.New(zapcore.DebugLevel)
281-
testLogger := zap.New(core)
282-
translator, err := NewTranslator(testLogger, testinstance.options...)
283+
set.Logger = zap.New(core)
284+
translator, err := NewTranslator(set, testinstance.options...)
283285
require.NoError(t, err)
284286
AssertTranslatorMap(t, translator, testinstance.otlpfile, testinstance.ddogfile)
285287
assert.Equal(t, testinstance.expectedUnknownMetricType, observed.FilterMessage("Unknown or unsupported metric type").Len())

‎pkg/otlp/metrics/metrics_translator.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"strings"
2424
"time"
2525

26+
"go.opentelemetry.io/collector/component"
2627
"go.opentelemetry.io/collector/pdata/pcommon"
2728
"go.opentelemetry.io/collector/pdata/pmetric"
2829
"go.uber.org/zap"
@@ -62,7 +63,7 @@ type Metadata struct {
6263
}
6364

6465
// NewTranslator creates a new translator with given options.
65-
func NewTranslator(logger *zap.Logger, options ...TranslatorOption) (*Translator, error) {
66+
func NewTranslator(set component.TelemetrySettings, options ...TranslatorOption) (*Translator, error) {
6667
cfg := translatorConfig{
6768
HistMode: HistogramModeDistributions,
6869
SendHistogramAggregations: false,
@@ -90,7 +91,7 @@ func NewTranslator(logger *zap.Logger, options ...TranslatorOption) (*Translator
9091
cache := newTTLCache(cfg.sweepInterval, cfg.deltaTTL)
9192
return &Translator{
9293
prevPts: cache,
93-
logger: logger.With(zap.String("component", "metrics translator")),
94+
logger: set.Logger.With(zap.String("component", "metrics translator")),
9495
cfg: cfg,
9596
}, nil
9697
}

‎pkg/otlp/metrics/metrics_translator_benchmark_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
"github.com/stretchr/testify/assert"
2424
"github.com/stretchr/testify/require"
25+
"go.opentelemetry.io/collector/component/componenttest"
2526
"go.opentelemetry.io/collector/pdata/pmetric"
2627
"go.uber.org/zap"
2728

@@ -52,8 +53,10 @@ func newBenchmarkTranslator(b *testing.B, logger *zap.Logger, opts ...Translator
5253
WithNumberMode(NumberModeCumulativeToDelta),
5354
}, opts...)
5455

56+
set := componenttest.NewNopTelemetrySettings()
57+
set.Logger = logger
5558
tr, err := NewTranslator(
56-
logger,
59+
set,
5760
options...,
5861
)
5962

‎pkg/otlp/metrics/metrics_translator_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
"github.com/stretchr/testify/assert"
2424
"github.com/stretchr/testify/require"
25+
"go.opentelemetry.io/collector/component/componenttest"
2526
"go.opentelemetry.io/collector/pdata/pcommon"
2627
"go.opentelemetry.io/collector/pdata/pmetric"
2728
"go.uber.org/zap"
@@ -105,8 +106,10 @@ func newTranslator(t *testing.T, logger *zap.Logger) *Translator {
105106
WithHistogramAggregations(),
106107
}
107108

109+
set := componenttest.NewNopTelemetrySettings()
110+
set.Logger = logger
108111
tr, err := NewTranslator(
109-
logger,
112+
set,
110113
options...,
111114
)
112115

@@ -432,7 +435,7 @@ func TestMapRuntimeMetricsHasMapping(t *testing.T) {
432435
func TestMapRuntimeMetricsHasMappingCollector(t *testing.T) {
433436
ctx := context.Background()
434437
tr, err := NewTranslator(
435-
zap.NewNop(),
438+
componenttest.NewNopTelemetrySettings(),
436439
WithRemapping(),
437440
)
438441
require.NoError(t, err)
@@ -485,7 +488,7 @@ func TestMapSumRuntimeMetricWithAttributesHasMapping(t *testing.T) {
485488
func TestMapSumRuntimeMetricWithAttributesHasMappingCollector(t *testing.T) {
486489
ctx := context.Background()
487490
tr, err := NewTranslator(
488-
zap.NewNop(),
491+
componenttest.NewNopTelemetrySettings(),
489492
WithRemapping(),
490493
)
491494
require.NoError(t, err)
@@ -733,7 +736,7 @@ func TestMapRuntimeMetricsNoMapping(t *testing.T) {
733736
func TestMapSystemMetrics(t *testing.T) {
734737
ctx := context.Background()
735738
tr, err := NewTranslator(
736-
zap.NewNop(),
739+
componenttest.NewNopTelemetrySettings(),
737740
WithRemapping(),
738741
)
739742
require.NoError(t, err)

‎pkg/otlp/metrics/mixed_metrics_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
13+
"go.opentelemetry.io/collector/component/componenttest"
1314
"go.uber.org/zap"
1415
"go.uber.org/zap/zapcore"
1516
"go.uber.org/zap/zaptest/observer"
@@ -142,9 +143,10 @@ func TestMapMetrics(t *testing.T) {
142143

143144
for _, testinstance := range tests {
144145
t.Run(testinstance.name, func(t *testing.T) {
146+
set := componenttest.NewNopTelemetrySettings()
145147
core, observed := observer.New(zapcore.DebugLevel)
146-
testLogger := zap.New(core)
147-
translator, err := NewTranslator(testLogger, testinstance.options...)
148+
set.Logger = zap.New(core)
149+
translator, err := NewTranslator(set, testinstance.options...)
148150
require.NoError(t, err)
149151
AssertTranslatorMap(t, translator, testinstance.otlpfile, testinstance.ddogfile)
150152
assert.Equal(t, testinstance.expectedUnknownMetricType, observed.FilterMessage("Unknown or unsupported metric type").Len())

‎pkg/otlp/metrics/summary_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010

1111
"github.com/stretchr/testify/require"
12-
"go.uber.org/zap"
12+
"go.opentelemetry.io/collector/component/componenttest"
1313
)
1414

1515
func TestSummaryMetrics(t *testing.T) {
@@ -56,7 +56,7 @@ func TestSummaryMetrics(t *testing.T) {
5656

5757
for _, testinstance := range tests {
5858
t.Run(testinstance.name, func(t *testing.T) {
59-
translator, err := NewTranslator(zap.NewNop(), testinstance.options...)
59+
translator, err := NewTranslator(componenttest.NewNopTelemetrySettings(), testinstance.options...)
6060
require.NoError(t, err)
6161
AssertTranslatorMap(t, translator, testinstance.otlpfile, testinstance.ddogfile)
6262
})

0 commit comments

Comments
 (0)