Skip to content

Commit

Permalink
Bump otelInstrumentationAlphaVersion from 1.29.0-alpha to 1.30.0-alpha (
Browse files Browse the repository at this point in the history 
#3292)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@dependabot @trask @github-actions
3 people committed Sep 17, 2023
1 parent 4824fa9 commit 265b23c
Show file tree
Hide file tree
Showing 35 changed files with 164 additions and 169 deletions.
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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion ...ain/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
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 io.opentelemetry.semconv.SemanticAttributes;
import java.util.HashSet;
import java.util.Set;
import java.util.function.BiConsumer;
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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.slf4j:slf4j-api:2.0.9=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.slf4j:slf4j-api:2.0.9=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.slf4j:slf4j-api:2.0.9=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
29 changes: 14 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,20 @@ 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.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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-api-events:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-extension-incubator:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.30.1=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.30.1=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.11=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.11=runtimeClasspath
io.projectreactor:reactor-core:3.5.10=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.logs.data.LogRecordData;
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.util.Collection;
import java.util.List;
import java.util.function.Consumer;
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.util.List;
import javax.annotation.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.io.File;
import java.time.Duration;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverrides.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package io.opentelemetry.sdk.metrics.internal.view;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.util.HashSet;
import java.util.Set;

Expand Down
2 changes: 1 addition & 1 deletion agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/UserAgents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package io.opentelemetry.sdk.metrics.internal.view;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;

final class UserAgents {

Expand Down
2 changes: 1 addition & 1 deletion .../test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.internal.view.AiViewRegistry;
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=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/instrumentation/applicationinsights-web-2.3/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.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
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.30.1=runtimeClasspath
org.junit:junit-bom:5.10.0=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion ...elemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
Expand Down
6 changes: 3 additions & 3 deletions ...instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
import static io.opentelemetry.api.trace.SpanKind.SERVER;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_FUNCTION;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_NAMESPACE;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.ENDUSER_ID;
import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION;
import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE;
import static io.opentelemetry.semconv.SemanticAttributes.ENDUSER_ID;
import static org.assertj.core.api.Assertions.assertThat;

import com.microsoft.applicationinsights.web.internal.correlation.TraceContextCorrelation;
Expand Down

0 comments on commit 265b23c

Please sign in to comment.