Skip to content

Commit

Permalink
Bump io.opentelemetry.instrumentation:opentelemetry-instrumentation-b…
Browse files Browse the repository at this point in the history 
…om from 1.28.0 to 1.29.0 (#3256)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@dependabot @trask @github-actions
3 people authored Aug 25, 2023
1 parent 2d771fb commit 10326a7
Show file tree
Hide file tree
Showing 29 changed files with 140 additions and 136 deletions.
1 change: 1 addition & 0 deletions agent/agent-bootstrap/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ dependencies {
// TODO (heya) remove this when updating to upstream micrometer instrumentation
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
compileOnly("io.opentelemetry:opentelemetry-semconv")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
}
8 changes: 4 additions & 4 deletions agent/agent-bootstrap/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
23 changes: 20 additions & 3 deletions ...ain/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes;
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.util.HashSet;
import java.util.Set;
import java.util.function.BiConsumer;

// copied from OpenTelemetry Instrumentation 1.18.0
// copied from OpenTelemetry Instrumentation 1.29.0

// this is temporary, see
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/3962#issuecomment-906606325
Expand All @@ -35,7 +38,13 @@ private static Set<AttributeKey> buildDurationAlwaysInclude() {
Set<AttributeKey> view = new HashSet<>();
view.add(SemanticAttributes.HTTP_METHOD);
view.add(SemanticAttributes.HTTP_STATUS_CODE); // Optional
view.add(SemanticAttributes.HTTP_FLAVOR); // Optional
view.add(SemanticAttributes.NET_PROTOCOL_NAME); // Optional
view.add(SemanticAttributes.NET_PROTOCOL_VERSION); // Optional
// stable semconv
view.add(HttpAttributes.HTTP_REQUEST_METHOD);
view.add(HttpAttributes.HTTP_RESPONSE_STATUS_CODE);
view.add(NetworkAttributes.NETWORK_PROTOCOL_NAME);
view.add(NetworkAttributes.NETWORK_PROTOCOL_VERSION);
return view;
}

Expand All @@ -47,6 +56,10 @@ private static Set<AttributeKey> buildDurationClientView() {
view.add(SemanticAttributes.NET_PEER_NAME);
view.add(SemanticAttributes.NET_PEER_PORT);
view.add(SemanticAttributes.NET_SOCK_PEER_ADDR);
// stable semconv
view.add(NetworkAttributes.SERVER_SOCKET_ADDRESS);
view.add(NetworkAttributes.SERVER_ADDRESS);
view.add(NetworkAttributes.SERVER_PORT);
return view;
}

Expand All @@ -61,6 +74,8 @@ private static Set<AttributeKey> buildDurationServerView() {
view.add(SemanticAttributes.NET_HOST_NAME);
view.add(SemanticAttributes.NET_HOST_PORT);
view.add(SemanticAttributes.HTTP_ROUTE);
// stable semconv
view.add(UrlAttributes.URL_SCHEME);
// START APPLICATION INSIGHTS MODIFICATIONS
view.add(SemanticAttributes.USER_AGENT_ORIGINAL);
// END APPLICATION INSIGHTS MODIFICATIONS
Expand All @@ -73,9 +88,11 @@ private static Set<AttributeKey> buildActiveRequestsView() {
Set<AttributeKey> view = new HashSet<>();
view.add(SemanticAttributes.HTTP_METHOD);
view.add(SemanticAttributes.HTTP_SCHEME);
view.add(SemanticAttributes.HTTP_FLAVOR);
view.add(SemanticAttributes.NET_HOST_NAME);
view.add(SemanticAttributes.NET_HOST_PORT);
// stable semconv
view.add(HttpAttributes.HTTP_REQUEST_METHOD);
view.add(UrlAttributes.URL_SCHEME);
return view;
}

Expand Down
8 changes: 4 additions & 4 deletions agent/agent-for-testing/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.21.1=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.slf4j:slf4j-api:2.0.7=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.21.1=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.slf4j:slf4j-api:2.0.7=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.slf4j:slf4j-api:2.0.7=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-serialization/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
30 changes: 15 additions & 15 deletions agent/agent-tooling/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ io.netty:netty-transport-native-epoll:4.1.97.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.97.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.97.Final=runtimeClasspath
io.netty:netty-transport:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-api-events:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-extension-incubator:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-semconv:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-api-events:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-extension-incubator:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-semconv:1.29.0-alpha=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.10=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.10=runtimeClasspath
io.projectreactor:reactor-core:3.5.9=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private static void enableInstrumentations(
properties.put("otel.instrumentation.apache-httpasyncclient.enabled", "true");
properties.put("otel.instrumentation.apache-httpclient.enabled", "true");
properties.put("otel.instrumentation.async-http-client.enabled", "true");
properties.put("otel.instrumentation.executor.enabled", "true");
properties.put("otel.instrumentation.executors.enabled", "true");
properties.put("otel.instrumentation.google-http-client.enabled", "true");
properties.put("otel.instrumentation.grpc.enabled", "true");
properties.put("otel.instrumentation.guava.enabled", "true");
Expand Down
6 changes: 1 addition & 5 deletions .../test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ void generateHttpClientMetrics() {
System.out.println("metric: " + metricData);
}

assertThat(metricDataCollection.size()).isEqualTo(3);

assertThat(metricDataCollection)
.satisfiesExactly(
metric ->
Expand All @@ -132,9 +130,7 @@ void generateHttpClientMetrics() {
exemplar ->
exemplar
.hasTraceId("ff01020304050600ff0a0b0c0d0e0f00")
.hasSpanId("090a0b0c0d0e0f00")))),
metric -> assertThat(metric).hasName("http.client.request.size"),
metric -> assertThat(metric).hasName("http.client.response.size"));
.hasSpanId("090a0b0c0d0e0f00")))));

MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
MetricData metricData = metricDataCollection.iterator().next();
Expand Down
8 changes: 4 additions & 4 deletions agent/agent/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
Loading

0 comments on commit 10326a7

Please sign in to comment.