Skip to content
This repository has been archived by the owner on Dec 23, 2023. It is now read-only.

Cherrypick #2043 into V0.27.x #2055

Merged
merged 5 commits into from Sep 25, 2020
Merged

Conversation

zoercai
Copy link
Contributor

@zoercai zoercai commented Sep 24, 2020

I'm making a patch 0.27.1 with #2043 cherrypicked into V0.27.x. I couldn't push directly to v0.27.x because of protected branch rules.

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@codecov-commenter
Copy link

codecov-commenter commented Sep 24, 2020

Codecov Report

Merging #2055 into v0.27.x will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             v0.27.x    #2055   +/-   ##
==========================================
  Coverage      83.04%   83.05%           
+ Complexity      2250     2249    -1     
==========================================
  Files            319      319           
  Lines          10532    10526    -6     
  Branches        1049     1048    -1     
==========================================
- Hits            8746     8742    -4     
+ Misses          1447     1446    -1     
+ Partials         339      338    -1     
Impacted Files Coverage Δ Complexity Δ
...pencensus/implcore/trace/RecordEventsSpanImpl.java 93.15% <ø> (+0.81%) 48.00 <0.00> (-1.00) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f90e098...cf7b664. Read the comment docs.

@zoercai
Copy link
Contributor Author

zoercai commented Sep 24, 2020

@spkrka could you please sign the CLA (#2055 (comment)) so I can merge this?
Thanks!

@spkrka
Copy link
Contributor

spkrka commented Sep 24, 2020

I don't understand what's wrong with the CLA.
Looking at #2043 it says cla: yes - otherwise that PR should not have been possible to merge I think.

When I visit https://cla.developers.google.com/clas it says:

Agreement Name Date Signed
Google Corporate CLA Spotify AB Jun 18, 2014 17:00 PDT

@spkrka
Copy link
Contributor

spkrka commented Sep 24, 2020

This is the commit from the original PR: 8da5466
It has my email set to krka@spotify.com and it passes the CLA.

Then it was merged into master by @nilebox as this commit: eab6382
That one has the email set to spkrka@users.noreply.github.com

I don't know why the github merge operation caused that kind of re-write to the commit, and I don't know how to resolve it.

@spkrka
Copy link
Contributor

spkrka commented Sep 24, 2020

PR commit:

commit 8da54660af7daa2b8c5f81764f967af5d3e3f239 (HEAD -> krka/no_finalize, krka/krka/no_finalize)
Author: Kristofer Karlsson <krka@spotify.com>
Date:   Thu Jul 16 13:13:10 2020 +0200

Master commit:

commit eab6382e06f16e7efeb1f9b6cb3eb0c79ee62bbc (origin/master, origin/HEAD)
Author: Kristofer Karlsson <spkrka@users.noreply.github.com>
Date:   Tue Sep 22 07:33:18 2020 +0200

@nilebox
Copy link
Contributor

nilebox commented Sep 25, 2020

That one has the email set to spkrka@users.noreply.github.com
I don't know why the github merge operation caused that kind of re-write to the commit, and I don't know how to resolve it.

I can confirm that's the issue with CLA.
@spkrka would you be okay with us rewriting git history in master with me or @zoercai "taking over" the ownership of the commit from your PR which blocks this change?

@nilebox
Copy link
Contributor

nilebox commented Sep 25, 2020

@spkrka also please be aware that this PR just cherry-picks a commit from master to v0.27.x branch.
We have already published the 0.27.1 release which includes the bug fix you're interested in.
It's already available in Maven Central: https://repo1.maven.org/maven2/io/opencensus/opencensus-impl/0.27.1/
So you can update your dependencies to using it already.

@spkrka
Copy link
Contributor

spkrka commented Sep 25, 2020

Yes, I am ok with you rewriting the git history (This was only removing code anyway, so it's not like my change is particularly noteworthy)

Fixes census-instrumentation#2045

This will reduce GC pressure since the VM will not call
Finalizer.register() when creating Span objects.

Since this method is synchronized on a static lock
it can be a source of contention.

It also avoids contention on the same lock when running
runFinalizer() as part of GC

(cherry picked from commit eab6382)
@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@zoercai zoercai merged commit 48816c8 into census-instrumentation:v0.27.x Sep 25, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants