From 9eaeb86d07c4bf3e2820a69a3b1c183d57229234 Mon Sep 17 00:00:00 2001 From: Daniel Yinanc Date: Thu, 2 Jun 2016 12:17:25 -0400 Subject: [PATCH] Cloud support removed, Gatling removed, Spring version upped to 1.3.5 --- build.gradle | 16 +++---- gradle/wrapper/gradle-wrapper.jar | Bin 53639 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew.bat | 2 +- src/gatling/scala/BasicSimulation.scala | 57 ----------------------- 5 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 src/gatling/scala/BasicSimulation.scala diff --git a/build.gradle b/build.gradle index f4275486..86b966ea 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,6 @@ plugins { id 'maven' id 'jacoco' id 'com.github.kt3k.coveralls' version '2.6.3' - id "com.github.lkishalmi.gatling" version "0.3.0" } war { @@ -68,11 +67,11 @@ repositories { } ext { - sprintBootVersion = "1.3.3.RELEASE" + sprintBootVersion = "1.3.5.RELEASE" } task wrapper(type: Wrapper) { - gradleVersion = '2.12' + gradleVersion = '2.13' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } @@ -94,6 +93,9 @@ dependencies { compile 'com.google.code.gson:gson:2.6.2' compile 'org.projectlombok:lombok:1.16.8' + //ServletException requires compile time servlet dependency but it causes problems + //when deployed if exist on war run time.. hence provided but also compileOnly + compileOnly("org.springframework.boot:spring-boot-starter-tomcat") providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") compile 'io.springfox:springfox-swagger2:2.4.0' @@ -110,16 +112,12 @@ dependencies { testCompile 'com.jayway.jsonpath:json-path-assert:2.2.0' //Cloud is enabled via dependency but disabled via config - compile('org.springframework.cloud:spring-cloud-starter-consul-all:1.0.0.RELEASE') { +/* compile('org.springframework.cloud:spring-cloud-starter-consul-all:1.0.0.RELEASE') { exclude group: 'io.reactivex', module: 'rxjava' } - compile group: 'io.reactivex', name: 'rxjava', version: '1.1.5' + compile group: 'io.reactivex', name: 'rxjava', version: '1.1.5'*/ // In order to get embedded app container to work integrationTestRuntime("org.springframework.boot:spring-boot-starter-tomcat") integrationTestCompile group: 'com.jayway.restassured', name: 'rest-assured', version: '2.9.0' - - // gatling - compile 'org.scala-lang:scala-library:2.11.7' - compile "io.gatling.highcharts:gatling-charts-highcharts:2.1.6" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c6137b87896c8f70315ae454e00a969ef5f6019..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 2434 zcmZWq2~1Q+7@mDBu*$N)DhoV0mP2lYT|~JQ5i3}#f+AQ-6%1E_ltT+tD_0>H#84SA zVlgV0N>GjkTMdOpSQh2RJEWFcs?eZVqE&2_&YRglpWS3LlW)H7`~UgppLvBmHe`I`j7R9e z8OIZu4wXg`sDS%~K*{P=1d@q(LJfjB3LdC1o}RNh!MsEzDs0ejmnOk%#JiS}S&plg zidW*UuSKwnet#_$F!?+j)XO}l0YHlYmT+kp&?AuD*;c2a$E+oY6TWNV01&DMfICd- zG=OKi`LMdjP_*@YZAR{zVyp2*7ASK2$^#~S_M zWZlB+UT6P48DCu+7vk2Ma`YN^w%#e(wsuo`tln+zs%(w$StrrD(F&vIEhB3$1W)f9 zw)Hg6uFgBvP&n6B@G8TgA!}u$aQ05!?e1LY+E|?#xAUbXr}XPAjl?G}vo}aubPV#J zHBD?RZx!0^9iMU^Hd{PqW^3?JlmnNU$m*gBDLjL2(USx+k9kiCn8mjGtf~lSQupx{G#W&nA`RVlT{dI^mhW-{Tayl22i*BsI zMDC@7KSvJDb3qE^ks?c^6I1>0+&eo(U9m^9gR+O;e5{jBoEYBv>NCIt&peLXU(g z!8#CTD8{@O-9`k{R?t+cE5_CF?J|bv6f_aHBXPMO z7SAXw@kSQkuMcYpp`=HGIjnb#6<|Ni?eQnx{XH~wI1GC?gbARQlE3(@nJGn_yKs$C z`k&`3RjJR3g@sBRGp3apS5!{?(@~A2j}qX3(iC4BIHN@AM?uM;5wz;HCfK%KnzD+9 zl6Xsataq81@!GL*iOEG|_8Ogy_ktJGZ@Mv<_*<_H5esh8lrSD)K5(X=kHwRg+Oz)X z%??Bc5|;RV0wNkik3<9bX&)i`7{t#jH329@t-p>%K9PhY8QikPuEvR?rUB$QhEiI~ zB3?a!h<5P(0o{cZCidO6`4y4BM9w}e@`DWQN@tqFjy^svoW;SL;iaf+%e4WpW|2kE zrOypVuSkj*x`6gn%Y27eoar1K{Ysw+DacSCO-<#&GxZiwyI+XKM}6IrzCmIwB=%&9 zJB#3WkvCl5%O~Qa{WMipj5EB|FCo}G!u(1QW&zg?5W~GX>qo25_UzF1*!S%Dc`SCR z6gvL*En?1;^|G?Ecw7xRHEs?c3No!9heV=lPiq0-#S$o>%izZ(yR1Q)%Bn}(UA1te zSLKcSPoeDU&`Gh6G`|7Y%4Em_*Tse#z&Ap5iDS0H3Xsu^h{iCfe+7whdWfd(%kb77 z4v}_;z^j}o>OV;A!4j{4X2StQmpDvQ&##e^T-RexoZx*3|EP`NmFiGu#2j}5^EKFv UyqM?HjO957w~t6Q_Q)CVU!t-abN~PV delta 2485 zcmaJ?2~bl<7~Z@Dh!BDtq2!4WxepNx+A2r2#Q_vVP$=k7Ar%CbB1T3OS|zAuhEgf4 zt(H1ggfU7PIf76sR^$r7aCy*L>sdiZp@P%a!J_TH-6!~Trf=rWZoYiq|9}7Pzx(!; z^YhF3;>a+*z!(6b5cq_rhZc*SXE0-9XPn#8;(#~_J+2&A^1w99nPHuj3Gk?QCF4_X zJVFoNZ9LJ4DJ4aqeS%>Er5ltJNFxzi7!u4={0oa2nR^=$%+I=r#d>UFj0ol;i?JlL zJ-#L^@4zC73BlAse;booS;TK_WL1nI8|CxZXrYjCoBqA}Q+PiiL^`%|?rNU}Q9d>G z^0yo03!*c2m`3@?eHQ!6a@7;lM(WT8(P-Ni z&)&UfDt*_ljdo2L%GH*s#pl)p?l^b*Zrbctub;mTcN*O^ls30>Rl8C;=Sp?baQ4NO zW*aL7S(?(VYdjX-t62O<`r=q_y!Y7&--@9u%j%z!;^hH@Dwl;jardUnKLtaLUPdw z0KfzEy1{`=C%7T0k#OviUr=NwOMSr3L|aODShwV@)PJ=`0OVT&5QueF-L{&?X#++? z(w=F@C$r%!Kfahr<&dpgS7HFbH>QxcR{}GNOf(TWCk+VeS?&an%%0|5VPo_a^pj-r zwAh9f6aWIG4#vr}dS}f)Y;E#P3^%y|W zfJAe&IfO4{imo}ZJqC`R58||5oxJvy)?3~(N5GssnBL+$eFR};%i=vu^P-Ib$SQsW z>?8%+s?IQ}A` z492yKuo=DS`ru-uoj@JH)!K;>*%p?z*^>b0P=IGMaezPC+zB?Tou<63G4`RgXewy0 z@=<{V9g1`@04^LuEjE}uW@8Df+C?NtGYTS=VSKb*N-*ONno{~=%)i40R~b6k=yVxv zuA>b)p`4&9nA`CV(Va!Q(jcrG>2SmqUh6gAc??xokIZma@L&X+)Ch)klD*k1+x%rc z4}cF)H!tEO$&A6|F&k4@*6D;Jmuy%uODY5)%nX1z9P;j1OgZw(V4)G8i(}k0yOS@^RDHA97Cvzqo(UV&5eRS3J z4oZ-Ynq>(`dmXlPM_?n<*X8TYB+bD_B638qsgndek`~{mMy^l1v44-D>S72nqrXT~ zBYCj2$^jbd$%P4JdYWo4fHw*PnAO9HIkzpx+~Go$IFzY^1e`?T;39-MK))U~U}O(X zjh8`1vl~3vBPG0Agbh`&%WMcIdn|CGoi2By6VchF(LLkONz|oAdm1>spEC z=S@}2xxzW(d^pzoa{2pcD!UG^R&|}(RE0qU*253cN_~P72XM5%Y7p5G4)(DP!t1Ab zcF?vz6dU%Eq~;l+Z99uh%Q?F7Cam-N(H#18lV#+59603AX0$wk%n8Ab#C#%x5rMfA R?K#AoFnmC6sAyrp{{R=d1GNAE diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5dca9d5c..2959a25d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu May 19 09:47:27 EDT 2016 +#Thu Jun 02 12:13:49 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip diff --git a/gradlew.bat b/gradlew.bat index 72d362da..aec99730 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args diff --git a/src/gatling/scala/BasicSimulation.scala b/src/gatling/scala/BasicSimulation.scala deleted file mode 100644 index 9697560e..00000000 --- a/src/gatling/scala/BasicSimulation.scala +++ /dev/null @@ -1,57 +0,0 @@ -import io.gatling.core.Predef._ -import io.gatling.http.Predef._ - -import scala.concurrent.duration._ - - -class BasicSimulation extends Simulation { - // The ip of the server in which the application is deployed - //val serverIp = "142.133.110.175" - val serverIp = "localhost" - - val httpConf = http - .baseURL("http://" + serverIp + ":8080") - .acceptHeader("application/json;charset=UTF-8") - .userAgentHeader("Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Firefox/31.0") - - //val url = "/remrem-publish-0.1.0/producer/msg?rk=3" - val url = "/producer/msg?rk=3" - var msg = """{ - "meta": { - "type": "EiffelActivityStartedEvent", - "version": "1.0", - "time": 1234567890, - "domainId": "example.domain", - "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0" - }, - "data": { - "executionUri": "https://my.jenkins.host/myJob/43", - "liveLogs": [ - { - "name": "My build log", - "uri": "file:///tmp/logs/data.log" - } - ] - }, - "links": { - "activityExecution": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1", - "previousActivityExecution": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2" - } - }""" - val body = StringBody("[" + msg + "]") - - val scn = scenario("BasicSimulation") - .exec(http("/producer") - .post(url).body(body) - .header("Content-Type", "application/json") - .check(status.is(200)) - ) - - setUp( - scn.inject( - //atOnceUsers(1) - //rampUsersPerSec(10) to(500) during(3 seconds), - constantUsersPerSec(100) during(60 seconds) randomized - ) - ).protocols(httpConf) -}