Skip to content

Commit a05ae7b

Browse files
rnishtala-sumornishtala-sumo
committed
fix: Use the compression level branch changes to fix tests
1 parent 83a4134 commit a05ae7b

File tree

6 files changed

+56
-16
lines changed

6 files changed

+56
-16
lines changed

‎.chloggen/fix-contrib-tests.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: 'breaking'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: Multiple components
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Multiple components have been updated to fix the failing contrib tests, because of core API changes.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [10467]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎exporter/splunkhecexporter/go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
github.com/testcontainers/testcontainers-go v0.34.0
1515
go.opentelemetry.io/collector/component v0.114.0
1616
go.opentelemetry.io/collector/component/componenttest v0.114.0
17+
go.opentelemetry.io/collector/config/configcompression v1.20.0
1718
go.opentelemetry.io/collector/config/confighttp v0.114.0
1819
go.opentelemetry.io/collector/config/configopaque v1.20.0
1920
go.opentelemetry.io/collector/config/configretry v1.20.0
@@ -92,7 +93,6 @@ require (
9293
github.com/yusufpapurcu/wmi v1.2.4 // indirect
9394
go.opentelemetry.io/collector/client v1.20.0 // indirect
9495
go.opentelemetry.io/collector/config/configauth v0.114.0 // indirect
95-
go.opentelemetry.io/collector/config/configcompression v1.20.0 // indirect
9696
go.opentelemetry.io/collector/config/configtelemetry v0.114.0 // indirect
9797
go.opentelemetry.io/collector/config/internal v0.114.0 // indirect
9898
go.opentelemetry.io/collector/consumer/consumerprofiles v0.114.0 // indirect
@@ -135,3 +135,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
135135
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
136136

137137
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
138+
139+
replace go.opentelemetry.io/collector/config/configcompression => github.com/rnishtala-sumo/opentelemetry-collector/config/configcompression v0.0.0-20241118202008-518d136b719c
140+
141+
replace go.opentelemetry.io/collector/config/confighttp => github.com/rnishtala-sumo/opentelemetry-collector/config/confighttp v0.0.0-20241118202008-518d136b719c

‎exporter/splunkhecexporter/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/datadog/go.mod

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ require (
1010
go.opentelemetry.io/collector/component v0.114.0
1111
go.opentelemetry.io/collector/component/componenttest v0.114.0
1212
go.opentelemetry.io/collector/config/configauth v0.114.0
13+
go.opentelemetry.io/collector/config/configcompression v1.20.0
1314
go.opentelemetry.io/collector/config/confighttp v0.114.0
14-
go.opentelemetry.io/collector/config/confignet v1.20.0
15+
go.opentelemetry.io/collector/config/confignet v1.19.0
1516
go.opentelemetry.io/collector/config/configopaque v1.20.0
1617
go.opentelemetry.io/collector/config/configretry v1.20.0
1718
go.opentelemetry.io/collector/config/configtls v1.20.0
1819
go.opentelemetry.io/collector/confmap v1.20.0
1920
go.opentelemetry.io/collector/exporter v0.114.0
20-
go.opentelemetry.io/collector/featuregate v1.20.0
21+
go.opentelemetry.io/collector/featuregate v1.19.0
2122
go.uber.org/zap v1.27.0
2223
)
2324

@@ -57,14 +58,14 @@ require (
5758
github.com/rs/cors v1.11.1 // indirect
5859
github.com/tinylib/msgp v1.1.8 // indirect
5960
go.opentelemetry.io/collector/client v1.20.0 // indirect
60-
go.opentelemetry.io/collector/config/configcompression v1.20.0 // indirect
6161
go.opentelemetry.io/collector/config/configtelemetry v0.114.0 // indirect
6262
go.opentelemetry.io/collector/config/internal v0.114.0 // indirect
6363
go.opentelemetry.io/collector/consumer v0.114.0 // indirect
6464
go.opentelemetry.io/collector/consumer/consumererror v0.114.0 // indirect
6565
go.opentelemetry.io/collector/extension v0.114.0 // indirect
6666
go.opentelemetry.io/collector/extension/auth v0.114.0 // indirect
6767
go.opentelemetry.io/collector/extension/experimental/storage v0.114.0 // indirect
68+
go.opentelemetry.io/collector/extension/extensiontest v0.114.0 // indirect
6869
go.opentelemetry.io/collector/pdata v1.20.0 // indirect
6970
go.opentelemetry.io/collector/pdata/pprofile v0.114.0 // indirect
7071
go.opentelemetry.io/collector/pipeline v0.114.0 // indirect
@@ -87,3 +88,7 @@ require (
8788
gopkg.in/yaml.v2 v2.4.0 // indirect
8889
gopkg.in/yaml.v3 v3.0.1 // indirect
8990
)
91+
92+
replace go.opentelemetry.io/collector/config/configcompression => github.com/rnishtala-sumo/opentelemetry-collector/config/configcompression v0.0.0-20241118202008-518d136b719c
93+
94+
replace go.opentelemetry.io/collector/config/confighttp => github.com/rnishtala-sumo/opentelemetry-collector/config/confighttp v0.0.0-20241118202008-518d136b719c

‎pkg/datadog/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎testbed/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,3 +438,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ..
438438
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics => ../internal/exp/metrics
439439

440440
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../internal/pdatautil
441+
442+
replace go.opentelemetry.io/collector/config/configcompression => github.com/rnishtala-sumo/opentelemetry-collector/config/configcompression v0.0.0-20241118202008-518d136b719c
443+
444+
replace go.opentelemetry.io/collector/config/confighttp => github.com/rnishtala-sumo/opentelemetry-collector/config/confighttp v0.0.0-20241118202008-518d136b719c

0 commit comments

Comments
 (0)