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.

Sign up for GitHub

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

SIDM-3499 Upgrade insights agent #292

Merged
merged 6 commits into from
Dec 3, 2019
Merged

SIDM-3499 Upgrade insights agent #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b24d9a9
SIDM-3499 Upgrade Application Insights Agent.
dfourn Dec 2, 2019
d461761
Attempt to make one of the tests less flaky.
dfourn Dec 2, 2019
f4290e2
Fix the web config file.
dfourn Dec 3, 2019
3728af9
fix(docker): update dockerfile from base and use app insights 2.5.1
henrydobson Dec 3, 2019
d4ac475
Add the agent.
dfourn Dec 3, 2019
b8bf6ca
Fix.
dfourn Dec 3, 2019
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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG APP_INSIGHTS_AGENT_VERSION=2.4.0
ARG APP_INSIGHTS_AGENT_VERSION=2.5.1

FROM hmctspublic.azurecr.io/base/java:openjdk-8-distroless-1.1
FROM hmctspublic.azurecr.io/base/java:openjdk-8-distroless-1.4

LABEL maintainer=IDAM \
owner="HM Courts & Tribunals Service"
Expand All @@ -14,7 +14,7 @@ ENV SERVER_PORT=8080

ADD --chown=hmcts:hmcts build/libs/idam-web-public.war \
lib/AI-Agent.xml \
lib/applicationinsights-agent-2.4.0.jar /opt/app/
lib/applicationinsights-agent-2.5.1.jar /opt/app/

CMD ["-Dspring.profiles.active=docker,local", "idam-web-public.war"]

Expand Down
Binary file removed lib/applicationinsights-agent-2.4.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/applicationinsights-agent-2.5.1.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/test/js/reset_password_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ Scenario('@functional @resetpass As a citizen user I can reset my password with
I.fillField('#email', citizenEmail);
I.click('Submit');
I.waitForText('Check your email', 20, 'h1');
I.wait(10);
const resetPasswordUrl = await I.extractUrl(citizenEmail);
I.amOnPage(resetPasswordUrl);
I.wait(5);
I.waitForText('Create a new password', 20, 'h1');
I.seeTitleEquals('Reset Password - HMCTS Access');
I.fillField('#password1', specialCharacterPassword);
Expand Down
2 changes: 1 addition & 1 deletion web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<httpPlatform stdoutLogEnabled="true"
stdoutLogFile="%HOME%\LogFiles\stdout"
processPath="%JAVA_HOME%\bin\java.exe"
arguments="-javaagent:&quot;%HOME%\site\wwwroot\applicationinsights-agent-2.4.0.jar&quot; -Djava.net.preferIPv4Stack=true -Dserver.port=%HTTP_PLATFORM_PORT% -jar &quot;%HOME%\site\wwwroot\idam-web-public.war&quot;">
arguments="-javaagent:&quot;%HOME%\site\wwwroot\applicationinsights-agent-2.5.1.jar&quot; -Djava.net.preferIPv4Stack=true -Dserver.port=%HTTP_PLATFORM_PORT% -jar &quot;%HOME%\site\wwwroot\idam-web-public.war&quot;">
</httpPlatform>
<httpProtocol>
<customHeaders>
Expand Down