summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/test/Ice/metrics/AllTests.cpp12
-rw-r--r--csharp/test/Ice/metrics/AllTests.cs18
-rw-r--r--java-compat/test/src/main/java/test/Ice/metrics/AllTests.java12
-rw-r--r--java/test/src/main/java/test/Ice/metrics/AllTests.java12
-rw-r--r--objective-c/test/Ice/metrics/AllTests.m30
5 files changed, 20 insertions, 64 deletions
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index 3e3e40cf19e..1beef435bb5 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -965,7 +965,7 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv)
cout << "testing invocation metrics... " << flush;
props["IceMX.Metrics.View.Map.Invocation.GroupBy"] = "operation";
- props["IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"] = "localPort";
+ props["IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"] = "id";
props["IceMX.Metrics.View.Map.Invocation.Map.Collocated.GroupBy"] = "parent";
updateProps(clientProps, serverProps, update.get(), props, "Invocation");
test(serverMetrics->getMetricsView("View", timestamp)["Invocation"].empty());
@@ -1323,13 +1323,9 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv)
if(!collocated)
{
im1 = ICE_DYNAMIC_CAST(IceMX::InvocationMetrics, map["fail"]);
- test(im1->current <= 1 && im1->total == 3 && im1->failures == 3 && im1->retry == 3 && im1->remotes.size() == 6);
- test(im1->remotes[0]->current == 0 && im1->remotes[0]->total == 1 && im1->remotes[0]->failures == 1);
- test(im1->remotes[1]->current == 0 && im1->remotes[1]->total == 1 && im1->remotes[1]->failures == 1);
- test(im1->remotes[2]->current == 0 && im1->remotes[2]->total == 1 && im1->remotes[2]->failures == 1);
- test(im1->remotes[3]->current == 0 && im1->remotes[3]->total == 1 && im1->remotes[3]->failures == 1);
- test(im1->remotes[4]->current == 0 && im1->remotes[4]->total == 1 && im1->remotes[4]->failures == 1);
- test(im1->remotes[5]->current == 0 && im1->remotes[5]->total == 1 && im1->remotes[5]->failures == 1);
+ test(im1->current <= 1 && im1->total == 3 && im1->failures == 3 && im1->retry == 3 && im1->remotes.size() == 1);
+ rim1 = ICE_DYNAMIC_CAST(IceMX::ChildInvocationMetrics, im1->remotes[0]);
+ test(rim1->current == 0 && rim1->total == 6 && rim1->failures == 6);
checkFailure(clientMetrics, "Invocation", im1->id, "::Ice::ConnectionLostException", 3);
}
diff --git a/csharp/test/Ice/metrics/AllTests.cs b/csharp/test/Ice/metrics/AllTests.cs
index 387a276b248..31326ba9c53 100644
--- a/csharp/test/Ice/metrics/AllTests.cs
+++ b/csharp/test/Ice/metrics/AllTests.cs
@@ -914,7 +914,7 @@ public class AllTests : Test.AllTests
// Tests for twoway
//
props["IceMX.Metrics.View.Map.Invocation.GroupBy"] = "operation";
- props["IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"] = "localPort";
+ props["IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"] = "id";
props["IceMX.Metrics.View.Map.Invocation.Map.Collocated.GroupBy"] = "id";
updateProps(clientProps, serverProps, update, props, "Invocation");
test(serverMetrics.getMetricsView("View", out timestamp)["Invocation"].Length == 0);
@@ -1071,19 +1071,9 @@ public class AllTests : Test.AllTests
if(!collocated)
{
im1 = (IceMX.InvocationMetrics)map["fail"];
- if(!(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.Length == 6))
- {
- System.Console.Error.WriteLine("current: " + im1.current + " total: " + im1.total +
- " failures: " + im1.failures + " retry: " + im1.retry +
- " remotes: " + im1.remotes.Length);
- test(false);
- }
- test(im1.remotes[0].current == 0 && im1.remotes[0].total == 1 && im1.remotes[0].failures == 1);
- test(im1.remotes[1].current == 0 && im1.remotes[1].total == 1 && im1.remotes[1].failures == 1);
- test(im1.remotes[2].current == 0 && im1.remotes[2].total == 1 && im1.remotes[2].failures == 1);
- test(im1.remotes[3].current == 0 && im1.remotes[3].total == 1 && im1.remotes[3].failures == 1);
- test(im1.remotes[4].current == 0 && im1.remotes[4].total == 1 && im1.remotes[4].failures == 1);
- test(im1.remotes[5].current == 0 && im1.remotes[5].total == 1 && im1.remotes[5].failures == 1);
+ test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.Length == 1);
+ rim1 = (IceMX.ChildInvocationMetrics)(collocated ? im1.collocated[0] : im1.remotes[0]);
+ test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, output);
}
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
index c4843c606b4..376c72a76af 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
@@ -977,7 +977,7 @@ public class AllTests
out.flush();
props.put("IceMX.Metrics.View.Map.Invocation.GroupBy", "operation");
- props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "localPort");
+ props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "id");
props.put("IceMX.Metrics.View.Map.Invocation.Map.Collocated.GroupBy", "id");
updateProps(clientProps, serverProps, update, props, "Invocation");
test(serverMetrics.getMetricsView("View", timestamp).get("Invocation").length == 0);
@@ -1142,13 +1142,9 @@ public class AllTests
if(!collocated)
{
im1 = (IceMX.InvocationMetrics)map.get("fail");
- test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 6);
- test(im1.remotes[0].current == 0 && im1.remotes[0].total == 1 && im1.remotes[0].failures == 1);
- test(im1.remotes[1].current == 0 && im1.remotes[1].total == 1 && im1.remotes[1].failures == 1);
- test(im1.remotes[2].current == 0 && im1.remotes[2].total == 1 && im1.remotes[2].failures == 1);
- test(im1.remotes[3].current == 0 && im1.remotes[3].total == 1 && im1.remotes[3].failures == 1);
- test(im1.remotes[4].current == 0 && im1.remotes[4].total == 1 && im1.remotes[4].failures == 1);
- test(im1.remotes[5].current == 0 && im1.remotes[5].total == 1 && im1.remotes[5].failures == 1);
+ test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 1);
+ rim1 = (IceMX.ChildInvocationMetrics)im1.remotes[0];
+ test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, out);
}
diff --git a/java/test/src/main/java/test/Ice/metrics/AllTests.java b/java/test/src/main/java/test/Ice/metrics/AllTests.java
index e72cb7586a9..c6035f6548e 100644
--- a/java/test/src/main/java/test/Ice/metrics/AllTests.java
+++ b/java/test/src/main/java/test/Ice/metrics/AllTests.java
@@ -911,7 +911,7 @@ public class AllTests
out.flush();
props.put("IceMX.Metrics.View.Map.Invocation.GroupBy", "operation");
- props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "localPort");
+ props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "id");
props.put("IceMX.Metrics.View.Map.Invocation.Map.Collocated.GroupBy", "id");
updateProps(clientProps, serverProps, props, "Invocation");
test(serverMetrics.getMetricsView("View").returnValue.get("Invocation").length == 0);
@@ -1094,13 +1094,9 @@ public class AllTests
if(!collocated)
{
im1 = (InvocationMetrics)map.get("fail");
- test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 6);
- test(im1.remotes[0].current == 0 && im1.remotes[0].total == 1 && im1.remotes[0].failures == 1);
- test(im1.remotes[1].current == 0 && im1.remotes[1].total == 1 && im1.remotes[1].failures == 1);
- test(im1.remotes[2].current == 0 && im1.remotes[2].total == 1 && im1.remotes[2].failures == 1);
- test(im1.remotes[3].current == 0 && im1.remotes[3].total == 1 && im1.remotes[3].failures == 1);
- test(im1.remotes[4].current == 0 && im1.remotes[4].total == 1 && im1.remotes[4].failures == 1);
- test(im1.remotes[5].current == 0 && im1.remotes[5].total == 1 && im1.remotes[5].failures == 1);
+ test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 1);
+ rim1 = (ChildInvocationMetrics)im1.remotes[0];
+ test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, out);
}
diff --git a/objective-c/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m
index 6e4049afb62..986d86cd3c0 100644
--- a/objective-c/test/Ice/metrics/AllTests.m
+++ b/objective-c/test/Ice/metrics/AllTests.m
@@ -917,7 +917,7 @@ metricsAllTests(id<ICECommunicator> communicator)
tprintf("testing invocation metrics... ");
[props setObject:@"operation" forKey:@"IceMX.Metrics.View.Map.Invocation.GroupBy"];
- [props setObject:@"localPort" forKey:@"IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"];
+ [props setObject:@"id" forKey:@"IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"];
updateProps(clientProps, serverProps, update, props, @"Invocation");
test([[[serverMetrics getMetricsView:@"View" timestamp:&timestamp] objectForKey:@"Invocation"] count] == 0);
@@ -1077,31 +1077,9 @@ metricsAllTests(id<ICECommunicator> communicator)
checkFailure(clientMetrics, @"Invocation", im1.id_, @"::Ice::UnknownException", 3);
im1 = (ICEMXInvocationMetrics*)[map objectForKey:@"fail"];
- test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && [im1.remotes count] == 6);
-
- test(((ICEMXMetrics*)[im1.remotes objectAtIndex:0]).current == 0 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:0]).total == 1 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:0]).failures == 1);
-
- test(((ICEMXMetrics*)[im1.remotes objectAtIndex:1]).current == 0 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:1]).total == 1 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:1]).failures == 1);
-
- test(((ICEMXMetrics*)[im1.remotes objectAtIndex:2]).current == 0 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:2]).total == 1 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:2]).failures == 1);
-
- test(((ICEMXMetrics*)[im1.remotes objectAtIndex:3]).current == 0 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:3]).total == 1 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:3]).failures == 1);
-
- test(((ICEMXMetrics*)[im1.remotes objectAtIndex:4]).current == 0 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:4]).total == 1 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:4]).failures == 1);
-
- test(((ICEMXMetrics*)[im1.remotes objectAtIndex:5]).current == 0 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:5]).total == 1 &&
- ((ICEMXMetrics*)[im1.remotes objectAtIndex:5]).failures == 1);
+ test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && [im1.remotes count] == 1);
+ rim1 = (ICEMXRemoteMetrics*)[im1.remotes objectAtIndex:0];
+ test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
checkFailure(clientMetrics, @"Invocation", im1.id_, @"::Ice::ConnectionLostException", 3);
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 18:45:16 +0000