Fix a commit conflict
rebasing bring back
again the tracing struct in config.go, which is no longer needed
as v3 uses connection_manager to set specific tracing config.
@@ -13,7 +13,6 @@ import (
"github.com/openservicemesh/osm/pkg/certificate"
"github.com/openservicemesh/osm/pkg/configurator"
"github.com/openservicemesh/osm/pkg/constants"
- "github.com/openservicemesh/osm/pkg/envoy"
)
func getEnvoyConfigYAML(config envoyBootstrapConfigMeta, cfg configurator.Configurator) ([]byte, error) {
@@ -112,20 +111,6 @@ func getEnvoyConfigYAML(config envoyBootstrapConfigMeta, cfg configurator.Config
},
}
- if cfg.IsZipkinTracingEnabled() {
- m["tracing"] = map[string]interface{}{
- "http": map[string]interface{}{
- "name": "envoy.zipkin",
- "typed_config": map[string]interface{}{
- "@type": envoy.TypeZipkinConfig,
- "collector_cluster": constants.EnvoyZipkinCluster,
- "collector_endpoint": cfg.GetZipkinEndpoint(),
- "collector_endpoint_version": "HTTP_JSON",
- },
- },
- }
- }
-
configYAML, err := yaml.Marshal(&m)
if err != nil {
log.Error().Err(err).Msgf("Error marshaling Envoy config struct into YAML")
