Skip to content

Commit 99ab980

Browse files
committed
Merge branch 'DropSampler' into 'master'
Sampler dropped See merge request exedio/cope!1734
2 parents 4d0b604 + d0be20e commit 99ab980

38 files changed

Lines changed: 4 additions & 3292 deletions

conf/environment.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ <h1>cope on @ENV@</h1>
3535
<li><a href="@HOST@copelibtest-@ENV@/dispatcher/console">dispatcher</a></li>
3636
<li><a href="@HOST@copelibtest-@ENV@/copy/console">copy</a></li>
3737
<li><a href="@HOST@copelibtest-@ENV@/defaultTo/console">defaultTo</a></li>
38-
<li><a href="@HOST@copelibtest-@ENV@/sampler/console">sampler</a></li>
3938
<li><a href="@HOST@copelibtest-@ENV@/badQuery/console">badQuery</a></li>
4039
</ul>
4140
</li>

exedio-cope-log.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ omit bug fixes.
77
The items are sorted inversely, i.e. the latest items are on top.
88

99
--------------------------------------------------------------------------
10+
* Classes Sampler and SamplerProperties dropped.
11+
This breaks backwards API compatibility - check for usage of dropped API in your project, including used libraries!
1012
* ConnectProperties: key "cluster.listenLoopback" no longer supported.
1113
Check your deployed systems! Probably this key is at its default (true),
1214
then you don't have to do anything.

runtime/patternsrc/com/exedio/cope/misc/SlowTransactionLogger.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public static void run(
9999

100100
static final Holder<LongSupplier> now = new Holder<>(System::currentTimeMillis);
101101

102-
// almost equal to code in SamplerThread
103102
static String toString(final StackTraceElement[] trace)
104103
{
105104
final StringBuilder sb = new StringBuilder();

runtime/servletsrc/com/exedio/cope/pattern/MediaPath.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,11 @@ public final MediaInfo getInfo()
611611

612612
/**
613613
* For testing only. TODO
614+
* @deprecated No longer supported. Does nothing.
614615
*/
616+
@Deprecated
615617
public final void incrementDelivered()
616618
{
617-
delivered.stop(Timer.start());
618619
}
619620

620621
public static final List<MediaRequestLog> getNoSuchPathLogs()

runtime/servletsrc/com/exedio/cope/sampler/Purgeable.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

runtime/servletsrc/com/exedio/cope/sampler/Sampler.java

Lines changed: 0 additions & 250 deletions
This file was deleted.

runtime/servletsrc/com/exedio/cope/sampler/SamplerClusterListener.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)