Skip to content

Commit c3891df

Browse files
crobert-1crobert-1
authored
Merge branch 'main' into changelog_v0.126.0
2 parents 52bf23e + 7374de3 commit c3891df

File tree

36 files changed

+1225
-1156
lines changed

36 files changed

+1225
-1156
lines changed

‎.github/workflows/ansible.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ jobs:
6161
matrix:
6262
ansible:
6363
# Testing only the versions currently supported per https://endoflife.date/ansible
64-
- ansible~=9.2.0
65-
- ansible~=8.7.0
64+
- ansible~=11.6.0
65+
- ansible~=10.7.0
6666
distro:
6767
- amazonlinux2023
68-
- centos8
68+
- centos9
6969
- debian11
7070
- debian12
7171
- ubuntu2004
@@ -90,12 +90,13 @@ jobs:
9090
- name: Set up Python 3.
9191
uses: actions/setup-python@v5
9292
with:
93-
python-version: '3.11'
93+
python-version: '3.13'
9494
cache: 'pip'
9595
cache-dependency-path: "${{ github.workspace }}/requirements.txt"
9696

9797
- name: Install test dependencies.
9898
run: |
99+
python -m pip install --upgrade setuptools
99100
# workaround for https://github.com/yaml/pyyaml/issues/724
100101
pip3 install 'wheel==0.40.0'
101102
pip3 install 'Cython<3.0' 'PyYaml~=5.0' --no-build-isolation
@@ -118,8 +119,8 @@ jobs:
118119
matrix:
119120
ansible:
120121
# Testing only the versions currently supported per https://endoflife.date/ansible
121-
- ansible~=9.2.0
122-
- ansible~=8.7.0
122+
- ansible~=11.6.0
123+
- ansible~=10.7.0
123124
distro:
124125
- "2016"
125126
- "2019"

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ and the [opentelemetry-collector-contrib v0.126.0](https://github.com/open-telem
3131

3232
### 🚩 Deprecations 🚩
3333

34+
- (Splunk) `receiver/lightprometheus`: The following configurable `resource_attributes` are being renamed to match semantic conventions. ([#6257](https://github.com/signalfx/splunk-otel-collector/pull/6257))
35+
- `net.host.name` -> `server.address`
36+
- `net.host.port` -> `server.port`
37+
- `http.scheme` -> `url.scheme`
38+
39+
`net.host.name`, `net.host.port`, and `http.scheme` are now considered to be deprecated and will be removed in a future release.
40+
3441
- (Contrib) `googlecloudpubsubreceiver`: Add deprecation warning for the build-in encoders ([#39371](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/39371))
3542
The build-in encoders `cloud_logging` and `raw_text` both have encoding extension alternatives and will be removed
3643
in version v0.132.0 of the collector.

‎deployments/ansible/molecule/config/vagrant.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ driver:
1111
platforms:
1212
- name: focal64
1313
box: ubuntu/focal64
14-
- name: centos8
15-
box: centos/8
14+
- name: centos9
15+
box: centos/stream9
1616
- name: bookworm64
1717
box: debian/bookworm64
1818
provisioner:

‎deployments/ansible/molecule/default/Dockerfile.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,8 @@ RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
4848
VOLUME [ "/sys/fs/cgroup" ]
4949
CMD ["/sbin/init"]
5050
{% endif %}
51+
52+
# Workaround for Ansible Molecule bug causing sudo actions to fail.
53+
# https://github.com/ansible/molecule/issues/4365
54+
# https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6#issuecomment-2805378491
55+
RUN chmod 0400 /etc/shadow

‎docker/kong/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM kong/kong-gateway:3.10.0.1
1+
FROM kong/kong-gateway:3.10.0.2
22

33
COPY kong.yml /kong/declarative/kong.yml
44

‎go.mod

Lines changed: 245 additions & 243 deletions
Large diffs are not rendered by default.

‎go.sum

Lines changed: 518 additions & 510 deletions
Large diffs are not rendered by default.

‎internal/receiver/lightprometheusreceiver/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ The following settings can be optionally configured:
3535
- `enabled`: (default: true)
3636
- `service.instance.id`:
3737
- `enabled`: (default: true)
38-
- `net.host.name`:
38+
- `server.address`:
3939
- `enabled`: (default: false)
40-
- `net.host.port`:
40+
- `server.port`:
4141
- `enabled`: (default: false)
42-
- `http.scheme`:
42+
- `url.scheme`:
4343
- `enabled`: (default: false)
4444
- [HTTP Client Configuration options](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp#client-configuration)
4545

‎internal/receiver/lightprometheusreceiver/config.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func createDefaultConfig() component.Config {
2828
// set the default collection interval to 30 seconds which is half of the
2929
// lowest job frequency of 1 minute
3030
scs.CollectionInterval = time.Second * 30
31+
3132
return &Config{
3233
ControllerConfig: scs,
3334
ClientConfig: confighttp.NewDefaultClientConfig(),
@@ -37,8 +38,12 @@ func createDefaultConfig() component.Config {
3738
NetHostName: ResourceAttributeConfig{Enabled: false},
3839
NetHostPort: ResourceAttributeConfig{Enabled: false},
3940
HTTPScheme: ResourceAttributeConfig{Enabled: false},
41+
ServerAddress: ResourceAttributeConfig{Enabled: false},
42+
ServerPort: ResourceAttributeConfig{Enabled: false},
43+
URLScheme: ResourceAttributeConfig{Enabled: false},
4044
},
4145
}
46+
4247
}
4348

4449
// ResourceAttributeConfig provides configuration for a resource attribute.
@@ -50,6 +55,9 @@ type ResourceAttributeConfig struct {
5055
type ResourceAttributesConfig struct {
5156
ServiceName ResourceAttributeConfig `mapstructure:"service.name"`
5257
ServiceInstanceID ResourceAttributeConfig `mapstructure:"service.instance.id"`
58+
ServerAddress ResourceAttributeConfig `mapstructure:"server.address"`
59+
ServerPort ResourceAttributeConfig `mapstructure:"server.port"`
60+
URLScheme ResourceAttributeConfig `mapstructure:"url.scheme"`
5361
NetHostName ResourceAttributeConfig `mapstructure:"net.host.name"`
5462
NetHostPort ResourceAttributeConfig `mapstructure:"net.host.port"`
5563
HTTPScheme ResourceAttributeConfig `mapstructure:"http.scheme"`

‎internal/receiver/lightprometheusreceiver/config_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ func TestValidConfig(t *testing.T) {
4747
ResourceAttributes: ResourceAttributesConfig{
4848
ServiceInstanceID: ResourceAttributeConfig{Enabled: false},
4949
ServiceName: ResourceAttributeConfig{Enabled: false},
50-
NetHostName: ResourceAttributeConfig{Enabled: true},
51-
NetHostPort: ResourceAttributeConfig{Enabled: false},
52-
HTTPScheme: ResourceAttributeConfig{Enabled: false},
50+
ServerAddress: ResourceAttributeConfig{Enabled: true},
51+
ServerPort: ResourceAttributeConfig{Enabled: false},
52+
URLScheme: ResourceAttributeConfig{Enabled: false},
5353
},
5454
}
5555
expectedCfg.ClientConfig.Endpoint = "http://localhost:9090/metrics"

‎internal/receiver/lightprometheusreceiver/scraper.go

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"go.opentelemetry.io/collector/pdata/pcommon"
3030
"go.opentelemetry.io/collector/pdata/pmetric"
3131
"go.opentelemetry.io/collector/receiver"
32-
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
32+
conventions "go.opentelemetry.io/collector/semconv/v1.25.0"
3333
"go.uber.org/zap"
3434
)
3535

@@ -55,6 +55,16 @@ func newScraper(
5555
}
5656

5757
func (s *scraper) start(ctx context.Context, host component.Host) error {
58+
if s.cfg.ResourceAttributes.NetHostName.Enabled {
59+
s.settings.Logger.Warn("[Deprecated] The resource attribute `net.host.name` has been renamed `server.address.name` to match semantic conventions in `v0.126.0`. Please update references. `net.host.name` will be removed in a future release.")
60+
}
61+
if s.cfg.ResourceAttributes.NetHostPort.Enabled {
62+
s.settings.Logger.Warn("[Deprecated] The resource attribute `net.host.port` has been renamed `server.port` to match semantic conventions in `v0.126.0`. Please update references. `net.host.port` will be removed in a future release.")
63+
}
64+
if s.cfg.ResourceAttributes.HTTPScheme.Enabled {
65+
s.settings.Logger.Warn("[Deprecated] The resource attribute `http.scheme` has been renamed `url.scheme` to match semantic conventions in `v0.126.0`. Please update references. `http.scheme` will be removed in a future release.")
66+
}
67+
5868
s.startTime = pcommon.NewTimestampFromTime(time.Now())
5969
var err error
6070
s.client, err = s.cfg.ClientConfig.ToClient(ctx, host, s.settings)
@@ -100,18 +110,31 @@ func (s *scraper) fetchPrometheusMetrics(fetch fetcher) (pmetric.Metrics, error)
100110
if s.cfg.ResourceAttributes.ServiceName.Enabled {
101111
res.Attributes().PutStr(conventions.AttributeServiceName, s.name)
102112
}
113+
103114
if s.cfg.ResourceAttributes.NetHostName.Enabled {
104115
res.Attributes().PutStr(conventions.AttributeNetHostName, u.Host)
105116
}
117+
if s.cfg.ResourceAttributes.ServerAddress.Enabled {
118+
res.Attributes().PutStr(conventions.AttributeServerAddress, u.Host)
119+
}
120+
106121
if s.cfg.ResourceAttributes.ServiceInstanceID.Enabled {
107122
res.Attributes().PutStr(conventions.AttributeServiceInstanceID, u.Host)
108123
}
124+
109125
if s.cfg.ResourceAttributes.NetHostPort.Enabled {
110126
res.Attributes().PutStr(conventions.AttributeNetHostPort, u.Port())
111127
}
128+
if s.cfg.ResourceAttributes.ServerPort.Enabled {
129+
res.Attributes().PutStr(conventions.AttributeServerPort, u.Port())
130+
}
131+
112132
if s.cfg.ResourceAttributes.HTTPScheme.Enabled {
113133
res.Attributes().PutStr(conventions.AttributeHTTPScheme, u.Scheme)
114134
}
135+
if s.cfg.ResourceAttributes.URLScheme.Enabled {
136+
res.Attributes().PutStr(conventions.AttributeURLScheme, u.Scheme)
137+
}
115138
s.convertMetricFamilies(metricFamilies, rm)
116139
return m, nil
117140
}

‎internal/receiver/lightprometheusreceiver/scraper_test.go

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"go.opentelemetry.io/collector/confmap/xconfmap"
3131
"go.opentelemetry.io/collector/pdata/pmetric"
3232
"go.opentelemetry.io/collector/receiver/receivertest"
33-
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
33+
conventions "go.opentelemetry.io/collector/semconv/v1.25.0"
3434
)
3535

3636
func TestScraper(t *testing.T) {
@@ -53,6 +53,24 @@ func TestScraper(t *testing.T) {
5353
},
5454
{
5555
name: "all_resource_attributes",
56+
cfg: func() *Config {
57+
cfg := createDefaultConfig().(*Config)
58+
cfg.ResourceAttributes.ServiceName.Enabled = true
59+
cfg.ResourceAttributes.URLScheme.Enabled = true
60+
cfg.ResourceAttributes.ServerPort.Enabled = true
61+
cfg.ResourceAttributes.ServerAddress.Enabled = true
62+
return cfg
63+
}(),
64+
expectedResourceAttributes: map[string]any{
65+
conventions.AttributeServiceName: "",
66+
conventions.AttributeServiceInstanceID: u.Host,
67+
conventions.AttributeServerAddress: u.Host,
68+
conventions.AttributeServerPort: u.Port(),
69+
conventions.AttributeURLScheme: "http",
70+
},
71+
},
72+
{
73+
name: "deprecated_resource_attributes",
5674
cfg: func() *Config {
5775
cfg := createDefaultConfig().(*Config)
5876
cfg.ResourceAttributes.ServiceName.Enabled = true

‎internal/receiver/lightprometheusreceiver/testdata/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ lightprometheus:
66
enabled: false
77
service.instance.id:
88
enabled: false
9-
net.host.name:
9+
server.address:
1010
enabled: true

‎internal/signalfx-agent/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ require (
5454
github.com/snowflakedb/gosnowflake v1.14.0
5555
github.com/stretchr/testify v1.10.0
5656
github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f
57-
github.com/vmware/govmomi v0.50.0
58-
golang.org/x/net v0.39.0 // indirect
59-
golang.org/x/sync v0.13.0
57+
github.com/vmware/govmomi v0.51.0
58+
golang.org/x/net v0.40.0 // indirect
59+
golang.org/x/sync v0.14.0
6060
golang.org/x/sys v0.33.0
6161
golang.org/x/tools v0.30.0 // indirect
6262
google.golang.org/grpc v1.72.0
@@ -85,7 +85,7 @@ require (
8585
github.com/influxdata/telegraf v1.30.1
8686
github.com/microsoft/go-mssqldb v1.8.0
8787
github.com/smartystreets/goconvey v1.8.1
88-
go.opentelemetry.io/collector/pdata v1.31.0
88+
go.opentelemetry.io/collector/pdata v1.32.0
8989
)
9090

9191
require (
@@ -218,12 +218,12 @@ require (
218218
go.opentelemetry.io/otel/trace v1.35.0 // indirect
219219
go.uber.org/multierr v1.11.0 // indirect
220220
go.uber.org/zap v1.27.0 // indirect
221-
golang.org/x/crypto v0.37.0 // indirect
221+
golang.org/x/crypto v0.38.0 // indirect
222222
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
223223
golang.org/x/mod v0.23.0 // indirect
224224
golang.org/x/oauth2 v0.26.0 // indirect
225-
golang.org/x/term v0.31.0 // indirect
226-
golang.org/x/text v0.24.0 // indirect
225+
golang.org/x/term v0.32.0 // indirect
226+
golang.org/x/text v0.25.0 // indirect
227227
golang.org/x/time v0.9.0 // indirect
228228
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
229229
gonum.org/v1/gonum v0.16.0 // indirect

‎internal/signalfx-agent/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@ github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f h1:QatZ4lsJBY3x1+
568568
github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f/go.mod h1:BNLmYJ8oMJPIPpNx5968jCyUhwEU1XT3YsuOqtbo5qo=
569569
github.com/vjeantet/grok v1.0.1 h1:2rhIR7J4gThTgcZ1m2JY4TrJZNgjn985U28kT2wQrJ4=
570570
github.com/vjeantet/grok v1.0.1/go.mod h1:ax1aAchzC6/QMXMcyzHQGZWaW1l195+uMYIkCWPCNIo=
571-
github.com/vmware/govmomi v0.50.0 h1:vFOnUCBCX3m3MgTKfBp68Pz5gsHvKkO07Y2wCGYYQOM=
572-
github.com/vmware/govmomi v0.50.0/go.mod h1:Z5uo7z0kRhVV00E4gfbUGwUaXIKTgqngsT+t/mIDpcI=
571+
github.com/vmware/govmomi v0.51.0 h1:n3RLS9aw/irTOKbiIyJzAb6rOat4YOVv/uDoRsNTSQI=
572+
github.com/vmware/govmomi v0.51.0/go.mod h1:3ywivawGRfMP2SDCeyKqxTl2xNIHTXF0ilvp72dot5A=
573573
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
574574
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
575575
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -585,8 +585,8 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD
585585
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
586586
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
587587
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
588-
go.opentelemetry.io/collector/pdata v1.31.0 h1:P5WuLr1l2JcIvr6Dw2hl01ltp2ZafPnC4Isv+BLTBqU=
589-
go.opentelemetry.io/collector/pdata v1.31.0/go.mod h1:m41io9nWpy7aCm/uD1L9QcKiZwOP0ldj83JEA34dmlk=
588+
go.opentelemetry.io/collector/pdata v1.32.0 h1:hBzlJV1rujr1UdD2CBy2gmaIKtC15ysg/z+x8F3McQA=
589+
go.opentelemetry.io/collector/pdata v1.32.0/go.mod h1:m41io9nWpy7aCm/uD1L9QcKiZwOP0ldj83JEA34dmlk=
590590
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
591591
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
592592
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
@@ -633,8 +633,8 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y
633633
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
634634
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
635635
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
636-
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
637-
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
636+
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
637+
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
638638
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
639639
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
640640
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -664,8 +664,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
664664
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
665665
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
666666
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
667-
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
668-
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
667+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
668+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
669669
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
670670
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
671671
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -675,8 +675,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
675675
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
676676
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
677677
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
678-
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
679-
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
678+
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
679+
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
680680
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
681681
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
682682
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -714,17 +714,17 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR
714714
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
715715
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
716716
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
717-
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
718-
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
717+
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
718+
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
719719
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
720720
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
721721
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
722722
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
723723
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
724724
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
725725
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
726-
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
727-
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
726+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
727+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
728728
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
729729
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
730730
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎internal/tools/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/google/addlicense v1.1.1
99
github.com/jstemmer/go-junit-report v1.0.0
1010
github.com/tcnksm/ghr v0.16.2
11-
go.opentelemetry.io/collector/cmd/mdatagen v0.125.0
11+
go.opentelemetry.io/collector/cmd/mdatagen v0.126.0
1212
golang.org/x/tools v0.33.0
1313
golang.org/x/vuln v1.1.4
1414
)
@@ -200,13 +200,13 @@ require (
200200
go-simpler.org/musttag v0.13.0 // indirect
201201
go-simpler.org/sloglint v0.9.0 // indirect
202202
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
203-
go.opentelemetry.io/collector/component v1.31.0 // indirect
204-
go.opentelemetry.io/collector/confmap v1.31.0 // indirect
205-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.31.0 // indirect
206-
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
207-
go.opentelemetry.io/collector/filter v0.125.0 // indirect
208-
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
209-
go.opentelemetry.io/collector/pdata v1.31.0 // indirect
203+
go.opentelemetry.io/collector/component v1.32.0 // indirect
204+
go.opentelemetry.io/collector/confmap v1.32.0 // indirect
205+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.32.0 // indirect
206+
go.opentelemetry.io/collector/featuregate v1.32.0 // indirect
207+
go.opentelemetry.io/collector/filter v0.126.0 // indirect
208+
go.opentelemetry.io/collector/internal/telemetry v0.126.0 // indirect
209+
go.opentelemetry.io/collector/pdata v1.32.0 // indirect
210210
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
211211
go.opentelemetry.io/otel v1.35.0 // indirect
212212
go.opentelemetry.io/otel/log v0.11.0 // indirect

0 commit comments

Comments
 (0)