Skip to content

Upstream updates as of 0.31#11

Merged
Voronenko merged 1895 commits intomasterfrom
trace-0-31
Sep 9, 2019
Merged

Upstream updates as of 0.31#11
Voronenko merged 1895 commits intomasterfrom
trace-0-31

Conversation

@Voronenko
Copy link

@Voronenko Voronenko commented Aug 1, 2019

0.31 needs to take precedence on conflicts

labbati and others added 30 commits June 13, 2019 14:35
It is disabled by default now
Attempt to properly parse out instance name from JDBC url
…ollection

Enable '**' support in logs collection scripts
We already have a hack to wait for client span to close after the
request because it is closed on separate thread. This patch extends
that hack to handle cases when original request throws an exception.
Avoid usage of static getters when accessing configuration parameters
…more-stable

Make Akka client test more stable
Otherwise there is a race condition between the projects initializing the mongo instance.
For mongo, use description if set, fallback to db name.

Memcache doesn’t have a good “instance name” that would work as service name, so clear it out for now.
…radle-in-workspace

Preserve .gradle in workspace
 Update Mongo instance name and remove memcache instance name
Johan Vandeweerd and others added 25 commits July 22, 2019 11:01
…webclient-tracing

Issue 614 spring webclient tracing
The test still "does something" in that it has a method with a @trace annotation.  Doesn't need to call an external url
4.0.0-milestone1 was just released and is incompatible.
* STAC-5314 Publish java trace client to S3

* reverted Branding

* review comments
@Voronenko Voronenko merged commit 1320a93 into master Sep 9, 2019
@Voronenko Voronenko deleted the trace-0-31 branch September 9, 2019 09:48
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.

8 participants