Skip to content

Report OpenTelemetry Agentless SDK and integration #4570

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

Merged
merged 21 commits into from
Jul 30, 2025
Merged

Report OpenTelemetry Agentless SDK and integration #4570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1ce9608
e2e tests for console app
adinauer Jul 10, 2025
a863ac5
fix test failures by waiting for 10s after first try to find envelopes
adinauer Jul 11, 2025
811c9da
add system-test-runner.py script to replace bash scripts for running …
adinauer Jul 11, 2025
16dcaee
use py script for ci, cleanup, makefile
adinauer Jul 11, 2025
5d9f010
Format code
getsentry-bot Jul 11, 2025
bee800a
Merge branch 'main' into feat/e2e-console-app-samples
adinauer Jul 11, 2025
e531d9d
remove bash scripts
adinauer Jul 11, 2025
9d01916
install requests module
adinauer Jul 11, 2025
105e0d0
api
adinauer Jul 11, 2025
195937c
fix gh script
adinauer Jul 11, 2025
d5fd3b0
Implement E2E tests for OTel based console sample
adinauer Jul 21, 2025
e2de187
Let queue drain on a restart
adinauer Jul 21, 2025
4ca9d75
Format code
getsentry-bot Jul 21, 2025
521850d
Merge branch 'main' into feat/e2e-tests-console-otel
adinauer Jul 21, 2025
0ac58fd
fixes after merge
adinauer Jul 21, 2025
469e399
Merge branch 'feat/e2e-tests-console-otel' into feat/sdk-re-init-queu…
adinauer Jul 21, 2025
6886aef
Format code
getsentry-bot Jul 21, 2025
7cbb0cc
Update sentry-samples/sentry-samples-console-opentelemetry-noagent/sr…
adinauer Jul 22, 2025
d764e43
Report agentless SDK and integration when used
adinauer Jul 28, 2025
c6f7d1d
Format code
getsentry-bot Jul 28, 2025
75436ce
Merge branch 'main' into feat/report-agentless-sdk
adinauer Jul 30, 2025
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
2 changes: 2 additions & 0 deletions sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ buildConfig {
tasks.jar {
manifest {
attributes(
"Sentry-Opentelemetry-SDK-Name" to
Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SPRING_SDK_NAME,
"Sentry-Version-Name" to project.version,
"Sentry-SDK-Name" to Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SPRING_SDK_NAME,
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-opentelemetry-agentless-spring",
Expand Down
1 change: 1 addition & 0 deletions sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ buildConfig {
tasks.jar {
manifest {
attributes(
"Sentry-Opentelemetry-SDK-Name" to Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SDK_NAME,
"Sentry-Version-Name" to project.version,
"Sentry-SDK-Name" to Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SDK_NAME,
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-opentelemetry-agentless",
Expand Down
35 changes: 20 additions & 15 deletions sentry/src/main/java/io/sentry/internal/ManifestVersionReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public final class ManifestVersionReader {
private static final @NotNull AutoClosableReentrantLock staticLock =
new AutoClosableReentrantLock();
private volatile boolean hasManifestBeenRead = false;
private volatile @Nullable VersionInfoHolder versionInfo = null;
private final @NotNull VersionInfoHolder versionInfo = new VersionInfoHolder();
private @NotNull AutoClosableReentrantLock lock = new AutoClosableReentrantLock();

public static @NotNull ManifestVersionReader getInstance() {
Expand All @@ -40,6 +40,9 @@ private ManifestVersionReader() {}

public @Nullable VersionInfoHolder readOpenTelemetryVersion() {
readManifestFiles();
if (versionInfo.sdkVersion == null) {
return null;
}
return versionInfo;
}

Expand All @@ -48,7 +51,6 @@ public void readManifestFiles() {
return;
}

@Nullable VersionInfoHolder infoHolder = null;
try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
if (hasManifestBeenRead) {
return;
Expand All @@ -66,28 +68,32 @@ public void readManifestFiles() {
final @Nullable String packageName = mainAttributes.getValue("Sentry-SDK-Package-Name");

if (name != null && version != null) {
infoHolder = new VersionInfoHolder();
infoHolder.sdkName = name;
infoHolder.sdkVersion = version;
infoHolder.packages.add(
new SentryPackage("maven:io.sentry:sentry-opentelemetry-agent", version));
versionInfo.sdkName = name;
versionInfo.sdkVersion = version;
final @Nullable String otelVersion =
mainAttributes.getValue("Sentry-Opentelemetry-Version-Name");
if (otelVersion != null) {
infoHolder.packages.add(
versionInfo.packages.add(
new SentryPackage("maven:io.opentelemetry:opentelemetry-sdk", otelVersion));
infoHolder.integrations.add("OpenTelemetry");
versionInfo.integrations.add("OpenTelemetry");
}
final @Nullable String otelJavaagentVersion =
mainAttributes.getValue("Sentry-Opentelemetry-Javaagent-Version-Name");
if (otelJavaagentVersion != null) {
infoHolder.packages.add(
versionInfo.packages.add(
new SentryPackage(
"maven:io.opentelemetry.javaagent:opentelemetry-javaagent",
otelJavaagentVersion));
infoHolder.integrations.add("OpenTelemetry-Agent");
versionInfo.integrations.add("OpenTelemetry-Agent");
}
if (name.equals("sentry.java.opentelemetry.agentless")) {
SentryIntegrationPackageStorage.getInstance()
.addIntegration("OpenTelemetry-Agentless");
}
if (name.equals("sentry.java.opentelemetry.agentless-spring")) {
SentryIntegrationPackageStorage.getInstance()
.addIntegration("OpenTelemetry-Agentless-Spring");
Copy link

@cursor cursor bot Jul 30, 2025

Choose a reason for hiding this comment

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

Bug: Manifest Loop Issue Causes SDK Version Overwrite

The removal of the break statement from the manifest processing loop causes versionInfo.sdkName and versionInfo.sdkVersion to be overwritten by each subsequent OpenTelemetry manifest found. This leads to non-deterministic and potentially incorrect SDK version reporting, as only the last processed manifest's details are retained. Furthermore, the maven:io.sentry:sentry-opentelemetry-agent package is no longer added, resulting in incomplete package information.

Locations (1)
Fix in Cursor Fix in Web

Comment on lines +90 to +95
Copy link
Member

@lcian lcian Jul 30, 2025

Choose a reason for hiding this comment

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

I think we should add to versionInfo here, not to SentryIntegrationPackageStorage directly.

Copy link
Member Author

@adinauer adinauer Jul 30, 2025

Choose a reason for hiding this comment

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

It feels much cleaner to just remove integrations and packages from VersionInfoHolder and add them directly.
That's also what ManifestVersionDetector expects.

}
break;
}

if (sdkName != null
Expand All @@ -105,13 +111,12 @@ public void readManifestFiles() {
// ignore
} finally {
hasManifestBeenRead = true;
versionInfo = infoHolder;
}
}

public static final class VersionInfoHolder {
private @Nullable String sdkName;
private @Nullable String sdkVersion;
private volatile @Nullable String sdkName;
private volatile @Nullable String sdkVersion;
private List<SentryPackage> packages = new ArrayList<>();
private List<String> integrations = new ArrayList<>();

Expand Down
Loading