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.

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

Update net semantic convention changes #6268

Merged
merged 16 commits into from
Aug 18, 2022

Conversation

trask
Copy link
Member

@trask trask commented Jul 6, 2022

Pros:

  • minimum changes

Cons:

  • the mapping between NetClientAttributesGetter and the semantic attributes feels a little magic because of the post-processing done in NetClientAttributesExtractor

Option B: don't do any post-processing in NetClientAttributesExtractor

Pros:

  • clear/direct mapping between NetClientAttributesGetter and semantic attributes

Cons:

  • end up duplicating logic in the InetSocketAddressNetClientAttributesGetter methods, which starts to feel inefficient since they are all called:
  @Override
  @Nullable
  public final String peerName(REQUEST request, @Nullable RESPONSE response) {
    InetSocketAddress address = getAddress(request, response);
    if (address == null) {
      return null;
    }
    String hostString = address.getHostString();
    if (hostString == null) {
      return null;
    }
    InetAddress remoteAddress = address.getAddress();
    if (remoteAddress != null && hostString.equals(remoteAddress.getHostAddress())) {
      // using net.sock.peer.addr in this case
      return null;
    }
    return hostString;
  }

  @Override
  @Nullable
  public final Integer peerPort(REQUEST request, @Nullable RESPONSE response) {
    InetSocketAddress address = getAddress(request, response);
    if (address == null) {
      return null;
    }
    String hostString = address.getHostString();
    if (hostString == null) {
      // using net.sock.peer.port in this case
      return null;
    }
    InetAddress remoteAddress = address.getAddress();
    if (remoteAddress != null && hostString.equals(remoteAddress.getHostAddress())) {
      // using net.sock.peer.port in this case
      return null;
    }
    return address.getPort();
  }

  @Override
  @Nullable
  public final String sockPeerAddr(REQUEST request, @Nullable RESPONSE response) {
    InetSocketAddress address = getAddress(request, response);
    if (address == null) {
      return null;
    }
    InetAddress remoteAddress = address.getAddress();
    if (remoteAddress != null) {
      return remoteAddress.getHostAddress();
    }
    return null;
  }

  @Override
  @Nullable
  public final Integer sockPeerPort(REQUEST request, @Nullable RESPONSE response) {
    InetSocketAddress address = getAddress(request, response);
    if (address == null) {
      return null;
    }
    String hostString = address.getHostString();
    if (hostString == null) {
      return address.getPort();
    }
    InetAddress remoteAddress = address.getAddress();
    if (remoteAddress != null && hostString.equals(remoteAddress.getHostAddress())) {
      return address.getPort();
    }
    // using net.peer.port in this case
    return null;
  }

Option C: introduce InetSocketAddressNetClientAttributesExtractor

...and change InetSocketAddressNetClientAttributesGetter to only expose address and transport

Pros:

  • efficient
  • no magic contract

Cons:

  • no longer have a dedicated NetClientAttributesGetter that is always used for net client attributes, which is currently useful in PeerServiceAttributesExtractor and could be useful in other places in the future

@mateuszrzeszutek
Copy link
Member

Just my 2c

  • the mapping between NetClientAttributesGetter and the semantic attributes feels a little magic because of the post-processing done in NetClientAttributesExtractor

I think it's more important to have the API be easy to use (to make instrumenting things easier), rather than make it as close to semantic conventions. It's kind of the point to hide the complexities, different cases and requirements of the semantic conventions behind a very simple getter interface. The HTTP attributes extractors (the server one in particular) are a good example of that, as they add a significant chunk of very much needed logic over the raw values provided by a getter.

  • no longer have a dedicated NetClientAttributesGetter that is always used for net client attributes, which is currently useful in PeerServiceAttributesExtractor and could be useful in other places in the future

We could always have 2 different getter interfaces for different scenarios, and have separate factory methods for raw data/InetSocketAddress -- similar to what we're already doping in DbClientSpanNameExtractor (I guess that we could simplify the attributes extractors in the db package so that there's exactly one public extractor for both SQL and general DB conventions)

@lmolkova
Copy link
Contributor

lmolkova commented Jul 6, 2022

the mapping between NetClientAttributesGetter and the semantic attributes feels a little magic because of the post-processing done in NetClientAttributesExtractor

it seems the post-processing (beyond setting attributes) is checking if sock attributes are not the same as net.peer. attributes, which doesn't seem too bad or magical, does it?

BTW, since we now have conditionally required attributes defined, it's a common pattern to guard attribute setting by something: default value, different from another attribute, another attribute set/not set.
I.e. this is a general question where to apply those conditions. I agree with @mateuszrzeszutek that it should be done centrally to make instrumentation easier.

@trask
Copy link
Member Author

trask commented Jul 6, 2022

I agree with @mateuszrzeszutek that it should be done centrally to make instrumentation easier

thx both, I'm sold on this approach 👍

Comment on lines -70 to -82
if (peerService == null) {
String peerIp = attributesGetter.peerIp(request, response);
peerService = mapToPeerService(peerIp);
}
Copy link
Member Author

Choose a reason for hiding this comment

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

alternatively we could check both net.sock.peer.addr and net.sock.peer.name, but now that we are putting IP address into net.peer.name when there's no hostname I don't think there is a need(?)

@trask trask changed the title New net conventions: Option A Prototype of proposed net semantic convention changes Jul 7, 2022
@trask trask force-pushed the new-net-conventions-option-a branch 2 times, most recently from 02c6107 to 81a85b1 Compare July 7, 2022 23:10
@trask trask marked this pull request as ready for review July 28, 2022 16:58
@trask trask requested a review from a team as a code owner July 28, 2022 16:58
@trask trask changed the title Prototype of proposed net semantic convention changes Update net semantic convention changes Jul 28, 2022
@trask trask force-pushed the new-net-conventions-option-a branch from 81a85b1 to ce625fa Compare July 28, 2022 17:17
@trask trask force-pushed the new-net-conventions-option-a branch from ce625fa to 74a3f26 Compare July 28, 2022 17:17
@mateuszrzeszutek
Copy link
Member

@trask do you think this is ready for merge? Should we add it to 1.17?

@trask
Copy link
Member Author

trask commented Aug 17, 2022

@trask do you think this is ready for merge? Should we add it to 1.17?

oops, I thought I had merged this! just fixed merge conflicts, yes I think we should merge it for 1.17

@trask trask added this to the v1.17.0 milestone Aug 18, 2022
@trask trask merged commit f1774ca into open-telemetry:main Aug 18, 2022
@trask trask deleted the new-net-conventions-option-a branch August 18, 2022 16:02
LironKS pushed a commit to helios/opentelemetry-java-instrumentation that referenced this pull request Oct 23, 2022
* New net conventions: option a

* Feedback + sock.family + sock.peer.name

* peer.service + tests

* server net attributes attempt 1

* server net attributes attempt 2

* Javadoc

* Revisions

* Apply to instrumentations

* Feedback

* One more default method

* Spotless

* Fix javadoc
LironKS pushed a commit to helios/opentelemetry-java-instrumentation that referenced this pull request Oct 31, 2022
* New net conventions: option a

* Feedback + sock.family + sock.peer.name

* peer.service + tests

* server net attributes attempt 1

* server net attributes attempt 2

* Javadoc

* Revisions

* Apply to instrumentations

* Feedback

* One more default method

* Spotless

* Fix javadoc
LironKS pushed a commit to helios/opentelemetry-java-instrumentation that referenced this pull request Dec 4, 2022
* New net conventions: option a

* Feedback + sock.family + sock.peer.name

* peer.service + tests

* server net attributes attempt 1

* server net attributes attempt 2

* Javadoc

* Revisions

* Apply to instrumentations

* Feedback

* One more default method

* Spotless

* Fix javadoc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants