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

Switch from http.flavor to net.protocol.* in HTTP client instrumentat… #8131

Merged
merged 13 commits into from
Apr 7, 2023
Merged

Switch from http.flavor to net.protocol.* in HTTP client instrumentat… #8131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a682618
Switch from http.flavor to net.protocol.* in HTTP client instrumentat…
Mar 24, 2023
6b1777a
r2dbc
Mar 27, 2023
cdb4a57
fix jodd test compilation
Mar 27, 2023
5df5d12
fix tests
Mar 27, 2023
0573b66
fix tests
Mar 27, 2023
2db9a9a
fix tests
Mar 27, 2023
b63a507
fix tests
Mar 27, 2023
d676f19
fix tests
Mar 27, 2023
340087f
codenarc
Mar 27, 2023
546135c
fix tests
Mar 28, 2023
9280672
code review comments
Mar 29, 2023
9ef8b0a
errorprone
Mar 29, 2023
d63d44e
Add defaults back to getProtocol*()
Apr 4, 2023
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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
Mateusz Rzeszutek committed Apr 6, 2023
commit b63a507e948c071303e4f9fbd74bf80f1378e369
1 change: 0 additions & 1 deletion ...test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import com.amazonaws.services.s3.AmazonS3Client
import com.amazonaws.services.s3.AmazonS3ClientBuilder
import io.opentelemetry.api.trace.Span
import io.opentelemetry.api.trace.SpanKind
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest
import io.opentelemetry.instrumentation.test.AgentTestTrait
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
Expand Down
10 changes: 10 additions & 0 deletions ...entation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ import com.sun.jersey.api.client.ClientResponse
import com.sun.jersey.api.client.WebResource
import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter
import com.sun.jersey.api.client.filter.LoggingFilter
import io.opentelemetry.api.common.AttributeKey
import io.opentelemetry.instrumentation.test.AgentTestTrait
import io.opentelemetry.instrumentation.test.base.HttpClientTest
import spock.lang.Shared

import static io.opentelemetry.api.common.AttributeKey.stringKey

class JaxRsClientV1Test extends HttpClientTest<WebResource.Builder> implements AgentTestTrait {

@Shared
Expand Down Expand Up @@ -46,4 +49,11 @@ class JaxRsClientV1Test extends HttpClientTest<WebResource.Builder> implements A
boolean testCallback() {
false
}

Set<AttributeKey<?>> httpAttributes(URI uri) {
def attributes = super.httpAttributes(uri)
attributes.remove(stringKey("net.protocol.name"))
attributes.remove(stringKey("net.protocol.version"))
return attributes
}
}