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

Add span baggage processor #11697

Merged
merged 7 commits into from
Jul 19, 2024
+45 −37
Merged

Add span baggage processor #11697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfb67be
add (snapshot) contrib baggage
SylvainJuge Jun 28, 2024
5fe7ac3
add baggage processor
SylvainJuge Jun 28, 2024
29c62c4
update licenses
SylvainJuge Jul 1, 2024
b94ff9a
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jul 4, 2024
fbef2ec
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jul 19, 2024
0b661f4
update licenses
SylvainJuge Jul 19, 2024
316ef20
update generate license report command hint
SylvainJuge Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"io.opentelemetry.contrib:opentelemetry-aws-resources",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
"io.opentelemetry.contrib:opentelemetry-gcp-resources",
"io.opentelemetry.contrib:opentelemetry-baggage-processor",
"io.opentelemetry.proto:opentelemetry-proto",
"io.opentelemetry.semconv:opentelemetry-semconv"
],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
then
echo "Licenses are up-to-date."
else
echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport' locally and commit."
echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport --no-build-cache' locally and commit."
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[for reviewer] suggest to use command that is actually used in the test to detect when the licenses are not up-to-date, otherwise they might not be properly updated locally.

echo
echo "$(git diff --cached --stat licenses)"
echo
Expand Down
3 changes: 2 additions & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions

// this line is managed by .github/scripts/update-sdk-version.sh
val otelSdkVersion = "1.40.0"
val otelContribVersion = "1.36.0-alpha"
val otelContribVersion = "1.37.0-alpha"
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

// Need both BOM and groovy jars
Expand Down Expand Up @@ -102,6 +102,7 @@ val DEPENDENCIES = listOf(
"io.opentelemetry.contrib:opentelemetry-aws-resources:${otelContribVersion}",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:${otelContribVersion}",
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
"io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha",
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
"org.assertj:assertj-core:3.26.3",
Expand Down
1 change: 1 addition & 0 deletions instrumentation/spring/starters/spring-boot-starter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ dependencies {

implementation("io.opentelemetry.contrib:opentelemetry-aws-resources")
implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources")
implementation("io.opentelemetry.contrib:opentelemetry-baggage-processor")
}
1 change: 1 addition & 0 deletions javaagent-tooling/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencies {

implementation("io.opentelemetry.contrib:opentelemetry-aws-resources")
implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources")
implementation("io.opentelemetry.contrib:opentelemetry-baggage-processor")

api("net.bytebuddy:byte-buddy-dep")
implementation("org.ow2.asm:asm-tree")
Expand Down
Loading
Loading