chore: misc otel internalization/cleanup #2835
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
product-auto-label
bot
added
size: m
BenWhitehead
commented
Dec 5, 2024
| @@ -219,7 +220,7 @@ public Bucket create(BucketInfo bucketInfo, BucketTargetOption... options) { | |||
| .setParent("projects/_"); | |||
| CreateBucketRequest req = opts.createBucketsRequest().apply(builder).build(); | |||
| GrpcCallContext merge = Utils.merge(grpcCallContext, Retrying.newCallContext()); | |||
| try (OpenTelemetryTraceUtil.Scope unused = otelSpan.makeCurrent()) { | |||
| try (OpenTelemetryTraceUtil.Scope ignored = otelSpan.makeCurrent()) { | |||
There was a problem hiding this comment.
renamed variables to remove warnings from intellij.
BenWhitehead
commented
Dec 5, 2024
| this.storageOptions = storageOptions; | ||
| this.openTelemetry = storageOptions.getOpenTelemetrySdk(); | ||
| this.tracer = | ||
| openTelemetry.getTracer(LIBRARY_NAME, GaxProperties.getLibraryVersion(this.getClass())); | ||
| this.tracer = openTelemetry.getTracer(LIBRARY_NAME, storageOptions.getLibraryVersion()); |
There was a problem hiding this comment.
Switch to using the logic from storageOptions rather than gax. Our version is more stable to repackaging, and is what is used for headers and such. We will want to keep them in sync.
BenWhitehead
commented
Dec 5, 2024
| @@ -193,9 +191,9 @@ private SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) | |||
| spanBuilder = | |||
| spanBuilder.setAllAttributes( | |||
| Attributes.builder() | |||
| .put("gcp.client.version", GaxProperties.getLibraryVersion(this.getClass())) | |||
| .put("gcp.client.version", storageOptions.getLibraryVersion()) | |||
BenWhitehead
commented
Dec 5, 2024
| .put("gcp.client.repo", "googleapis/java-storage") | ||
| .put("gcp.client.artifact", "com.google.cloud.google-cloud-storage") | ||
| .put("gcp.client.artifact", "com.google.cloud:google-cloud-storage") |
There was a problem hiding this comment.
use the maven package format
sydney-munro
approved these changes
Dec 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.