Skip to content

Commit d36d7df

Browse files
authored
Remove jaeger exporter and add api diff for 2.0.0 release (#10241)
1 parent e4445ab commit d36d7df

File tree

22 files changed

+329
-649
lines changed

22 files changed

+329
-649
lines changed

.github/scripts/markdown-link-check-config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"pattern": "^https://developer\\.mend\\.io/github/open-telemetry/opentelemetry-java-instrumentation$"
1010
},
1111
{
12-
"pattern": "^https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Frenovate"
12+
"pattern": "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/pulls/app%2Frenovate"
1313
},
1414
{
1515
"pattern": "^https://kotlinlang\\.org/docs/coroutines-overview\\.html$"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of against
2+
No changes.

docs/apidiffs/2.0.0_vs_1.32.0/opentelemetry-instrumentation-api.txt

+261
Large diffs are not rendered by default.

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt

+1-260
Large diffs are not rendered by default.

instrumentation/spring/spring-boot-autoconfigure/README.md

+2-11
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ For Maven, add to your `pom.xml` dependencies:
7474
```xml
7575
<dependencies>
7676
<!-- opentelemetry exporters-->
77-
<dependency>
78-
<groupId>io.opentelemetry</groupId>
79-
<artifactId>opentelemetry-exporter-jaeger</artifactId>
80-
<version>OPENTELEMETRY_VERSION</version>
81-
</dependency>
8277
<dependency>
8378
<groupId>io.opentelemetry</groupId>
8479
<artifactId>opentelemetry-exporter-zipkin</artifactId>
@@ -129,7 +124,6 @@ For Gradle, add to your dependencies:
129124

130125
```groovy
131126
//opentelemetry exporter
132-
implementation("io.opentelemetry:opentelemetry-exporter-jaeger:OPENTELEMETRY_VERSION")
133127
implementation("io.opentelemetry:opentelemetry-exporter-zipkin:OPENTELEMETRY_VERSION")
134128
implementation("io.opentelemetry:opentelemetry-exporter-otlp:OPENTELEMETRY_VERSION")
135129
@@ -384,7 +378,7 @@ public class OpenTelemetryConfig {}
384378

385379
#### Exporter Configurations
386380

387-
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.
381+
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.
388382

389383
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).
390384

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

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

475466
The `otel.exporter.otlp.headers` property can be specified as a comma-separated list,
476467
which is compliant with the

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies {
4242
compileOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
4343
compileOnly("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
4444
compileOnly("io.opentelemetry:opentelemetry-exporter-logging")
45-
compileOnly("io.opentelemetry:opentelemetry-exporter-jaeger")
4645
compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
4746
compileOnly("io.opentelemetry:opentelemetry-exporter-zipkin")
4847
compileOnly(project(":instrumentation-annotations"))
@@ -67,7 +66,6 @@ dependencies {
6766
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
6867
testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
6968
testImplementation("io.opentelemetry:opentelemetry-exporter-logging")
70-
testImplementation("io.opentelemetry:opentelemetry-exporter-jaeger")
7169
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
7270
testImplementation("io.opentelemetry:opentelemetry-exporter-zipkin")
7371
testImplementation(project(":instrumentation-annotations"))

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/jaeger/JaegerSpanExporterAutoConfiguration.java

-63
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/jaeger/JaegerSpanExporterProperties.java

-54
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/propagators/CompositeTextMapPropagatorFactory.java

-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.opentelemetry.context.propagation.TextMapPropagator;
1313
import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
1414
import io.opentelemetry.extension.trace.propagation.B3Propagator;
15-
import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
1615
import io.opentelemetry.extension.trace.propagation.OtTracePropagator;
1716
import java.util.HashSet;
1817
import java.util.List;
@@ -51,14 +50,6 @@ static TextMapPropagator getCompositeTextMapPropagator(
5150
.getIfAvailable(B3Propagator::injectingMultiHeaders));
5251
}
5352
break;
54-
case "jaeger":
55-
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.JaegerPropagator")) {
56-
propagators.add(
57-
beanFactory
58-
.getBeanProvider(JaegerPropagator.class)
59-
.getIfAvailable(JaegerPropagator::getInstance));
60-
}
61-
break;
6253
case "ottrace":
6354
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.OtTracerPropagator")) {
6455
propagators.add(

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
22
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration,\
3-
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.jaeger.JaegerSpanExporterAutoConfiguration,\
43
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration,\
54
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration,\
65
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration,\

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration
2-
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.jaeger.JaegerSpanExporterAutoConfiguration
32
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration
43
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration
54
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/jaeger/JaegerSpanExporterAutoConfigurationTest.java

-90
This file was deleted.

instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For Maven add the following to your `pom.xml`:
2525
</dependency>
2626

2727
<!-- OpenTelemetry exporter -->
28-
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..) -->
28+
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..) -->
2929
<dependency>
3030
<groupId>io.opentelemetry</groupId>
3131
<artifactId>opentelemetry-exporter-logging</artifactId>
@@ -51,7 +51,7 @@ For Gradle add the following to your dependencies:
5151
implementation("io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-5.3:OPENTELEMETRY_VERSION")
5252
5353
// OpenTelemetry exporter
54-
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..)
54+
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..)
5555
implementation("io.opentelemetry:opentelemetry-exporter-logging:OPENTELEMETRY_VERSION")
5656
5757
// required to instrument Spring WebMVC

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For Maven add the following to your `pom.xml`:
2525
</dependency>
2626

2727
<!-- OpenTelemetry exporter -->
28-
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..) -->
28+
<!-- replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..) -->
2929
<dependency>
3030
<groupId>io.opentelemetry</groupId>
3131
<artifactId>opentelemetry-exporter-logging</artifactId>
@@ -51,7 +51,7 @@ For Gradle add the following to your dependencies:
5151
implementation("io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-6.0:OPENTELEMETRY_VERSION")
5252
5353
// OpenTelemetry exporter
54-
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/jaeger/..)
54+
// replace this default exporter with your OpenTelemetry exporter (ex. otlp/zipkin/..)
5555
implementation("io.opentelemetry:opentelemetry-exporter-logging:OPENTELEMETRY_VERSION")
5656
5757
// required to instrument Spring WebMVC

instrumentation/spring/starters/jaeger-spring-boot-starter/README.md

-34
This file was deleted.

0 commit comments

Comments
 (0)