Skip to content

Commit 3166bac

Browse files
authored
Revert "Update module github.com/prometheus/common to v0.66.0" (#13786)
Reverts #13750 See discussion at open-telemetry/opentelemetry-collector-contrib#42513 (comment) for context
1 parent 6831efd commit 3166bac

File tree

13 files changed

+18
-51
lines changed

13 files changed

+18
-51
lines changed

cmd/otelcorecol/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ require (
5050
github.com/golang/snappy v1.0.0 // indirect
5151
github.com/google/go-tpm v0.9.5 // indirect
5252
github.com/google/uuid v1.6.0 // indirect
53-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5453
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
5554
github.com/hashicorp/go-version v1.7.0 // indirect
5655
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -71,7 +70,7 @@ require (
7170
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
7271
github.com/prometheus/client_golang v1.22.0 // indirect
7372
github.com/prometheus/client_model v0.6.2 // indirect
74-
github.com/prometheus/common v0.66.0 // indirect
73+
github.com/prometheus/common v0.65.0 // indirect
7574
github.com/prometheus/procfs v0.17.0 // indirect
7675
github.com/rs/cors v1.11.1 // indirect
7776
github.com/shirou/gopsutil/v4 v4.25.8 // indirect
@@ -171,7 +170,6 @@ require (
171170
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
172171
google.golang.org/grpc v1.75.0 // indirect
173172
google.golang.org/protobuf v1.36.8 // indirect
174-
gopkg.in/yaml.v2 v2.4.0 // indirect
175173
gopkg.in/yaml.v3 v3.0.1 // indirect
176174
sigs.k8s.io/yaml v1.5.0 // indirect
177175
)

cmd/otelcorecol/go.sum

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

internal/e2e/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/prometheus/common v0.66.0
7+
github.com/prometheus/common v0.65.0
88
github.com/stretchr/testify v1.11.1
99
go.opentelemetry.io/collector v0.134.0
1010
go.opentelemetry.io/collector/component v1.40.0
@@ -70,7 +70,6 @@ require (
7070
github.com/golang/snappy v1.0.0 // indirect
7171
github.com/google/go-tpm v0.9.5 // indirect
7272
github.com/google/uuid v1.6.0 // indirect
73-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
7473
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
7574
github.com/hashicorp/go-version v1.7.0 // indirect
7675
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -159,7 +158,6 @@ require (
159158
gonum.org/v1/gonum v0.16.0 // indirect
160159
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
161160
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
162-
gopkg.in/yaml.v2 v2.4.0 // indirect
163161
gopkg.in/yaml.v3 v3.0.1 // indirect
164162
sigs.k8s.io/yaml v1.5.0 // indirect
165163
)

internal/e2e/go.sum

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

internal/e2e/metric_stability_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"time"
1717

1818
"github.com/prometheus/common/expfmt"
19-
"github.com/prometheus/common/model"
2019
"github.com/stretchr/testify/assert"
2120
"github.com/stretchr/testify/require"
2221

@@ -52,7 +51,7 @@ func assertMetrics(t *testing.T, metricsAddr string, expectedMetrics map[string]
5251
defer resp.Body.Close()
5352

5453
reader := bufio.NewReader(resp.Body)
55-
parser := expfmt.NewTextParser(model.UTF8Validation)
54+
var parser expfmt.TextParser
5655
parsed, err := parser.TextToMetricFamilies(reader)
5756
if err != nil {
5857
return false

otelcol/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ require (
4848
github.com/gobwas/glob v0.2.3 // indirect
4949
github.com/gogo/protobuf v1.3.2 // indirect
5050
github.com/google/uuid v1.6.0 // indirect
51-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5251
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
5352
github.com/hashicorp/go-version v1.7.0 // indirect
5453
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -66,7 +65,7 @@ require (
6665
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
6766
github.com/prometheus/client_golang v1.22.0 // indirect
6867
github.com/prometheus/client_model v0.6.2 // indirect
69-
github.com/prometheus/common v0.66.0 // indirect
68+
github.com/prometheus/common v0.65.0 // indirect
7069
github.com/prometheus/procfs v0.17.0 // indirect
7170
github.com/shirou/gopsutil/v4 v4.25.8 // indirect
7271
github.com/spf13/pflag v1.0.9 // indirect
@@ -119,7 +118,6 @@ require (
119118
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
120119
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
121120
google.golang.org/protobuf v1.36.8 // indirect
122-
gopkg.in/yaml.v2 v2.4.0 // indirect
123121
gopkg.in/yaml.v3 v3.0.1 // indirect
124122
sigs.k8s.io/yaml v1.5.0 // indirect
125123
)

otelcol/go.sum

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

otelcol/otelcoltest/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ require (
3535
github.com/gobwas/glob v0.2.3 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
3737
github.com/google/uuid v1.6.0 // indirect
38-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
3938
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
4039
github.com/hashicorp/go-version v1.7.0 // indirect
4140
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -53,7 +52,7 @@ require (
5352
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
5453
github.com/prometheus/client_golang v1.22.0 // indirect
5554
github.com/prometheus/client_model v0.6.2 // indirect
56-
github.com/prometheus/common v0.66.0 // indirect
55+
github.com/prometheus/common v0.65.0 // indirect
5756
github.com/prometheus/procfs v0.17.0 // indirect
5857
github.com/shirou/gopsutil/v4 v4.25.8 // indirect
5958
github.com/spf13/cobra v1.10.1 // indirect
@@ -122,7 +121,6 @@ require (
122121
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
123122
google.golang.org/grpc v1.75.0 // indirect
124123
google.golang.org/protobuf v1.36.8 // indirect
125-
gopkg.in/yaml.v2 v2.4.0 // indirect
126124
gopkg.in/yaml.v3 v3.0.1 // indirect
127125
sigs.k8s.io/yaml v1.5.0 // indirect
128126
)

otelcol/otelcoltest/go.sum

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

service/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24
55
require (
66
github.com/google/uuid v1.6.0
77
github.com/prometheus/client_model v0.6.2
8-
github.com/prometheus/common v0.66.0
8+
github.com/prometheus/common v0.65.0
99
github.com/shirou/gopsutil/v4 v4.25.8
1010
github.com/stretchr/testify v1.11.1
1111
go.opentelemetry.io/collector v0.134.0
@@ -78,7 +78,6 @@ require (
7878
github.com/gogo/protobuf v1.3.2 // indirect
7979
github.com/golang/snappy v1.0.0 // indirect
8080
github.com/google/go-tpm v0.9.5 // indirect
81-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
8281
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
8382
github.com/hashicorp/go-version v1.7.0 // indirect
8483
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -140,7 +139,6 @@ require (
140139
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
141140
google.golang.org/grpc v1.75.0 // indirect
142141
google.golang.org/protobuf v1.36.8 // indirect
143-
gopkg.in/yaml.v2 v2.4.0 // indirect
144142
gopkg.in/yaml.v3 v3.0.1 // indirect
145143
sigs.k8s.io/yaml v1.5.0 // indirect
146144
)

0 commit comments

Comments
 (0)