Skip to content

Commit

Permalink
Remove jaeger exporter and add api diff for 2.0.0 release (#10241)
Browse files Browse the repository at this point in the history
  • Loading branch information
laurit authored Jan 16, 2024
1 parent e4445ab commit d36d7df
Show file tree
Hide file tree
Showing 22 changed files with 329 additions and 649 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/markdown-link-check-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"pattern": "^https://developer\\.mend\\.io/github/open-telemetry/opentelemetry-java-instrumentation$"
},
{
"pattern": "^https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Frenovate"
"pattern": "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/pulls/app%2Frenovate"
},
{
"pattern": "^https://kotlinlang\\.org/docs/coroutines-overview\\.html$"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of against
No changes.
261 changes: 261 additions & 0 deletions docs/apidiffs/2.0.0_vs_1.32.0/opentelemetry-instrumentation-api.txt

Large diffs are not rendered by default.

261 changes: 1 addition & 260 deletions docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt

Large diffs are not rendered by default.

13 changes: 2 additions & 11 deletions instrumentation/spring/spring-boot-autoconfigure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ For Maven, add to your `pom.xml` dependencies:
```xml
<dependencies>
<!-- opentelemetry exporters-->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-jaeger</artifactId>
<version>OPENTELEMETRY_VERSION</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-zipkin</artifactId>
Expand Down Expand Up @@ -129,7 +124,6 @@ For Gradle, add to your dependencies:

```groovy
//opentelemetry exporter
implementation("io.opentelemetry:opentelemetry-exporter-jaeger:OPENTELEMETRY_VERSION")
implementation("io.opentelemetry:opentelemetry-exporter-zipkin:OPENTELEMETRY_VERSION")
implementation("io.opentelemetry:opentelemetry-exporter-otlp:OPENTELEMETRY_VERSION")
Expand Down Expand Up @@ -384,7 +378,7 @@ public class OpenTelemetryConfig {}

#### Exporter Configurations

This package provides auto configurations for [OTLP](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp), [Jaeger](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/jaeger), [Zipkin](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/zipkin), and [Logging](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/logging) Span Exporters.
This package provides auto configurations for [OTLP](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp), [Zipkin](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/zipkin), and [Logging](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/logging) Span Exporters.

If an exporter is present in the classpath during runtime and a spring bean of the exporter is missing from the spring application context. An exporter bean is initialized and added to a simple span processor in the active tracer provider. Check out the implementation [here](./src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java).

Expand All @@ -402,7 +396,6 @@ This is the preferred way to enable/disable exporters and takes precedence over
| Otlp Span Exporter | otel.exporter.otlp.traces.enabled | `true` | OtlpGrpcSpanExporter |
| Otlp Metrics Exporter | otel.exporter.otlp.metrics.enabled | `true` | OtlpGrpcMetricExporter |
| Otlp Logs Exporter | otel.exporter.otlp.logs.enabled | `true` | OtlpGrpcLogRecordExporter |
| Jaeger Exporter | otel.exporter.jaeger.enabled | `true` | JaegerGrpcSpanExporter |
| Zipkin Exporter | otel.exporter.zipkin.enabled | `true` | ZipkinSpanExporter |
| Logging Exporter | otel.exporter.logging.enabled | `false` | LoggingSpanExporter |

Expand Down Expand Up @@ -468,9 +461,7 @@ The service name is determined by the following precedence, in accordance with t
| | otel.exporter.otlp.protocol | `grpc` |
| | otel.exporter.otlp.headers | |
| | otel.exporter.otlp.timeout | `1s` |
| Jaeger Exporter | otel.exporter.jaeger.endpoint | `localhost:14250` |
| | otel.exporter.jaeger.timeout | `1s` |
| Zipkin Exporter | otel.exporter.jaeger.endpoint | `http://localhost:9411/api/v2/spans` |
| Zipkin Exporter | otel.exporter.zipkin.endpoint | `http://localhost:9411/api/v2/spans` |

The `otel.exporter.otlp.headers` property can be specified as a comma-separated list,
which is compliant with the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
compileOnly("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
compileOnly("io.opentelemetry:opentelemetry-exporter-logging")
compileOnly("io.opentelemetry:opentelemetry-exporter-jaeger")
compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
compileOnly("io.opentelemetry:opentelemetry-exporter-zipkin")
compileOnly(project(":instrumentation-annotations"))
Expand All @@ -67,7 +66,6 @@ dependencies {
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
testImplementation("io.opentelemetry:opentelemetry-exporter-logging")
testImplementation("io.opentelemetry:opentelemetry-exporter-jaeger")
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
testImplementation("io.opentelemetry:opentelemetry-exporter-zipkin")
testImplementation(project(":instrumentation-annotations"))
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import io.opentelemetry.context.propagation.TextMapPropagator;
import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
import io.opentelemetry.extension.trace.propagation.B3Propagator;
import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
import io.opentelemetry.extension.trace.propagation.OtTracePropagator;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -51,14 +50,6 @@ static TextMapPropagator getCompositeTextMapPropagator(
.getIfAvailable(B3Propagator::injectingMultiHeaders));
}
break;
case "jaeger":
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.JaegerPropagator")) {
propagators.add(
beanFactory
.getBeanProvider(JaegerPropagator.class)
.getIfAvailable(JaegerPropagator::getInstance));
}
break;
case "ottrace":
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.OtTracerPropagator")) {
propagators.add(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration,\
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.jaeger.JaegerSpanExporterAutoConfiguration,\
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration,\
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration,\
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration,\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.jaeger.JaegerSpanExporterAutoConfiguration
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For Maven add the following to your `pom.xml`:
</dependency>

<!-- OpenTelemetry exporter -->
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..) -->
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..) -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
Expand All @@ -51,7 +51,7 @@ For Gradle add the following to your dependencies:
implementation("io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-5.3:OPENTELEMETRY_VERSION")
// OpenTelemetry exporter
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..)
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..)
implementation("io.opentelemetry:opentelemetry-exporter-logging:OPENTELEMETRY_VERSION")
// required to instrument Spring WebMVC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For Maven add the following to your `pom.xml`:
</dependency>

<!-- OpenTelemetry exporter -->
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..) -->
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..) -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
Expand All @@ -51,7 +51,7 @@ For Gradle add the following to your dependencies:
implementation("io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-6.0:OPENTELEMETRY_VERSION")
// OpenTelemetry exporter
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..)
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..)
implementation("io.opentelemetry:opentelemetry-exporter-logging:OPENTELEMETRY_VERSION")
// required to instrument Spring WebMVC
Expand Down

This file was deleted.

Loading

0 comments on commit d36d7df

Please sign in to comment.