Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Jaeger exporter #1896

Merged
merged 1 commit into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions dev/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion dev/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ service:
traces:
receivers:
- otlp
- jaeger
- zipkin
processors: [batch]
exporters:
Expand Down
26 changes: 5 additions & 21 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.**
Expand Down
1 change: 0 additions & 1 deletion docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
5 changes: 0 additions & 5 deletions examples/demo/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ receivers:
protocols:
grpc:
http:
jaeger:
protocols:
thrift_compact:
thrift_http:
zipkin:

processors:
Expand Down Expand Up @@ -42,7 +38,6 @@ service:
traces:
receivers:
- otlp
- jaeger
- zipkin
processors: [batch]
exporters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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} },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ private static TracerProviderBuilder SetExporter(this TracerProviderBuilder buil
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")
Expand Down Expand Up @@ -194,12 +193,6 @@ public static TracerProviderBuilder AddZipkinExporter(TracerProviderBuilder buil
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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ private static TracesExporter ParseTracesExporter(IConfigurationSource source)
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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ internal enum TracesExporter
/// </summary>
Otlp,

/// <summary>
/// Jaeger exporter.
/// </summary>
Jaeger,

/// <summary>
/// Zipkin exporter.
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry.AutoInstrumentation/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public static class Exporters
public const string Otlp = "otlp";
public const string Prometheus = "prometheus";
public const string Zipkin = "zipkin";
public const string Jaeger = "jaeger";
}

public static class Propagators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<PackageReference Include="OpenTelemetry" Version="1.4.0-rc.1" />
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.4.0-rc.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ internal void SdkSettings_DefaultValues()

[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)
Expand Down