Skip to content

Update the OpenTelemetry SDK version to 1.37.0#11066

Merged
laurit merged 16 commits into
open-telemetry:mainfrom
zeitlinger:sdk-37
Apr 10, 2024
Merged

Update the OpenTelemetry SDK version to 1.37.0#11066
laurit merged 16 commits into
open-telemetry:mainfrom
zeitlinger:sdk-37

Conversation

@zeitlinger

Copy link
Copy Markdown
Member

No description provided.

@zeitlinger zeitlinger self-assigned this Apr 9, 2024
@zeitlinger zeitlinger requested a review from a team April 9, 2024 06:57
@github-actions github-actions Bot added the test native This label can be applied to PRs to trigger them to run native tests label Apr 9, 2024
@github-actions github-actions Bot requested a review from theletterf April 9, 2024 06:58
dependencies {
implementation(project(":instrumentation-api"))
implementation("io.opentelemetry:opentelemetry-extension-incubator")
implementation("io.opentelemetry:opentelemetry-api-incubator")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

is this dependency needed at all?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

yes, for EventLogger

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this module does not use EventLogger as far as I can tell

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

right, mixed that up with another module - removed

Comment on lines +103 to +116
@Override
@CanIgnoreReturnValue
public Span addLink(SpanContext spanContext) {
agentSpan.addLink(Bridging.toAgent(spanContext));
return this;
}

@Override
@CanIgnoreReturnValue
public Span addLink(SpanContext spanContext, Attributes attributes) {
agentSpan.addLink(Bridging.toAgent(spanContext), Bridging.toAgent(attributes));
return this;
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this deviates a bit from our usual approach of adding bridging for new methods in a subclass, but here it is much easier to do it the way it is so I think it is fine.

Comment on lines 18 to 21
configurations.configureEach {
if (name == "testRuntimeClasspath" || name == "testCompileClasspath") {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api:1.31.0")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@laurit should we add something similar in all of the opentelemetry-api-* javaagent modules?

Comment on lines +18 to +26
testing {
suites {
val incubatorTest by registering(JvmTestSuite::class) {
dependencies {
implementation("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

it might be worth adding an oldAndNewIncubatorTest that pulls in both the -extension-incubator and -api-incubator artifacts

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@laurit laurit merged commit 96c4922 into open-telemetry:main Apr 10, 2024
@zeitlinger zeitlinger deleted the sdk-37 branch April 10, 2024 08:09
laurit added a commit to laurit/opentelemetry-java-instrumentation that referenced this pull request Apr 12, 2024
Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

test native This label can be applied to PRs to trigger them to run native tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants