Skip to content

Commit c80068c

Browse files
trasktrask
authored
Remove deprecated methods (open-telemetry#18136)
1 parent a68508f commit c80068c

27 files changed

Lines changed: 21 additions & 1008 deletions

File tree

‎.fossa.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -907,15 +907,9 @@ targets:
907907
- type: gradle
908908
path: ./
909909
target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:javaagent'
910-
- type: gradle
911-
path: ./
912-
target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:library'
913910
- type: gradle
914911
path: ./
915912
target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:javaagent'
916-
- type: gradle
917-
path: ./
918-
target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:library'
919913
- type: gradle
920914
path: ./
921915
target: ':instrumentation:rxjava:rxjava-1.0:library'

‎.github/scripts/check-package-names.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
1313
if [[ "$module_name" == "runtime-telemetry" ]]; then
1414
continue
1515
fi
16-
if [[ "$module_name" == "runtime-telemetry-java8" ]]; then
17-
continue
18-
fi
19-
if [[ "$module_name" == "runtime-telemetry-java17" ]]; then
20-
continue
21-
fi
2216
if [[ "$module_name" == "servlet-common" ]]; then
2317
continue
2418
fi

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
## Unreleased
44

5+
### ⚠️ Breaking changes to non-stable APIs
6+
7+
- Removed previously deprecated `SqlQueryAnalyzer.analyze(String)` and
8+
`SqlQueryAnalyzer.analyzeWithSummary(String)`; use the overloads that take a `SqlDialect`.
9+
- Removed the unused `DbClientAttributesGetter.getDbResponseStatusCode()` default method.
10+
- Removed previously deprecated
11+
`KafkaTelemetryBuilder.setMessagingReceiveInstrumentationEnabled(boolean)`; use
12+
`setMessagingReceiveTelemetryEnabled(boolean)`.
13+
- Removed previously deprecated `OpenTelemetryAppender.Builder.captureCodeAttributes(boolean)` in
14+
the log4j-appender-2.17 module; use `setCaptureCodeAttributes(boolean)`.
15+
- Removed previously deprecated `Experimental.setEnableSqlCommenter()` in the JDBC and R2DBC
16+
instrumentations; use `Experimental.setSqlCommenterEnabled()`.
17+
- Removed previously deprecated `Experimental.addTraceIdRequestAttribute()` and
18+
`Experimental.setCapturedRequestParameters()` in the servlet-3.0 and servlet-5.0 instrumentations;
19+
use `setTraceIdRequestAttributeEnabled()` and `setCaptureRequestParameters()` respectively.
20+
- Removed the `opentelemetry-runtime-telemetry-java8` and `opentelemetry-runtime-telemetry-java17`
21+
library artifacts (deprecated aliases); use `opentelemetry-runtime-telemetry` instead.
22+
523
## Version 2.27.0 (2026-04-21)
624

725
This release targets the OpenTelemetry SDK 1.61.0.

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ These are the supported libraries and frameworks:
9090
| [Java Http Client](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/package-summary.html) | Java 11+ | [opentelemetry-java-http-client](../instrumentation/java-http-client/library) | [HTTP Client Spans], [HTTP Client Metrics] |
9191
| [Java Http Server](https://docs.oracle.com/en/java/javase/21/docs/api/jdk.httpserver/module-summary.html) | Java 8+ | [opentelemetry-java-http-server](../instrumentation/java-http-server/library) | [HTTP Server Spans], [HTTP Server Metrics] |
9292
| [java.util.logging](https://docs.oracle.com/javase/8/docs/api/java/util/logging/package-summary.html) | Java 8+ | N/A | none |
93-
| [Java Platform](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ManagementFactory.html) | Java 8+ | [opentelemetry-runtime-telemetry-java8](../instrumentation/runtime-telemetry/runtime-telemetry-java8/library),<br>[opentelemetry-runtime-telemetry-java17](../instrumentation/runtime-telemetry/runtime-telemetry-java17/library),<br>[opentelemetry-resources](../instrumentation/resources/library) | [JVM Runtime Metrics] |
93+
| [Java Platform](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ManagementFactory.html) | Java 8+ | [opentelemetry-runtime-telemetry](../instrumentation/runtime-telemetry/library),<br>[opentelemetry-resources](../instrumentation/resources/library) | [JVM Runtime Metrics] |
9494
| [Javalin](https://javalin.io/) | 5.0+ (not including 7.0+ yet) | N/A | Provides `http.route` [2] |
9595
| [JAX-RS](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html) | 0.5+ | N/A | Provides `http.route` [2], Controller Spans [3] |
9696
| [JAX-RS Client](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/client/package-summary.html) | 1.1+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,6 @@ default String getConnectionString(REQUEST request) {
9292
return null;
9393
}
9494

95-
// TODO: make this required to implement
96-
@Nullable
97-
@Deprecated
98-
default String getDbResponseStatusCode(@Nullable RESPONSE response, @Nullable Throwable error) {
99-
return null;
100-
}
101-
10295
// TODO: make this required to implement
10396
@Nullable
10497
default Long getDbOperationBatchSize(REQUEST request) {

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlQueryAnalyzer.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.instrumentation.api.incubator.semconv.db;
77

8-
import static io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlDialect.DOUBLE_QUOTES_ARE_STRING_LITERALS;
98
import static io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics.CounterNames.SQL_SANITIZER_CACHE_MISS;
109

1110
import com.google.auto.value.AutoValue;
@@ -34,14 +33,6 @@ private SqlQueryAnalyzer(boolean querySanitizationEnabled) {
3433
this.querySanitizationEnabled = querySanitizationEnabled;
3534
}
3635

37-
/**
38-
* @deprecated Use {@link #analyze(String, SqlDialect)} and pass an explicit dialect.
39-
*/
40-
@Deprecated
41-
public SqlQuery analyze(@Nullable String query) {
42-
return analyze(query, DOUBLE_QUOTES_ARE_STRING_LITERALS);
43-
}
44-
4536
public SqlQuery analyze(@Nullable String query, SqlDialect dialect) {
4637
if (!querySanitizationEnabled || query == null) {
4738
return SqlQuery.create(query, null, null);
@@ -61,16 +52,6 @@ private static SqlQuery analyzeImpl(String query, SqlDialect dialect) {
6152
return AutoSqlSanitizer.sanitize(query, dialect);
6253
}
6354

64-
/**
65-
* Analyze and extract query summary.
66-
*
67-
* @deprecated Use {@link #analyzeWithSummary(String, SqlDialect)} and pass an explicit dialect.
68-
*/
69-
@Deprecated
70-
public SqlQuery analyzeWithSummary(@Nullable String query) {
71-
return analyzeWithSummary(query, DOUBLE_QUOTES_ARE_STRING_LITERALS);
72-
}
73-
7455
/** Analyze and extract query summary. */
7556
public SqlQuery analyzeWithSummary(@Nullable String query, SqlDialect dialect) {
7657
if (!querySanitizationEnabled || query == null) {

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesGetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ default String getRpcSystemName(REQUEST request) {
4141
/**
4242
* @deprecated Use {@link #getRpcMethod(REQUEST)} for stable semconv.
4343
*/
44-
@Deprecated
44+
@Deprecated // to be removed in 3.0
4545
@Nullable
4646
String getMethod(REQUEST request);
4747

‎instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/datasource/internal/Experimental.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@ public static void setSqlCommenterEnabled(
4242
}
4343
}
4444

45-
/**
46-
* @deprecated Use {@link #setSqlCommenterEnabled(JdbcTelemetryBuilder, boolean)} instead.
47-
*/
48-
@Deprecated
49-
public static void setEnableSqlCommenter(
50-
JdbcTelemetryBuilder builder, boolean sqlCommenterEnabled) {
51-
setSqlCommenterEnabled(builder, sqlCommenterEnabled);
52-
}
53-
5445
/**
5546
* Set the propagator used to inject tracing context into sql comments. By default, W3C Trace
5647
* Context propagator is used.

‎instrumentation/jmx-metrics/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To control the time interval between MBean detection attempts, one can use the `
1212

1313
## Predefined metrics
1414

15-
JMX is a popular metrics technology used throughout the JVM (see [runtime metrics](../runtime-telemetry/runtime-telemetry-java8/library/README.md)), application servers, third-party libraries, and applications.
15+
JMX is a popular metrics technology used throughout the JVM (see [runtime metrics](../runtime-telemetry/library/README.md)), application servers, third-party libraries, and applications.
1616
JMX Metric Insight comes with a number of predefined configurations containing curated sets of JMX metrics for frequently used application servers or frameworks.
1717
To enable collection of the predefined metrics, specify a list of targets as the value for the `otel.jmx.target.system` property. For example
1818

‎instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,6 @@ public KafkaTelemetryBuilder setMessagingReceiveTelemetryEnabled(
109109
return this;
110110
}
111111

112-
/**
113-
* @deprecated Use {@link #setMessagingReceiveTelemetryEnabled(boolean)} instead.
114-
*/
115-
@Deprecated
116-
@CanIgnoreReturnValue
117-
public KafkaTelemetryBuilder setMessagingReceiveInstrumentationEnabled(
118-
boolean messagingReceiveInstrumentationEnabled) {
119-
return setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled);
120-
}
121-
122112
public KafkaTelemetry build() {
123113
KafkaInstrumenterFactory instrumenterFactory =
124114
new KafkaInstrumenterFactory(openTelemetry, INSTRUMENTATION_NAME)

0 commit comments

Comments
 (0)