Skip to content

Commit 4aa1b2d

Browse files
authored
[configgrpc] Mark module as 1.x (#15609)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Marks `configgrpc` module as 1.0. Removes dependency on `otelcol`. Items for marking this as stable: - The only item on the tracking configgrpc issue was #12836, after looking into it I think it can be removed from the tracking issue since the breaking part was done already on #14267. - On my mind there was also the `otelgrpc` dependency. There are two things that make me think this is fine now: 1. RPC metrics emitted now by the `otelgrpc` dep are 'release candidate' stability so the chance of breakage is very low; there have been [no relevant changes](https://github.com/open-telemetry/semantic-conventions/commits/v1.43.0/docs/rpc/rpc-metrics.md?since=2026-02-19&until=2026-07-20) since February 2. Our documentation makes it clear that these are not covered by stability guarantees https://opentelemetry.io/docs/collector/internal-telemetry/#ownership-of-emitted-metrics - There are a few PRs by @evan-bradley that we should merge before we land this - #15615 - #15616 - #15611 - #15610 <!-- Issue number if applicable --> #### Link to tracking issue Fixes #9477 <!--Authorship attestation. See AGENTS.md for details. AI agents must not check this box on behalf of the user; the human author must check it themselves before the PR is ready for review.--> #### Authorship - [x] I, a human, wrote this pull request description myself. <!--Please delete paragraphs that you did not use before submitting.-->
1 parent aa682d1 commit 4aa1b2d

11 files changed

Lines changed: 34 additions & 18 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: pkg/config/configgrpc
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Mark configgrpc as stable
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [9477]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

config/configgrpc/configgrpc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ import (
3232
"go.opentelemetry.io/collector/component"
3333
"go.opentelemetry.io/collector/config/configauth"
3434
"go.opentelemetry.io/collector/config/configcompression"
35+
"go.opentelemetry.io/collector/config/configgrpc/internal/grpccompression/snappy"
36+
"go.opentelemetry.io/collector/config/configgrpc/internal/grpccompression/zstd"
3537
"go.opentelemetry.io/collector/config/configmiddleware"
3638
"go.opentelemetry.io/collector/config/confignet"
3739
"go.opentelemetry.io/collector/config/configopaque"
3840
"go.opentelemetry.io/collector/config/configoptional"
3941
"go.opentelemetry.io/collector/config/configtls"
4042
"go.opentelemetry.io/collector/confmap"
4143
"go.opentelemetry.io/collector/extension/extensionauth"
42-
"go.opentelemetry.io/collector/internal/grpccompression/snappy"
43-
"go.opentelemetry.io/collector/internal/grpccompression/zstd"
4444
)
4545

4646
var errMetadataNotFound = errors.New("no request metadata found")

config/configgrpc/configgrpc_benchmark_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"google.golang.org/grpc/encoding/gzip"
1616
"google.golang.org/grpc/status"
1717

18-
"go.opentelemetry.io/collector/internal/grpccompression/snappy"
19-
"go.opentelemetry.io/collector/internal/grpccompression/zstd"
18+
"go.opentelemetry.io/collector/config/configgrpc/internal/grpccompression/snappy"
19+
"go.opentelemetry.io/collector/config/configgrpc/internal/grpccompression/zstd"
2020
"go.opentelemetry.io/collector/pdata/plog"
2121
"go.opentelemetry.io/collector/pdata/pmetric"
2222
"go.opentelemetry.io/collector/pdata/ptrace"

config/configgrpc/go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ module go.opentelemetry.io/collector/config/configgrpc
33
go 1.25.0
44

55
require (
6+
github.com/golang/snappy v1.0.0
7+
github.com/klauspost/compress v1.19.1
68
github.com/stretchr/testify v1.11.1
7-
go.opentelemetry.io/collector v0.157.0
89
go.opentelemetry.io/collector/client v1.63.0
910
go.opentelemetry.io/collector/component v1.63.0
1011
go.opentelemetry.io/collector/component/componenttest v0.157.0
@@ -39,12 +40,10 @@ require (
3940
github.com/go-logr/stdr v1.2.2 // indirect
4041
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4142
github.com/gobwas/glob v0.2.3 // indirect
42-
github.com/golang/snappy v1.0.0 // indirect
4343
github.com/google/go-tpm v0.9.8 // indirect
4444
github.com/google/uuid v1.6.0 // indirect
4545
github.com/hashicorp/go-version v1.9.0 // indirect
4646
github.com/json-iterator/go v1.1.12 // indirect
47-
github.com/klauspost/compress v1.19.1 // indirect
4847
github.com/knadh/koanf/maps v0.1.2 // indirect
4948
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
5049
github.com/knadh/koanf/v2 v2.3.5 // indirect
@@ -75,8 +74,6 @@ require (
7574

7675
replace go.opentelemetry.io/collector/client => ../../client
7776

78-
replace go.opentelemetry.io/collector => ../..
79-
8077
replace go.opentelemetry.io/collector/config/configauth => ../configauth
8178

8279
replace go.opentelemetry.io/collector/config/configcompression => ../configcompression

internal/grpccompression/snappy/snappy.go renamed to config/configgrpc/internal/grpccompression/snappy/snappy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Package snappy registers a gRPC snappy compressor compatible with the
66
// collector's configgrpc package.
7-
package snappy // import "go.opentelemetry.io/collector/internal/grpccompression/snappy"
7+
package snappy // import "go.opentelemetry.io/collector/config/configgrpc/internal/grpccompression/snappy"
88

99
import (
1010
"io"

internal/grpccompression/snappy/snappy_test.go renamed to config/configgrpc/internal/grpccompression/snappy/snappy_test.go

File renamed without changes.

internal/grpccompression/zstd/zstd.go renamed to config/configgrpc/internal/grpccompression/zstd/zstd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Package zstd registers a gRPC zstd compressor compatible with the
66
// collector's configgrpc package.
7-
package zstd // import "go.opentelemetry.io/collector/internal/grpccompression/zstd"
7+
package zstd // import "go.opentelemetry.io/collector/config/configgrpc/internal/grpccompression/zstd"
88

99
import (
1010
"io"
File renamed without changes.

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ module go.opentelemetry.io/collector
1111
go 1.25.0
1212

1313
require (
14-
github.com/golang/snappy v1.0.0
15-
github.com/klauspost/compress v1.19.1
1614
github.com/stretchr/testify v1.11.1
1715
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478
1816
google.golang.org/grpc v1.82.1

go.sum

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

0 commit comments

Comments
 (0)