Skip to content

Commit

Permalink
[client] add new module go.opentelemetry.io/collector/client
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Mar 21, 2024
1 parent fc4c13d commit 42a52b7
Show file tree
Hide file tree
Showing 15 changed files with 187 additions and 9 deletions.
25 changes: 25 additions & 0 deletions .chloggen/client_module.yaml
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: new_component

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: client

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Create a new go module `go.opentelemetry.io/collector/client`

# One or more tracking issues or pull requests related to the change
issues: [9804]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
1 change: 1 addition & 0 deletions client/Makefile
@@ -0,0 +1 @@
include ../Makefile.Common
42 changes: 42 additions & 0 deletions client/go.mod
@@ -0,0 +1,42 @@
module go.opentelemetry.io/collector/client

go 1.21.0

require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/consumer v0.96.0
go.opentelemetry.io/collector/pdata v1.3.0
go.uber.org/goleak v1.3.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.opentelemetry.io/collector/consumer => ../consumer

replace go.opentelemetry.io/collector => ../

replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry

replace go.opentelemetry.io/collector/featuregate => ../featuregate

replace go.opentelemetry.io/collector/confmap => ../confmap

replace go.opentelemetry.io/collector/component => ../component

replace go.opentelemetry.io/collector/pdata => ../pdata
83 changes: 83 additions & 0 deletions client/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/builder/test/core.builder.yaml
Expand Up @@ -19,6 +19,7 @@ exporters:

replaces:
- go.opentelemetry.io/collector => ${WORKSPACE_DIR}
- go.opentelemetry.io/collector/client => ${WORKSPACE_DIR}/client
- go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component
- go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth
- go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression
Expand Down
1 change: 1 addition & 0 deletions cmd/otelcorecol/builder-config.yaml
Expand Up @@ -26,6 +26,7 @@ connectors:

replaces:
- go.opentelemetry.io/collector => ../../
- go.opentelemetry.io/collector/client => ../../client
- go.opentelemetry.io/collector/otelcol => ../../otelcol
- go.opentelemetry.io/collector/component => ../../component
- go.opentelemetry.io/collector/config/configauth => ../../config/configauth
Expand Down
5 changes: 4 additions & 1 deletion cmd/otelcorecol/go.mod
Expand Up @@ -2,7 +2,7 @@

module go.opentelemetry.io/collector/cmd/otelcorecol

go 1.21
go 1.21.0

require (
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -76,6 +76,7 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.96.0 // indirect
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.96.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.96.0 // indirect
Expand Down Expand Up @@ -133,6 +134,8 @@ require (

replace go.opentelemetry.io/collector => ../../

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

replace go.opentelemetry.io/collector/otelcol => ../../otelcol

replace go.opentelemetry.io/collector/component => ../../component
Expand Down
5 changes: 4 additions & 1 deletion config/configgrpc/go.mod
@@ -1,11 +1,12 @@
module go.opentelemetry.io/collector/config/configgrpc

go 1.21
go 1.21.0

require (
github.com/mostynb/go-grpc-compression v1.2.2
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector v0.96.0
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/component v0.96.0
go.opentelemetry.io/collector/config/configauth v0.96.0
go.opentelemetry.io/collector/config/configcompression v0.96.0
Expand Down Expand Up @@ -95,3 +96,5 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
replace go.opentelemetry.io/collector/component => ../../component

replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/client => ../../client
7 changes: 5 additions & 2 deletions config/confighttp/go.mod
@@ -1,13 +1,13 @@
module go.opentelemetry.io/collector/config/confighttp

go 1.21
go 1.21.0

require (
github.com/golang/snappy v0.0.4
github.com/klauspost/compress v1.17.7
github.com/rs/cors v1.10.1
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector v0.96.0
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/component v0.96.0
go.opentelemetry.io/collector/config/configauth v0.96.0
go.opentelemetry.io/collector/config/configcompression v0.96.0
Expand Down Expand Up @@ -45,6 +45,7 @@ require (
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
go.opentelemetry.io/collector v0.96.0 // indirect
go.opentelemetry.io/collector/confmap v0.96.0 // indirect
go.opentelemetry.io/collector/extension v0.96.0 // indirect
go.opentelemetry.io/collector/featuregate v1.3.0 // indirect
Expand Down Expand Up @@ -90,3 +91,5 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
replace go.opentelemetry.io/collector/component => ../../component

replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/client => ../../client
5 changes: 4 additions & 1 deletion exporter/otlpexporter/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/exporter/otlpexporter

go 1.21
go 1.21.0

require (
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -55,6 +55,7 @@ require (
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/config/confignet v0.96.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.96.0 // indirect
go.opentelemetry.io/collector/config/internal v0.96.0 // indirect
Expand Down Expand Up @@ -123,3 +124,5 @@ retract (
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry

replace go.opentelemetry.io/collector/client => ../../client
5 changes: 4 additions & 1 deletion exporter/otlphttpexporter/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/exporter/otlphttpexporter

go 1.21
go 1.21.0

require (
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -55,6 +55,7 @@ require (
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rs/cors v1.10.1 // indirect
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.96.0 // indirect
go.opentelemetry.io/collector/config/internal v0.96.0 // indirect
Expand Down Expand Up @@ -121,3 +122,5 @@ retract (
)

replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry

replace go.opentelemetry.io/collector/client => ../../client
5 changes: 4 additions & 1 deletion internal/e2e/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/internal/e2e

go 1.21
go 1.21.0

require (
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -52,6 +52,7 @@ require (
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rs/cors v1.10.1 // indirect
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.96.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.96.0 // indirect
Expand Down Expand Up @@ -133,3 +134,5 @@ replace go.opentelemetry.io/collector/exporter => ../../exporter
replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/client => ../../client
5 changes: 4 additions & 1 deletion processor/batchprocessor/go.mod
@@ -1,13 +1,14 @@
module go.opentelemetry.io/collector/processor/batchprocessor

go 1.21
go 1.21.0

require (
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.6.0
github.com/prometheus/common v0.48.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector v0.96.0
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/component v0.96.0
go.opentelemetry.io/collector/config/configtelemetry v0.96.0
go.opentelemetry.io/collector/confmap v0.96.0
Expand Down Expand Up @@ -66,6 +67,8 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/pdata => ../../pdata

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

replace go.opentelemetry.io/collector/consumer => ../../consumer

retract (
Expand Down
5 changes: 4 additions & 1 deletion receiver/otlpreceiver/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/receiver/otlpreceiver

go 1.21
go 1.21.0

require (
github.com/gogo/protobuf v1.3.2
Expand Down Expand Up @@ -55,6 +55,7 @@ require (
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rs/cors v1.10.1 // indirect
go.opentelemetry.io/collector/client v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.96.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.3.0 // indirect
Expand Down Expand Up @@ -123,3 +124,5 @@ retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)

replace go.opentelemetry.io/collector/client => ../../client
1 change: 1 addition & 0 deletions versions.yaml
Expand Up @@ -13,6 +13,7 @@ module-sets:
version: v0.96.0
modules:
- go.opentelemetry.io/collector
- go.opentelemetry.io/collector/client
- go.opentelemetry.io/collector/cmd/builder
- go.opentelemetry.io/collector/cmd/mdatagen
- go.opentelemetry.io/collector/component
Expand Down

0 comments on commit 42a52b7

Please sign in to comment.