diff --git a/CHANGELOG.md b/CHANGELOG.md index d8a31e7f4..cf51ee385 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ This beta release is built on top of [OpenTelemetry .NET](https://github.com/ope ### Removed +- Remove support for Jaeger exporter. + ### Fixed - Fix WCF instrumentation on .NET Framework. diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index f306cccfc..d5c76a468 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -11,12 +11,10 @@ services: ports: - "4317:4317" # OTLP gRPC receiver - "4318:4318" # OTLP HTTP/protobuf receiver - - "6831:6831" # Jaeger UDP/thrift-compact receiver - "8888:8888" # Prometheus metrics scrape endpoint with collector telemetry - "8889:8889" # Prometheus metrics exporter (scrape endpoint) - "9411:9411" # Zipkin receiver - "13133:13133" # health_check extension - - "14268:14268" # Jaeger HTTP/thrift-binary receiver - "55679:55679" # ZPages extension depends_on: - jaeger diff --git a/dev/otel-config.yaml b/dev/otel-config.yaml index 424fcae6f..1dc1b4c08 100644 --- a/dev/otel-config.yaml +++ b/dev/otel-config.yaml @@ -38,7 +38,6 @@ service: traces: receivers: - otlp - - jaeger - zipkin processors: [batch] exporters: diff --git a/docs/config.md b/docs/config.md index 3b80c2544..20bdc0ed5 100644 --- a/docs/config.md +++ b/docs/config.md @@ -127,11 +127,11 @@ for more details. Exporters output the telemetry. -| Environment variable | Description | Default value | -|-------------------------|--------------------------------------------------------------------------------------------------------|---------------| -| `OTEL_TRACES_EXPORTER` | Traces exporter to be used. The value can be one of the following: `zipkin`, `jaeger`, `otlp`, `none`. | `otlp` | -| `OTEL_METRICS_EXPORTER` | Metrics exporter to be used. The value can be one of the following: `otlp`, `prometheus`, `none`. | `otlp` | -| `OTEL_LOGS_EXPORTER` | Logs exporter to be used. The value can be one of the following: `otlp`, `none`. | `otlp` | +| Environment variable | Description | Default value | +|-------------------------|---------------------------------------------------------------------------------------------------|---------------| +| `OTEL_TRACES_EXPORTER` | Traces exporter to be used. The value can be one of the following: `zipkin`, `otlp`, `none`. | `otlp` | +| `OTEL_METRICS_EXPORTER` | Metrics exporter to be used. The value can be one of the following: `otlp`, `prometheus`, `none`. | `otlp` | +| `OTEL_LOGS_EXPORTER` | Logs exporter to be used. The value can be one of the following: `otlp`, `none`. | `otlp` | ### Traces exporter @@ -189,22 +189,6 @@ Important environment variables include: `.csproj` file. - On .NET Framework, the `grpc` OTLP exporter protocol is not supported. -### Jaeger - -To enable the Jaeger exporter, set the `OTEL_TRACES_EXPORTER` environment variable -to `jaeger`. - -To customize the Jaeger exporter using environment variables, see the -[Jaeger exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.1/src/OpenTelemetry.Exporter.Jaeger#environment-variables). -Important environment variables include: - -| Environment variable | Description | Default value | -|-----------------------------------|------------------------------------------------------------------------------------------------------|-------------------------------------| -| `OTEL_EXPORTER_JAEGER_AGENT_HOST` | Host name for the Jaeger agent. Used for the `udp/thrift.compact` protocol. | `localhost` | -| `OTEL_EXPORTER_JAEGER_AGENT_PORT` | Port for the Jaeger agent. Used for the `udp/thrift.compact` protocol. | `6831` | -| `OTEL_EXPORTER_JAEGER_ENDPOINT` | Jaeger Collector HTTP endpoint. Used for the `http/thrift.binary` protocol. | `http://localhost:14268/api/traces` | -| `OTEL_EXPORTER_JAEGER_PROTOCOL` | Protocol to use for Jaeger exporter. Supported values are `udp/thrift.compact`, `http/thrift.binary` | `udp/thrift.compact` | - ### Prometheus > ⚠️ **Do NOT use in production.** diff --git a/docs/plugins.md b/docs/plugins.md index 33fb94cb7..495edf2a5 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -69,7 +69,6 @@ public class MyPlugin |------------------------------------------------------------------------------------------------|---------------------------------------------------|---------------| | OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.1 | | OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0-rc.1 | -| OpenTelemetry.Exporter.JaegerExporterOptions | OpenTelemetry.Exporter.Jaeger | 1.4.0-rc.1 | | OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.1 | | OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.7 | | OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.10 | diff --git a/examples/demo/README.md b/examples/demo/README.md index eab713d92..e95b59bcb 100644 --- a/examples/demo/README.md +++ b/examples/demo/README.md @@ -2,7 +2,7 @@ ## Description -This is a demonstarative example that uses Docker Compose. +This is a demonstrative example that uses Docker Compose. It consists of following services: diff --git a/examples/demo/otel-config.yaml b/examples/demo/otel-config.yaml index 11f1b777c..bd0638aea 100644 --- a/examples/demo/otel-config.yaml +++ b/examples/demo/otel-config.yaml @@ -8,10 +8,6 @@ receivers: protocols: grpc: http: - jaeger: - protocols: - thrift_compact: - thrift_http: zipkin: processors: @@ -42,7 +38,6 @@ service: traces: receivers: - otlp - - jaeger - zipkin processors: [batch] exporters: diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 047b7dac8..5f3c611ec 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -29,7 +29,6 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Api", {1, 0, 0, 0} }, { L"OpenTelemetry.AutoInstrumentation", {0, 5, 1, 0} }, { L"OpenTelemetry.Exporter.Console", {1, 0, 0, 0} }, - { L"OpenTelemetry.Exporter.Jaeger", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.OpenTelemetryProtocol", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.Prometheus.HttpListener", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.Zipkin", {1, 0, 0, 0} }, diff --git a/src/OpenTelemetry.AutoInstrumentation/Configuration/EnvironmentConfigurationTracerHelper.cs b/src/OpenTelemetry.AutoInstrumentation/Configuration/EnvironmentConfigurationTracerHelper.cs index 609d52fae..54d747c3b 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Configuration/EnvironmentConfigurationTracerHelper.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Configuration/EnvironmentConfigurationTracerHelper.cs @@ -96,7 +96,6 @@ internal static class EnvironmentConfigurationTracerHelper return settings.TracesExporter switch { TracesExporter.Zipkin => Wrappers.AddZipkinExporter(builder, pluginManager), - TracesExporter.Jaeger => Wrappers.AddJaegerExporter(builder, pluginManager), TracesExporter.Otlp => Wrappers.AddOtlpExporter(builder, settings, pluginManager), TracesExporter.None => builder, _ => throw new ArgumentOutOfRangeException($"Traces exporter '{settings.TracesExporter}' is incorrect") @@ -194,12 +193,6 @@ internal static class EnvironmentConfigurationTracerHelper return builder.AddZipkinExporter(pluginManager.ConfigureTracesOptions); } - [MethodImpl(MethodImplOptions.NoInlining)] - public static TracerProviderBuilder AddJaegerExporter(TracerProviderBuilder builder, PluginManager pluginManager) - { - return builder.AddJaegerExporter(pluginManager.ConfigureTracesOptions); - } - [MethodImpl(MethodImplOptions.NoInlining)] public static TracerProviderBuilder AddOtlpExporter(TracerProviderBuilder builder, TracerSettings settings, PluginManager pluginManager) { diff --git a/src/OpenTelemetry.AutoInstrumentation/Configuration/TracerSettings.cs b/src/OpenTelemetry.AutoInstrumentation/Configuration/TracerSettings.cs index 1475fe407..d29b279fa 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Configuration/TracerSettings.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Configuration/TracerSettings.cs @@ -131,8 +131,6 @@ internal class TracerSettings : Settings return TracesExporter.Otlp; case Constants.ConfigurationValues.Exporters.Zipkin: return TracesExporter.Zipkin; - case Constants.ConfigurationValues.Exporters.Jaeger: - return TracesExporter.Jaeger; case Constants.ConfigurationValues.None: return TracesExporter.None; default: diff --git a/src/OpenTelemetry.AutoInstrumentation/Configuration/TracesExporter.cs b/src/OpenTelemetry.AutoInstrumentation/Configuration/TracesExporter.cs index e6b61ddb0..2a4ed8cf4 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Configuration/TracesExporter.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Configuration/TracesExporter.cs @@ -31,11 +31,6 @@ internal enum TracesExporter /// Otlp, - /// - /// Jaeger exporter. - /// - Jaeger, - /// /// Zipkin exporter. /// diff --git a/src/OpenTelemetry.AutoInstrumentation/Constants.cs b/src/OpenTelemetry.AutoInstrumentation/Constants.cs index 7060657f1..e63611c39 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Constants.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Constants.cs @@ -45,7 +45,6 @@ internal static class Constants public const string Otlp = "otlp"; public const string Prometheus = "prometheus"; public const string Zipkin = "zipkin"; - public const string Jaeger = "jaeger"; } public static class Propagators diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj index 1a3f2bc9e..79db25525 100644 --- a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj @@ -10,7 +10,6 @@ - diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index f7fc5f868..ad310e8f7 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -27,7 +27,6 @@ /net/OpenTelemetry.AutoInstrumentation.pdb, /net/OpenTelemetry.AutoInstrumentation.xml, /net/OpenTelemetry.Exporter.Console.dll, - /net/OpenTelemetry.Exporter.Jaeger.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index f7fc5f868..ad310e8f7 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -27,7 +27,6 @@ /net/OpenTelemetry.AutoInstrumentation.pdb, /net/OpenTelemetry.AutoInstrumentation.xml, /net/OpenTelemetry.Exporter.Console.dll, - /net/OpenTelemetry.Exporter.Jaeger.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 2f04fbd83..46378ffdb 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -27,7 +27,6 @@ /net/OpenTelemetry.AutoInstrumentation.pdb, /net/OpenTelemetry.AutoInstrumentation.xml, /net/OpenTelemetry.Exporter.Console.dll, - /net/OpenTelemetry.Exporter.Jaeger.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index 6f0548225..892cf3603 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -26,7 +26,6 @@ \net\OpenTelemetry.AutoInstrumentation.pdb, \net\OpenTelemetry.AutoInstrumentation.xml, \net\OpenTelemetry.Exporter.Console.dll, - \net\OpenTelemetry.Exporter.Jaeger.dll, \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, \net\OpenTelemetry.Exporter.Prometheus.HttpListener.dll, @@ -72,7 +71,6 @@ \netfx\OpenTelemetry.AutoInstrumentation.pdb, \netfx\OpenTelemetry.AutoInstrumentation.xml, \netfx\OpenTelemetry.Exporter.Console.dll, - \netfx\OpenTelemetry.Exporter.Jaeger.dll, \netfx\OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, \netfx\OpenTelemetry.Exporter.Prometheus.HttpListener.dll, \netfx\OpenTelemetry.Exporter.Zipkin.dll, diff --git a/test/OpenTelemetry.AutoInstrumentation.Tests/Configuration/SettingsTests.cs b/test/OpenTelemetry.AutoInstrumentation.Tests/Configuration/SettingsTests.cs index 1a8e77672..078c8f558 100644 --- a/test/OpenTelemetry.AutoInstrumentation.Tests/Configuration/SettingsTests.cs +++ b/test/OpenTelemetry.AutoInstrumentation.Tests/Configuration/SettingsTests.cs @@ -126,7 +126,6 @@ public class SettingsTests : IDisposable [Theory] [InlineData("none", TracesExporter.None)] - [InlineData("jaeger", TracesExporter.Jaeger)] [InlineData("otlp", TracesExporter.Otlp)] [InlineData("zipkin", TracesExporter.Zipkin)] internal void TracesExporter_SupportedValues(string tracesExporter, TracesExporter expectedTracesExporter)