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.

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

Jump to bottom

Update otel #2923

Merged
merged 4 commits into from
Feb 22, 2023
Merged

Update otel #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
081a59e
Update otel version
trask Feb 19, 2023
939afa2
More updates
trask Feb 21, 2023
e3a1d0f
Fix
trask Feb 21, 2023
e7ad2cd
Fix
trask Feb 21, 2023
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
8 changes: 4 additions & 4 deletions agent/agent-bootstrap/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ com.google.guava:guava-bom:31.1-jre=runtimeClasspath
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
com.squareup.okio:okio:1.17.5=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
Expand Down
8 changes: 5 additions & 3 deletions ...ain/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ private static Set<AttributeKey> buildDurationClientView() {
Set<AttributeKey> view = new HashSet<>(durationAlwaysInclude);
view.add(SemanticAttributes.NET_PEER_NAME);
view.add(SemanticAttributes.NET_PEER_PORT);
view.add(SemanticAttributes.NET_SOCK_PEER_ADDR);
return view;
}

Expand All @@ -57,7 +58,8 @@ private static Set<AttributeKey> buildDurationServerView() {
// - we prefer http.route (which is scrubbed) over http.target (which is not scrubbed).
Set<AttributeKey> view = new HashSet<>(durationAlwaysInclude);
view.add(SemanticAttributes.HTTP_SCHEME);
view.add(SemanticAttributes.HTTP_HOST);
view.add(SemanticAttributes.NET_HOST_NAME);
view.add(SemanticAttributes.NET_HOST_PORT);
view.add(SemanticAttributes.HTTP_ROUTE);
// START APPLICATION INSIGHTS MODIFICATIONS
view.add(SemanticAttributes.HTTP_USER_AGENT);
Expand All @@ -70,10 +72,10 @@ private static Set<AttributeKey> buildActiveRequestsView() {
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#attributes
Set<AttributeKey> view = new HashSet<>();
view.add(SemanticAttributes.HTTP_METHOD);
view.add(SemanticAttributes.HTTP_HOST);
view.add(SemanticAttributes.HTTP_SCHEME);
view.add(SemanticAttributes.HTTP_FLAVOR);
view.add(SemanticAttributes.HTTP_SERVER_NAME);
view.add(SemanticAttributes.NET_HOST_NAME);
view.add(SemanticAttributes.NET_HOST_PORT);
return view;
}

Expand Down
8 changes: 4 additions & 4 deletions agent/agent-for-testing/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
empty=
14 changes: 7 additions & 7 deletions agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ io.netty:netty-transport-native-epoll:4.1.89.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.89.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.89.Final=runtimeClasspath
io.netty:netty-transport:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath
io.projectreactor:reactor-core:3.5.2=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.3=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.3=runtimeClasspath
io.projectreactor:reactor-core:3.5.3=runtimeClasspath
net.java.dev.jna:jna-platform:5.12.1=runtimeClasspath
net.java.dev.jna:jna:5.12.1=runtimeClasspath
net.minidev:accessors-smart:2.4.8=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
empty=
14 changes: 7 additions & 7 deletions agent/azure-monitor-exporter/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ io.netty:netty-transport-native-epoll:4.1.89.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.89.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.89.Final=runtimeClasspath
io.netty:netty-transport:4.1.89.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath
io.projectreactor:reactor-core:3.5.2=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.3=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.3=runtimeClasspath
io.projectreactor:reactor-core:3.5.3=runtimeClasspath
net.java.dev.jna:jna-platform:5.6.0=runtimeClasspath
net.java.dev.jna:jna:5.6.0=runtimeClasspath
net.minidev:accessors-smart:2.4.8=runtimeClasspath
Expand Down
8 changes: 1 addition & 7 deletions ...src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/OperationNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ public static String getOperationName(ReadableSpan span) {
if (operationName != null) {
return operationName;
}

String spanName = span.getName();
String httpMethod = span.getAttribute(SemanticAttributes.HTTP_METHOD);
if (httpMethod != null && !httpMethod.isEmpty() && spanName.startsWith("/")) {
return httpMethod + " " + spanName;
}
return spanName;
return span.getName();
}

private OperationNames() {}
Expand Down
Loading