raskasa
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+insert_final_newline = true
+
+[*{.java,xml}]
+indent_style = space
+indent_size = 2
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -1,20 +1,28 @@
 name: Java CI
-on: [push]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 jobs:
   Build-Project:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Configure JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
         with:
-          distribution: 'adopt'
-          java-version: 11
+          distribution: 'zulu'
+          java-version: '21'
+          cache: 'maven'
       - name: Run Maven Build
-        run: mvn package
+        run: ./mvnw -B -V -ntp package
       - name: Publish Snapshots and JavaDocs
+        if: github.event_name != 'pull_request'
         env:
           CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
-        run: mvn clean source:jar javadoc:jar deploy --settings=".buildscript/settings.xml" -Dmaven.test.skip=true
+        run: ./mvnw -B -V -ntp clean source:jar javadoc:jar deploy --settings=".buildscript/settings.xml" -Dmaven.test.skip=true
diff --git a/.gitignore b/.gitignore
@@ -22,9 +22,4 @@ classes
 
 obj
 
-.idea
-target
-*.ipr
-*.iml
-*.iws
 .DS_Store
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Change Log
 ==========
 
+## Version 0.5.0
+
+_2021-10-08_
+
+* __`EventListener`-based metrics.__  Users now have access to metrics recorded
+through OkHttp's new API for tracking metrics and monitoring HTTP requests’
+size and duration.
+* Updated OkHttp dependency to 3.14.9.
+* Updated Dropwizard Metrics dependency to 4.2.3.
+
 ## Version 0.4.0
 
 _2017-11-10_

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,4 +5,14 @@ If you would like to contribute code to Metrics Integration for OkHttp you can
 do so through GitHub by forking the repository and sending a pull request.
 
 When submitting code, please make every effort to follow existing conventions
-and style in order to keep the code as readable as possible.
+and style in order to keep the code as readable as possible.  A concrete step
+you can take is to ensure you're running the following before submitting a PR:
+
+```bash
+$ cd metrics-okhttp
+$ mvn clean package
+```
+
+This should run successfully.  Additionally, this runs an automated source code
+formatter.  So, ensure any formatting changes that occur after running the above
+commands are added to the changes in the PR.
diff --git a/README.md b/README.md
@@ -48,6 +48,19 @@ OkHttpClient client = InstrumentedOkHttpClients.create(registry, rawClient, "cus
 An instrumented OkHttp HTTP client provides the following metrics:
 
 ```
+okhttp3.EventListener.calls-duration
+okhttp3.EventListener.calls-end
+okhttp3.EventListener.calls-failed
+okhttp3.EventListener.calls-start
+okhttp3.EventListener.connections-acquired
+okhttp3.EventListener.connections-duration
+okhttp3.EventListener.connections-end
+okhttp3.EventListener.connections-failed
+okhttp3.EventListener.connections-released
+okhttp3.EventListener.connections-start
+okhttp3.EventListener.dns-duration
+okhttp3.EventListener.dns-end
+okhttp3.EventListener.dns-start
 okhttp3.OkHttpClient.cache-request-count
 okhttp3.OkHttpClient.cache-hit-count
 okhttp3.OkHttpClient.cache-network-count
@@ -65,11 +78,6 @@ okhttp3.OkHttpClient.network-requests-completed
 okhttp3.OkHttpClient.network-requests-duration
 okhttp3.OkHttpClient.network-requests-running
 okhttp3.OkHttpClient.network-requests-submitted
-okhttp3.OkHttpClient.connection-requests
-okhttp3.OkHttpClient.connection-failed
-okhttp3.OkHttpClient.connection-acquired
-okhttp3.OkHttpClient.connection-released
-okhttp3.OkHttpClient.connection-setup
 ```
 
 If you provide a custom name for the instrumented client (i.e. `custom-name`),
@@ -95,14 +103,14 @@ Download [the latest jar][metrics-okhttp] or depend on Maven:
 <dependency>
   <groupId>com.raskasa.metrics</groupId>
   <artifactId>metrics-okhttp</artifactId>
-  <version>0.4.0</version>
+  <version>0.5.0</version>
 </dependency>
 ```
 
 or Gradle:
 
 ```groovy
-compile 'com.raskasa.metrics:metrics-okhttp:0.4.0'
+compile 'com.raskasa.metrics:metrics-okhttp:0.5.0'
 ```
 
 Snapshots of the development version are available in

diff --git a/metrics-okhttp/pom.xml b/metrics-okhttp/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>metrics-okhttp-parent</artifactId>
-    <groupId>com.raskasa.metrics</groupId>
+    <groupId>io.dropwizard.metrics.okhttp</groupId>
     <version>0.5.0-SNAPSHOT</version>
   </parent>
 

diff --git a/metrics-okhttp/src/main/java/com/raskasa/metrics/okhttp/ConnectionRequestCounter.java b/metrics-okhttp/src/main/java/com/raskasa/metrics/okhttp/ConnectionRequestCounter.java
diff --git a/metrics-okhttp/src/main/java/com/raskasa/metrics/okhttp/ConnectionTimingAnalyzer.java b/metrics-okhttp/src/main/java/com/raskasa/metrics/okhttp/ConnectionTimingAnalyzer.java
-Original file line number
+Diff line change
@@ @@ -22,9 +22,4 @@ classes @@
     obj
-    .idea
-    target
-    *.ipr
-    *.iml
-    *.iws
     .DS_Store