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

Support stable HTTP semconv #3418

Merged
merged 94 commits into from
Feb 17, 2024
Merged

Support stable HTTP semconv #3418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
4979fdc
Support stable HTTP semconv
trask Dec 2, 2023
f763853
Test with SNAPSHOT
trask Jan 6, 2024
4dd1077
Update dependency version
trask Jan 6, 2024
d520ec8
Merge remote-tracking branch 'origin/main' into stable-http-semconv
heyams Jan 10, 2024
483ad50
Fix
heyams Jan 10, 2024
b2b595f
Fix license
heyams Jan 10, 2024
4fc4e1d
exporter jar
heyams Jan 10, 2024
b42259a
Update exporter
heyams Jan 10, 2024
1244320
Fix lettuce smoke test
heyams Jan 11, 2024
9c9e151
Revert samplingoverrides
heyams Jan 11, 2024
66bc14b
Update artifact
heyams Jan 11, 2024
3bbae68
Fix compilation
heyams Jan 11, 2024
8ca9345
Fix cassandra
heyams Jan 11, 2024
7da6073
Fix telemetry processor smoke tests
heyams Jan 12, 2024
d177d4d
Revert timeout
heyams Jan 12, 2024
40398d4
Bump otelInstrumentationAlphaVersion from 1.32.0-alpha to 2.0.0-alpha
dependabot[bot] Jan 15, 2024
3280d9e
Fix sampling overrides
heyams Jan 16, 2024
f766534
Merge branch 'main' into stable-http-semconv
heyams Jan 16, 2024
7f465b9
Fix
heyams Jan 16, 2024
4e510fc
Fix spotless
heyams Jan 16, 2024
30edc3f
Merge branch 'main' into dependabot/gradle/otelInstrumentationAlphaVe…
heyams Jan 16, 2024
a174aa4
Fix
heyams Jan 17, 2024
f285aa2
Merge branch 'dependabot/gradle/otelInstrumentationAlphaVersion-2.0.0…
heyams Jan 17, 2024
3831a7a
Merge branch 'main' into dependabot/gradle/otelInstrumentationAlphaVe…
heyams Jan 17, 2024
ee47127
./gradlew resolveAndLockAll --write-locks
github-actions[bot] Jan 17, 2024
c069df4
Merge branch 'main' into stable-http-semconv
heyams Jan 17, 2024
e1a53b6
Fix
heyams Jan 17, 2024
146d1eb
Merge branch 'dependabot/gradle/otelInstrumentationAlphaVersion-2.0.0…
heyams Jan 17, 2024
95bf571
Update dependency
heyams Jan 18, 2024
5856526
Fix
heyams Jan 18, 2024
4003137
Fix
heyams Jan 18, 2024
379d20f
Fix
heyams Jan 18, 2024
5c9ccca
Fix tests
heyams Jan 18, 2024
46e819a
Merge branch 'dependabot/gradle/otelInstrumentationAlphaVersion-2.0.0…
heyams Jan 22, 2024
20d5db0
Merge remote-tracking branch 'origin/main' into stable-http-semconv
heyams Jan 22, 2024
29b49ae
Fix
heyams Jan 22, 2024
4a81a18
Update jar
heyams Jan 23, 2024
65c7d91
Fix tests
heyams Jan 23, 2024
24f874a
Fix unit tests
heyams Jan 23, 2024
6da7a6a
Fix
heyams Jan 23, 2024
5baa39d
Enable controller span based on customer's config
heyams Jan 23, 2024
df80579
Revert lettuce test
heyams Jan 23, 2024
3a13791
Delete test jar
heyams Jan 23, 2024
d6e62a7
Exclude io.prometheus dependency
heyams Jan 24, 2024
efcdecc
Fix
heyams Jan 24, 2024
338c657
Exclude inst/io/prometheus/**
heyams Jan 25, 2024
06ac279
Fix tests
heyams Jan 25, 2024
1524358
Support more attributes backward compat
heyams Jan 26, 2024
3c68992
Merge remote-tracking branch 'origin/main' into stable-http-semconv
heyams Jan 26, 2024
7a91df5
Comments
heyams Jan 26, 2024
61ed5da
Fix spotless
heyams Jan 26, 2024
2907029
Fix request and response headers
heyams Jan 26, 2024
30bc116
Take care both client and server headers
heyams Jan 26, 2024
7df456d
Update exporter to beta.17
heyams Jan 26, 2024
8dce2bd
Update test
heyams Jan 26, 2024
6900345
Update httpheader test
heyams Jan 26, 2024
1466795
Merge branch 'main' into stable-http-semconv
heyams Jan 26, 2024
82348fe
Comments
heyams Jan 26, 2024
098812a
Merge branch 'stable-http-semconv' of https://github.com/microsoft/Ap…
heyams Jan 26, 2024
084407f
Revert lettuceTest
heyams Jan 26, 2024
b995bea
Fix test
heyams Jan 26, 2024
e26cc08
Fix backward compat for http request/response header and sampling ove…
heyams Jan 27, 2024
0bde40c
Do not normalize http request or server headers
heyams Jan 27, 2024
833a53f
Revert debug
heyams Jan 27, 2024
ce59702
Support telemetry processor
heyams Jan 30, 2024
d4ed187
Address comments
heyams Jan 30, 2024
9442172
Remove description
heyams Jan 30, 2024
cb4a2b9
Fix naming
heyams Jan 30, 2024
30ffce7
Update licenses
heyams Jan 30, 2024
625bbad
Clean up log
heyams Jan 30, 2024
98a2cdb
Add a comment
heyams Jan 30, 2024
c100908
Fix test
heyams Jan 30, 2024
fc41cc8
Track pekko feature
heyams Jan 30, 2024
42e5719
Fix spotless
heyams Jan 30, 2024
a529656
Comments
heyams Feb 5, 2024
171c5e9
Merge branch 'main' into stable-http-semconv
heyams Feb 5, 2024
b79e571
Add a smoke test to delete existing log attribute
heyams Feb 6, 2024
b57ff39
Merge branch 'stable-http-semconv' of https://github.com/microsoft/Ap…
heyams Feb 6, 2024
6f0ebf4
Merge branch 'main' into stable-http-semconv
heyams Feb 6, 2024
c53ec47
Fix license
heyams Feb 7, 2024
6963d1c
Wildfly tests run forever
heyams Feb 7, 2024
cd0d341
Merge branch 'main' into stable-http-semconv
heyams Feb 12, 2024
c39d85e
Fix merge conflicts
heyams Feb 12, 2024
24da3ce
Comments
heyams Feb 13, 2024
bf792f8
Comments
heyams Feb 14, 2024
4c105b2
Merge branch 'main' into stable-http-semconv
heyams Feb 14, 2024
46416a3
Update license
heyams Feb 14, 2024
3d2bfa4
Add a todo
heyams Feb 15, 2024
af69a3b
Fix server span
heyams Feb 15, 2024
26b3e5d
Enable wildfly tests
heyams Feb 16, 2024
43abe9b
Bump OTEL to 2.1.0
heyams Feb 16, 2024
ae6daf1
Fix todos
heyams Feb 16, 2024
7cbf204
Remove debug logging
heyams Feb 16, 2024
9a42de2
Fix spotless
heyams Feb 16, 2024
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
2 changes: 1 addition & 1 deletion agent/agent-bootstrap/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +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")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
}
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 @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=runtimeClasspath
empty=
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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=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.16.1=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.24.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.slf4j:slf4j-api:2.0.12=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=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.16.1=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.24.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.slf4j:slf4j-api:2.0.12=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.slf4j:slf4j-api:2.0.12=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-jfr/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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-serialization/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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics/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.20=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
io.netty:netty-bom:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
org.junit:junit-bom:5.10.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.19.5=runtimeClasspath
empty=
6 changes: 3 additions & 3 deletions agent/agent-tooling/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation(project(":agent:agent-profiler:agent-diagnostics"))
implementation(project(":etw:java"))

implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.15")
implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.17")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")
Expand Down Expand Up @@ -66,15 +66,15 @@ dependencies {

compileOnly(project(":agent:agent-bootstrap"))
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")

compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")

testImplementation(project(":agent:agent-bootstrap"))
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")

testImplementation("org.junit.jupiter:junit-jupiter")
Expand Down
34 changes: 16 additions & 18 deletions agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.13.11=runtimeClasspath
com.azure:azure-core:1.45.1=runtimeClasspath
com.azure:azure-identity:1.11.2=runtimeClasspath
com.azure:azure-json:1.1.0=runtimeClasspath
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.15=runtimeClasspath
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.17=runtimeClasspath
com.azure:azure-sdk-bom:1.2.20=runtimeClasspath
com.azure:azure-storage-blob:12.25.1=runtimeClasspath
com.azure:azure-storage-common:12.24.1=runtimeClasspath
Expand All @@ -22,9 +22,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
com.fasterxml.woodstox:woodstox-core:6.5.1=runtimeClasspath
com.github.oshi:oshi-core:6.4.12=runtimeClasspath
com.github.spotbugs:spotbugs-annotations:4.8.3=runtimeClasspath
com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.24.1=runtimeClasspath
com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
com.microsoft.azure:msal4j-persistence-extension:1.2.0=runtimeClasspath
Expand Down Expand Up @@ -57,21 +55,21 @@ io.netty:netty-transport-native-epoll:4.1.107.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.107.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.107.Final=runtimeClasspath
io.netty:netty-transport:4.1.107.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-api-events:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.32.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.32.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.1.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.1.0=runtimeClasspath
io.opentelemetry:opentelemetry-api-events:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-extension-incubator:1.35.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.35.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.35.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.1.15=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.1.15=runtimeClasspath
io.projectreactor:reactor-core:3.5.14=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,10 +1259,10 @@ public void validate() {
}

public static class ProcessorAction {
@Nullable public final AttributeKey<String> key;
@Nullable public AttributeKey<String> key;
public final ProcessorActionType action;
public final String value;
@Nullable public final AttributeKey<String> fromAttribute;
@Nullable public AttributeKey<String> fromAttribute;
@Nullable public final ExtractAttribute extractAttribute;
@Nullable public final MaskAttribute maskAttribute;

Expand Down