diff --git a/integration/client/go.mod b/integration/client/go.mod index ace7b0cb9..c2554e9ab 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -18,7 +18,7 @@ require ( github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c + golang.org/x/sys v0.0.0-20210915083310-ed5796bab164 gotest.tools/v3 v3.0.3 ) diff --git a/integration/client/go.sum b/integration/client/go.sum index 41ac0b948..d9c0095fc 100644 --- a/integration/client/go.sum +++ b/integration/client/go.sum @@ -711,8 +711,9 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210915083310-ed5796bab164 h1:7ZDGnxgHAMw7thfC5bEos0RDAccZKxioiWBhfIe+tvw= +golang.org/x/sys v0.0.0-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/services/server/config/config.go b/services/server/config/config.go index 71e31f8ff..792cfc732 100644 --- a/services/server/config/config.go +++ b/services/server/config/config.go @@ -67,8 +67,6 @@ type Config struct { Timeouts map[string]string `toml:"timeouts"` // Imports are additional file path list to config files that can overwrite main config file fields Imports []string `toml:"imports"` - // OpenTelemetry configuration - OpenTelemetry OpenTelemetryConfig `toml:"otel"` // StreamProcessors configuration StreamProcessors map[string]StreamProcessor `toml:"stream_processors"` } @@ -167,14 +165,6 @@ type ProxyPlugin struct { Address string `toml:"address"` } -// OpenTelemetryConfig provides open telemetry configuration -type OpenTelemetryConfig struct { - ServiceName string `toml:"service_name"` - ExporterName string `toml:"exporter_name"` - ExporterEndpoint string `toml:"exporter_endpoint"` - TraceSamplingRatio float64 `toml:"trace_sampling_ratio"` -} - // BoltConfig defines the configuration values for the bolt plugin, which is // loaded here, rather than back registered in the metadata package. type BoltConfig struct {