From acaa2b805e14f7917f846e93a1c107b47e723d9e Mon Sep 17 00:00:00 2001 From: Ben B Date: Thu, 20 Jul 2023 03:41:27 +0200 Subject: [PATCH] [internal/components] register jaegerremotesampling extension (#24212) **Description:** Register jaegerremotesampling extension **Link to tracking Issue:** - https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5749 **Testing:** **Documentation:** Signed-off-by: Benedikt Bongartz --- cmd/configschema/go.mod | 11 +++++++++++ cmd/configschema/go.sum | 1 + go.mod | 10 ++++++++++ internal/components/components.go | 2 ++ 4 files changed, 24 insertions(+) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 2551bfc8578e..5c0c75e204e9 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -409,6 +409,7 @@ require ( github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/hetznercloud/hcloud-go v1.41.0 // indirect @@ -456,6 +457,7 @@ require ( github.com/linode/linodego v1.14.1 // indirect github.com/logicmonitor/lm-data-sdk-go v1.0.0 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-ieproxy v0.0.9 // indirect @@ -492,6 +494,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.81.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.81.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.81.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.81.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.81.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.81.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.81.0 // indirect @@ -529,6 +532,8 @@ require ( github.com/ovh/go-ovh v1.3.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/paulmach/orb v0.9.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect @@ -564,10 +569,14 @@ require ( github.com/snowflakedb/gosnowflake v1.6.18 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/cobra v1.7.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.14.0 // indirect github.com/stretchr/objx v0.5.0 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.702 // indirect github.com/tg123/go-htpasswd v1.2.1 // indirect @@ -1099,3 +1108,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowf replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ../../extension/observer/dockerobserver replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ../../extension/jaegerremotesampling diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index abd73fa57ea4..fb59ede54809 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2855,6 +2855,7 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= diff --git a/go.mod b/go.mod index a08fd7e51c7f..678da9639301 100644 --- a/go.mod +++ b/go.mod @@ -54,6 +54,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.81.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.81.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.81.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.81.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.81.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.81.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.81.0 @@ -408,6 +409,7 @@ require ( github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/hetznercloud/hcloud-go v1.41.0 // indirect @@ -455,6 +457,7 @@ require ( github.com/linode/linodego v1.14.1 // indirect github.com/logicmonitor/lm-data-sdk-go v1.0.0 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-ieproxy v0.0.9 // indirect @@ -527,6 +530,8 @@ require ( github.com/ovh/go-ovh v1.3.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/paulmach/orb v0.9.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect @@ -568,9 +573,12 @@ require ( github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/cobra v1.7.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.14.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/stretchr/testify v1.8.4 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.702 // indirect github.com/tg123/go-htpasswd v1.2.1 // indirect @@ -1075,6 +1083,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zooke replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ./extension/observer/dockerobserver +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ./extension/jaegerremotesampling + // see https://github.com/google/gnostic/issues/262 replace github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0.5.5 diff --git a/internal/components/components.go b/internal/components/components.go index 197498a30ac4..44aff0b8ae33 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -69,6 +69,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder" + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver" @@ -202,6 +203,7 @@ func Components() (otelcol.Factories, error) { healthcheckextension.NewFactory(), hostobserver.NewFactory(), httpforwarder.NewFactory(), + jaegerremotesampling.NewFactory(), k8sobserver.NewFactory(), pprofextension.NewFactory(), oauth2clientauthextension.NewFactory(),