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

Bump otelInstrumentationAlphaVersion from 1.24.0-alpha to 1.25.0-alpha #3005

Merged
merged 55 commits into from
Apr 20, 2023
Merged

Bump otelInstrumentationAlphaVersion from 1.24.0-alpha to 1.25.0-alpha #3005

Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
6b82d80
Build changes: Add an Automatic Module Name to Runtime Attach library…
KrogerWalt Sep 12, 2022
78bd11c
Fix a typo (#2516)
heyams Sep 12, 2022
2d85732
Add start-up diagnostics (resident-set size, native memory tracking) …
jeanbisutti Sep 13, 2022
f073ce0
Add classpath and input arguments to the self-diagnostics (#2517)
jeanbisutti Sep 14, 2022
4d10e1a
Allow suppressing all metrics (#2490)
trask Sep 14, 2022
3faa91b
Simplify metrics views (#2515)
trask Sep 14, 2022
c38bf3e
More Automatic-Module-Name (#2506)
trask Sep 14, 2022
fc736d3
Fix sampling for custom instrumentation (#2513)
trask Sep 15, 2022
c9114ad
Bump version for upcoming release (#2520)
trask Sep 15, 2022
3813ecf
Update to otel 1.18.0 (#2509)
trask Sep 16, 2022
5f27872
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Sep 16, 2022
bcf3c92
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Sep 16, 2022
c6fd611
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Sep 16, 2022
2511eaf
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Sep 16, 2022
14619f7
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Jan 10, 2023
4875d5a
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Jan 23, 2023
a73ff22
Explain why we're not ready for spring-boot-3 yet
heyams Jan 31, 2023
e44c648
Bump otelInstrumentationAlphaVersion from 1.24.0-alpha to 1.25.0-alpha
dependabot[bot] Apr 14, 2023
cf1e6ee
Update lockfile
heyams Apr 14, 2023
5716133
Update license
heyams Apr 14, 2023
f5365f1
Fix
heyams Apr 14, 2023
ab8e243
Fix licenses
heyams Apr 14, 2023
aa4bff4
Update otelInstrumentationVersion to 1.25
heyams Apr 14, 2023
cbe0cd4
Update license
heyams Apr 14, 2023
56c6b11
Merge branch 'main' into dependabot/gradle/otelInstrumentationAlphaVe…
heyams Apr 14, 2023
1de7792
Merge remote-tracking branch 'origin/main' into dependabot/gradle/ote…
heyams Apr 14, 2023
e38ecef
Fix nullpointer
heyams Apr 14, 2023
6094a8f
Update slf4j to 2.0.7 by fixing io.opentelemetry.javaagent.slf4j.Logg…
heyams Apr 14, 2023
3721fc2
Revert slf4j back to 1.7.36
heyams Apr 17, 2023
59d85ef
Update upstream slf4jsimplerlogger path
heyams Apr 17, 2023
00d1b2e
Fix nosuchmethod from upstream slf4jsimplerlogger
heyams Apr 18, 2023
22ff082
No need to exclude slf4jsimplelogger anymore
heyams Apr 18, 2023
bc1961b
Fix classcastexception
heyams Apr 18, 2023
02d9674
Revert build.gradle.kts
heyams Apr 18, 2023
ef33186
Fix tests
heyams Apr 18, 2023
3938fab
Fix more tests
heyams Apr 18, 2023
2ca4044
Replace http.user_agent with user_agent.original
heyams Apr 18, 2023
030101f
Fix methodTest
heyams Apr 18, 2023
859b43a
Validate 'user_agent.original'
heyams Apr 18, 2023
144a6a0
Remove duplicate line
heyams Apr 18, 2023
50e734f
Fix tests
heyams Apr 18, 2023
91e19b4
Fix tests
heyams Apr 18, 2023
864f32c
Fix
heyams Apr 18, 2023
0804b17
Revert changes in tests
heyams Apr 18, 2023
bfef633
Revert
heyams Apr 18, 2023
e53a2d0
Rename
heyams Apr 19, 2023
617ba99
Fix userAgent context lost between span to metric
heyams Apr 19, 2023
167cac2
Fix marker entry is no longer available for logback
heyams Apr 19, 2023
750a3f5
Add a todo
heyams Apr 19, 2023
a393a58
Map logback.marker
heyams Apr 20, 2023
4fc9c1f
Update License
heyams Apr 20, 2023
9ded101
Merge remote-tracking branch 'origin/main' into dependabot/gradle/ote…
trask Apr 20, 2023
26c8222
updates
trask Apr 20, 2023
e936910
Keep the same marker key
heyams Apr 20, 2023
e3d37e6
Use comma separated string to represent string array
heyams Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=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.91.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.91.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.91.Final=runtimeClasspath
io.netty:netty-transport:4.1.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.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.5=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.5=runtimeClasspath
io.projectreactor:reactor-core:3.5.4=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.6=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.6=runtimeClasspath
io.projectreactor:reactor-core:3.5.5=runtimeClasspath
net.java.dev.jna:jna-platform:5.13.0=runtimeClasspath
net.java.dev.jna:jna:5.13.0=runtimeClasspath
net.minidev:accessors-smart:2.4.9=runtimeClasspath
Expand Down
5 changes: 5 additions & 0 deletions .../main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public Context onStart(Context context, R request, Attributes startAttributes) {
span.setAttribute(AiSemanticAttributes.INTERNAL_ROLE_NAME, roleNameOverride);
}

String userAgent = startAttributes.get(SemanticAttributes.USER_AGENT_ORIGINAL);
if (userAgent != null) {
newContext = newContext.with(AiContextKeys.USER_AGENT, userAgent);
}

return newContext;
}

Expand Down
3 changes: 3 additions & 0 deletions ...ng/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ public final class AiContextKeys {
public static final ContextKey<String> ROLE_NAME =
ContextKey.named("applicationinsights.internal.role_name");

public static final ContextKey<String> USER_AGENT =
ContextKey.named("applicationinsights.internal.user_agent");

heyams marked this conversation as resolved.
Show resolved Hide resolved
private AiContextKeys() {}
}
5 changes: 5 additions & 0 deletions .../src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ public static String getAgentVersion() {
return agentVersion;
}

@Override
public String name() {
return "applicationinsights";
}

@Override
public void init() {
try {
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/com/microsoft/applicationinsights/agent/internal/init/Slf4jInternalLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class Slf4jInternalLogger extends InternalLogger {
public class Slf4jInternalLogger implements InternalLogger {

static Slf4jInternalLogger create(String name) {
return new Slf4jInternalLogger(name);
Expand All @@ -21,7 +21,7 @@ static Slf4jInternalLogger create(String name) {
}

@Override
protected boolean isLoggable(InternalLogger.Level level) {
public boolean isLoggable(Level level) {
switch (level) {
case TRACE:
return logger.isTraceEnabled();
Expand All @@ -38,7 +38,7 @@ protected boolean isLoggable(InternalLogger.Level level) {
}

@Override
protected void log(InternalLogger.Level level, String message, @Nullable Throwable error) {
public void log(Level level, String message, @Nullable Throwable error) {
switch (level) {
case TRACE:
logger.trace(message, error);
Expand All @@ -60,7 +60,7 @@ protected void log(InternalLogger.Level level, String message, @Nullable Throwab
}

@Override
protected String name() {
public String name() {
return logger.getName();
}
}
2 changes: 1 addition & 1 deletion ...c/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricViewAttributesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public Attributes process(Attributes incoming, Context context) {
}
applyView(builder, incoming, attributeKeys);
if (captureSynthetic) {
builder.put(AiSemanticAttributes.IS_SYNTHETIC, UserAgents.isBot(incoming));
builder.put(AiSemanticAttributes.IS_SYNTHETIC, UserAgents.isBot(context));
}
return builder.build();
}
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/UserAgents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

package io.opentelemetry.sdk.metrics.internal.view;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import com.microsoft.applicationinsights.agent.internal.init.AiContextKeys;
import io.opentelemetry.context.Context;

final class UserAgents {

static boolean isBot(Attributes attributes) {
String userAgent = attributes.get(SemanticAttributes.HTTP_USER_AGENT);
static boolean isBot(Context context) {
String userAgent = context.get(AiContextKeys.USER_AGENT);
heyams marked this conversation as resolved.
Show resolved Hide resolved
return userAgent != null && userAgent.contains("AlwaysOn");
}

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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
7 changes: 7 additions & 0 deletions agent/agent/src/main/java/com/microsoft/applicationinsights/agent/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ public static void premain(String agentArgs, Instrumentation inst) {
StartupProfiler.start();
}

// https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7339
// Starting 1.25.0, OpenTelemetry defaults logger to Slf4jSimplerlogger when system property
// "otel.javaagent.logging" is null.
// Setting this system property programmatically will tell agent class loader to load our
// Slf4jInternalLogger instead.
System.setProperty("otel.javaagent.logging", "applicationinsights");

OpenTelemetryAgent.premain(agentArgs, inst);
}

Expand Down
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.91.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.91.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.91.Final=runtimeClasspath
io.netty:netty-transport:4.1.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.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.5=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.5=runtimeClasspath
io.projectreactor:reactor-core:3.5.4=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.6=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.6=runtimeClasspath
io.projectreactor:reactor-core:3.5.5=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.9=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/azure/monitor/opentelemetry/exporter/implementation/SemanticAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ public final class SemanticAttributes {
* Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
* User-Agent</a> header sent by the client.
*/
public static final AttributeKey<String> HTTP_USER_AGENT = stringKey("http.user_agent");
public static final AttributeKey<String> USER_AGENT_ORIGINAL = stringKey("user_agent.original");

/**
* The size of the request payload body in bytes. This is the number of bytes transferred
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public final class SpanDataMapper {
.ignoreExact(AiSemanticAttributes.KAFKA_RECORD_QUEUE_TIME_MS.getKey())
.ignoreExact(AiSemanticAttributes.KAFKA_OFFSET.getKey())
.exact(
SemanticAttributes.HTTP_USER_AGENT.getKey(),
SemanticAttributes.USER_AGENT_ORIGINAL.getKey(),
(builder, value) -> {
if (value instanceof String) {
builder.addTag("ai.user.userAgent", (String) value);
Expand Down
8 changes: 4 additions & 4 deletions agent/instrumentation/applicationinsights-web-2.3/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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/instrumentation/azure-functions-worker-stub/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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/instrumentation/azure-functions/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.11=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.91.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=