Skip to content

fix(deps): update opentelemetry.instrumentation.alpha to v2.15.0-alpha #936

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.

Sign up for GitHub

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

Merged
breedx-splk merged 3 commits into from
Apr 11, 2025
Merged

fix(deps): update opentelemetry.instrumentation.alpha to v2.15.0-alpha #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
295a309
fix(deps): update opentelemetry.instrumentation.alpha to v2.15.0-alpha
renovate[bot] Apr 11, 2025
dce80ac
handle renamed method
breedx-splk Apr 11, 2025
a45379b
handle renamed method and match in instrumentation
breedx-splk Apr 11, 2025
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: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
opentelemetry-instrumentation-alpha = "2.14.0-alpha"
opentelemetry-instrumentation-alpha = "2.15.0-alpha"
#opentelemetry-instrumentation = "2.9.0" // alpha bom includes non-alpha bom
opentelemetry-semconv = "1.32.0"
opentelemetry-semconv-alpha = "1.32.0-alpha"
Expand Down
11 changes: 6 additions & 5 deletions ...main/java/io/opentelemetry/instrumentation/library/okhttp/v3_0/OkHttpInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class OkHttpInstrumentation implements AndroidInstrumentation {
private List<String> capturedResponseHeaders = new ArrayList<>();
private Set<String> knownMethods = HttpConstants.KNOWN_METHODS;
private Map<String, String> peerServiceMapping = new HashMap<>();
private boolean emitExperimentalHttpClientMetrics;
private boolean emitExperimentalHttpClientTelemetry;

/** Adds an {@link AttributesExtractor} that will extract additional attributes. */
public void addAttributesExtractor(AttributesExtractor<Interceptor.Chain, Response> extractor) {
Expand Down Expand Up @@ -129,12 +129,13 @@ public PeerServiceResolver newPeerServiceResolver() {
* href="https://github.com/open-telemetry/semantic-conventions/blob/main/specification/metrics/semantic_conventions/http-metrics.md#metric-httpclientresponsesize">
* the response size</a>.
*/
public void setEmitExperimentalHttpClientMetrics(boolean emitExperimentalHttpClientMetrics) {
this.emitExperimentalHttpClientMetrics = emitExperimentalHttpClientMetrics;
public void setEmitExperimentalHttpClientTelemetry(
boolean emitExperimentalHttpClientTelemetry) {
this.emitExperimentalHttpClientTelemetry = emitExperimentalHttpClientTelemetry;
}

public boolean emitExperimentalHttpClientMetrics() {
return emitExperimentalHttpClientMetrics;
public boolean emitExperimentalHttpClientTelemetry() {
return emitExperimentalHttpClientTelemetry;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...java/io/opentelemetry/instrumentation/library/okhttp/v3_0/internal/OkHttp3Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public static void configure(
PeerServiceAttributesExtractor.create(
OkHttpAttributesGetter.INSTANCE,
instrumentation.newPeerServiceResolver()))
.setEmitExperimentalHttpClientMetrics(
instrumentation.emitExperimentalHttpClientMetrics());
.setEmitExperimentalHttpClientTelemetry(
instrumentation.emitExperimentalHttpClientTelemetry());

for (AttributesExtractor<Interceptor.Chain, Response> extractor :
instrumentation.getAdditionalExtractors()) {
Expand Down