Skip to content

Commit 014315b

Browse files
authored
Merge pull request #160 from ing-bank/fix/username-in-metrics
Full user name in Q metrics
2 parents eeccf0d + 1dc11e2 commit 014315b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/ci-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- master
66
jobs:
77
it-test:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-18.04
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v1
@@ -18,7 +18,7 @@ jobs:
1818
- name: "Starting dependent containers for testing"
1919
run: docker-compose up -d keycloak ceph postgres-server mariadb ranger-admin rokku-sts cassandra
2020
- name: "Install aws cli"
21-
run: pip install --user awscli
21+
run: pip install --user awscli==1.18.222
2222
- name: "Compile the project while containers are starting up"
2323
run: sbt clean compile
2424
- name: "Wait for containers to be up and running"

src/main/scala/com/ing/wbaa/rokku/proxy/queue/MemoryUserRequestQueue.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ trait MemoryUserRequestQueue extends UserRequestQueue {
8282
}
8383

8484
private def metricName(user: User): String = {
85-
MetricsFactory.REQUEST_QUEUE_OCCUPIED_BY_USER.replace(MetricsFactory.REQUEST_USER, s"${user.userName.value.head.toString}..")
85+
MetricsFactory.REQUEST_QUEUE_OCCUPIED_BY_USER.replace(MetricsFactory.REQUEST_USER, user.userName.value)
8686
}
8787
}

0 commit comments

Comments
 (0)