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

extend-monetization-phase2 #12734

Draft
wants to merge 45 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1549d48
added Graphql Operation info inside a separate analytic event.
HimanshiDeSilva May 5, 2024
7fabc7d
add return type
HimanshiDeSilva May 7, 2024
fcd4966
Remove the newly added index and published into the same previous one
HimanshiDeSilva May 15, 2024
226c49a
Add relevant http methods in graphql subscriptions
HimanshiDeSilva May 25, 2024
4ee6698
Add NonNull instance check in fields.
HimanshiDeSilva May 25, 2024
609d603
Fix exception handling
HimanshiDeSilva May 25, 2024
a4b7715
Add query name in graphql subscription events
HimanshiDeSilva May 25, 2024
59c6323
Move changes to stable git branch
Chilliwiddit Nov 4, 2024
690cf92
Add changes for reflection
Chilliwiddit Nov 8, 2024
99c0c7e
Polish code
Chilliwiddit Nov 12, 2024
9336669
Additional polishing
Chilliwiddit Nov 12, 2024
85c9fbe
Add changes for toml
Chilliwiddit Nov 13, 2024
bcd24fd
Add analytics impl
Chilliwiddit Nov 13, 2024
73b4a0f
Add default xml value
Chilliwiddit Nov 13, 2024
16f67ca
Finalize and move class
Chilliwiddit Nov 13, 2024
bd916d1
Add reading for analytics_impl
Chilliwiddit Nov 13, 2024
fde63db
Merge remote-tracking branch 'upstream/master'
Chilliwiddit Nov 14, 2024
8f1bb63
Remove AnalyticsConfigurationDto
Chilliwiddit Nov 18, 2024
d09cfb1
Change FQN
Chilliwiddit Nov 18, 2024
136770b
Remove FQN default value
Chilliwiddit Nov 18, 2024
c8c16f4
Merge pull request #12449 from HimanshiDeSilva/graphql-analytics-new
senthuran16 Nov 21, 2024
8cda8d0
Fix publishing analytics event after responseSize calculation in WebS…
senthuran16 Nov 21, 2024
26659bc
Merge pull request #12706 from senthuran16/fix-websocket-analytics-pu…
senthuran16 Nov 21, 2024
8cb9fba
Merge tag 'v9.29.135' into extend-monetization
Chilliwiddit Nov 25, 2024
1ebdd40
Move changes to stable git branch
Chilliwiddit Nov 4, 2024
1a9115d
Add changes for reflection
Chilliwiddit Nov 8, 2024
94ef63f
Polish code
Chilliwiddit Nov 12, 2024
a4efa71
Additional polishing
Chilliwiddit Nov 12, 2024
e17beef
Add changes for toml
Chilliwiddit Nov 13, 2024
aa1368f
Add analytics impl
Chilliwiddit Nov 13, 2024
cfbab9e
Add default xml value
Chilliwiddit Nov 13, 2024
0d8bac3
Finalize and move class
Chilliwiddit Nov 13, 2024
1172db5
Add reading for analytics_impl
Chilliwiddit Nov 13, 2024
3bcaf3c
Remove AnalyticsConfigurationDto
Chilliwiddit Nov 18, 2024
13a7ef6
Change FQN
Chilliwiddit Nov 18, 2024
69c37fe
Remove FQN default value
Chilliwiddit Nov 18, 2024
204e520
Remove extra QUERY variable
Chilliwiddit Nov 25, 2024
fb6eaec
Refactor sse analytics logic
Chilliwiddit Nov 25, 2024
31ce231
Implement webhook response size publishing
Chilliwiddit Nov 29, 2024
b11ce79
Update MonetizationUsageInfo
Chilliwiddit Dec 2, 2024
ae09738
Create child of subscription policy
Chilliwiddit Dec 2, 2024
d64634f
Change ExtendedSubscriptionPolicy
Chilliwiddit Dec 3, 2024
81bf319
Change SubscriptionPolicy
Chilliwiddit Dec 3, 2024
e9197c0
Merge branch 'wso2:master' into master
Chilliwiddit Jan 3, 2025
897309e
Merge with master
Chilliwiddit Jan 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Additional polishing
  • Loading branch information
Chilliwiddit committed Nov 13, 2024
commit 9336669bce9f8fcbe95c6d9a885215e3146ddb19
4 changes: 0 additions & 4 deletions components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.common.analytics</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package org.wso2.carbon.apimgt.api.model;

import org.wso2.carbon.apimgt.api.APIProvider;
import org.wso2.carbon.apimgt.api.MonetizationException;
import org.wso2.carbon.apimgt.common.analytics.exceptions.AnalyticsException;
import org.wso2.carbon.apimgt.impl.utils.APIUtil;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Constructor;
Expand Down Expand Up @@ -46,7 +44,7 @@ public Object monetizationAnalyticsDataProvider(MonetizationUsagePublishInfo mon
}
String message;
try {
Class<?> callingClass = APIUtil.getClassForName(className);
Class<?> callingClass = getClassForName(className);
Constructor<?> cons = callingClass.getConstructors()[0];
analyticsClass = (AnalyticsforMonetization) cons.newInstance();;
return analyticsClass.getUsageData(monetizationUsagePublishInfo);
Expand All @@ -67,4 +65,11 @@ public Object monetizationAnalyticsDataProvider(MonetizationUsagePublishInfo mon
throw new MonetizationException(message, e);
} //handling of possible exceptions
}

public static Class getClassForName(String className) throws ClassNotFoundException, IllegalAccessException,
InstantiationException {

return Class.forName(className);
}

}
4 changes: 0 additions & 4 deletions components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>
Expand Down