@jicai There isn't any yet. Please replace the driver with hbase-2.0.

It will probably work normally. @RoySRose  @emeroad  
Thank you for your reply. https://hbase.apache.org/book.html#hbase.versioning
> Client-Server wire protocol compatibility
Allows updating client and server out of sync.
> We could only allow upgrading the server first. I.e. the server would be backward compatible to an old client, that way new APIs are OK.
> Example: A user should be able to use an old client to connect to an upgraded cluster.

~~The hbase version policy is the same as above, but it does not know whether it will actually work.~~

Major | Minor | Patch
-- | -- | --
Client-Server wire Compatibility | N | Y | Y

Major version upgrades do not guarantee wire-protocol compatibility. Hello, @jicai 

Hbase2 support #5328 has been merged.
take a look at the [guide](https://naver.github.io/pinpoint/hbaseupgrade.html)

Love to hear your feedback


support for hbase 2.x
Are there any plans to support HBase 2.x ？ thank you！

agent-it/pom.xml commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java doc/compatibilityHbase.md doc/faq.md plugins/hbase/pom.xml pom.xml
agent-it/pom.xml commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java doc/compatibilityHbase.md doc/faq.md doc/hbase-upgrade.md plugins/hbase/pom.xml pom.xml
web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java web/src/test/java/com/navercorp/pinpoint/web/filter/Base64.java web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java
diff --git a/agent-it/pom.xml b/agent-it/pom.xml
index e9be76f4d79a..15f2d273faa4 100644
--- a/agent-it/pom.xml
+++ b/agent-it/pom.xml
@@ -367,6 +367,7 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-shaded-client</artifactId>
+            <version>1.2.6.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java b/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java
index 2bb2f16c2725..db10d8e744d1 100644
--- a/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java
+++ b/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java
@@ -23,6 +23,7 @@
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.metrics.ScanMetrics;
 import org.apache.hadoop.hbase.util.Bytes;
 
 import java.io.IOException;
@@ -178,6 +179,14 @@ public void close() {
         }
     }
 
+    public boolean renewLease() {
+        return false;
+    }
+
+    public ScanMetrics getScanMetrics() {
+        return null;
+    }
+
     @Override
     public Iterator<Result> iterator() {
         // Identical to HTable.ClientScanner implementation
diff --git a/doc/compatibilityHbase.md b/doc/compatibilityHbase.md
index ebcdf14fa60a..a070a8059a35 100755
--- a/doc/compatibilityHbase.md
+++ b/doc/compatibilityHbase.md
@@ -1,8 +1,9 @@
-Pinpoint Version | HBase 0.94.x | HBase 0.98.x | HBase 1.0.x | HBase 1.2.x
----------------- | ------------ | ------------ | ----------- | -----------
-1.0.x | yes | no | no | no
-1.1.x | no | not tested | yes | not tested
-1.5.x | no | not tested | yes | not tested
-1.6.x | no | not tested | not tested | yes
-1.7.x | no | not tested | not tested | yes
-1.8.x | no | not tested | not tested | yes
+Pinpoint Version | HBase 0.94.x | HBase 0.98.x | HBase 1.0.x | HBase 1.2.x | HBase 2.x.x (BETA)
+---------------- | ------------ | ------------ | ----------- | ----------- | -----------
+1.0.x | yes | no | no | no | not tested
+1.1.x | no | not tested | yes | not tested | not tested
+1.5.x | no | not tested | yes | not tested | not tested
+1.6.x | no | not tested | not tested | yes | not tested
+1.7.x | no | not tested | not tested | yes | not tested
+1.8.x | no | not tested | not tested | yes | not tested
+1.9.x | no | not tested | not tested | yes | yes 
\ No newline at end of file
diff --git a/doc/faq.md b/doc/faq.md
index c8419fbe0568..814b4a60d873 100755
--- a/doc/faq.md
+++ b/doc/faq.md
@@ -62,3 +62,7 @@ This data is used to better understand how users interact with the Web UI which
 config.sendUsage=false
 ```
 
+### I'd like to use Hbase 2.x for Pinpoint.
+If you'd like to use Hbase 2.x for Pinpoint database, check out [Hbase upgrade guide](https://naver.github.io/pinpoint/plugindevguide.html).
+
+
diff --git a/doc/hbase-upgrade.md b/doc/hbase-upgrade.md
new file mode 100755
index 000000000000..fc53f0e06329
--- /dev/null
+++ b/doc/hbase-upgrade.md
@@ -0,0 +1,33 @@
+---
+title: Hbase Upgrade
+keywords: hbase, upgrade
+last_updated: Mar 8, 2019
+sidebar: mydoc_sidebar
+permalink: hbaseupgrade.html
+disqus: false
+---
+
+## Do you like to use Hbase 2.x for Pinpoint?
+
+Default settings of current releases are for Hbase 1.x.
+
+If you'd like to use Hbase 2.x for Pinpoint database,
+You have to recompile Pinpoint. Version of `hbase-shaded-client` library need to be changed to 2.x.
+(recommend v2.1.1, tested)
+
+You can recompile
+
+with `hbase2` profile added
+
+`mvn clean install -P hbase2,release -DskipTests=true`
+
+or with command (replacing version)
+
+`mvn clean install -Dhbase.shaded.client.version=2.1.1 -DskipTests=true`
+
+or after changing the version directly from pom.xml  
+
+```java
+<!-- hbase -->
+<hbase.shaded.client.version>1.2.6.1</hbase.shaded.client.version>
+```
diff --git a/plugins/hbase/pom.xml b/plugins/hbase/pom.xml
index 993065ff5880..345fb15365e0 100644
--- a/plugins/hbase/pom.xml
+++ b/plugins/hbase/pom.xml
@@ -41,6 +41,7 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-shaded-client</artifactId>
+            <version>1.2.6.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 0af908907a82..9aa9c07e3ef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,9 @@
         <jdk.home>${env.JAVA_6_HOME}</jdk.home>
         <test.jdk.home>${jdk.home}</test.jdk.home>
 
+        <!-- hbase -->
+        <hbase.shaded.client.version>1.2.6.1</hbase.shaded.client.version>
+
         <!-- library -->
         <slf4j.version>1.7.21</slf4j.version>
         <metrics.version>3.1.2</metrics.version>
@@ -400,7 +403,7 @@
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase-shaded-client</artifactId>
-                <version>1.2.6.1</version>
+                <version>${hbase.shaded.client.version}</version>
             </dependency>
 
             <dependency>
@@ -1032,6 +1035,14 @@
     </reporting>
 
     <profiles>
+        <!-- for Hbase2 -->
+        <profile>
+            <id>hbase2</id>
+            <properties>
+                <hbase.shaded.client.version>2.1.1</hbase.shaded.client.version>
+            </properties>
+        </profile>
+
         <!-- for Local (Development) -->
         <profile>
             <id>local</id>

diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java
index 1bdf41cc5022..5e3351508cbf 100644
--- a/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java
+++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java
@@ -17,7 +17,6 @@
 package com.navercorp.pinpoint.web.filter;
 
 import com.navercorp.pinpoint.common.server.bo.SpanBo;
-import org.apache.hadoop.hbase.util.Base64;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/Base64.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/Base64.java
new file mode 100644
index 000000000000..bae6291d70f9
--- /dev/null
+++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/Base64.java
@@ -0,0 +1,446 @@
+package com.navercorp.pinpoint.web.filter;
+/*
+ * Copyright 2019 NAVER Corp.
+ *
+ * Licensed 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.
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * copy org.apache.hadoop.hbase.util.Base64
+ *
+ */
+
+public class Base64 {
+    private static final Log LOG = LogFactory.getLog(Base64.class);
+    private static final byte[] _STANDARD_ALPHABET = new byte[]{65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47};
+    private static final byte[] _STANDARD_DECODABET = new byte[]{-9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -5, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 62, -9, -9, -9, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -9, -9, -9, -1, -9, -9, -9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -9, -9, -9, -9, -9, -9, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -9, -9, -9, -9};
+    private static final byte[] _URL_SAFE_ALPHABET = new byte[]{65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 45, 95};
+    private static final byte[] _URL_SAFE_DECODABET = new byte[]{-9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -5, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 62, -9, -9, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -9, -9, -9, -1, -9, -9, -9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -9, -9, -9, -9, 63, -9, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -9, -9, -9, -9};
+    private static final byte[] _ORDERED_ALPHABET = new byte[]{45, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122};
+    private static final byte[] _ORDERED_DECODABET = new byte[]{-9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -5, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 0, -9, -9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, -9, -9, -9, -1, -9, -9, -9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, -9, -9, -9, -9, 37, -9, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, -9, -9, -9, -9};
+
+    protected static byte[] getAlphabet(int options) {
+        if ((options & 16) == 16) {
+            return _URL_SAFE_ALPHABET;
+        } else {
+            return (options & 32) == 32 ? _ORDERED_ALPHABET : _STANDARD_ALPHABET;
+        }
+    }
+
+    protected static byte[] getDecodabet(int options) {
+        if ((options & 16) == 16) {
+            return _URL_SAFE_DECODABET;
+        } else {
+            return (options & 32) == 32 ? _ORDERED_DECODABET : _STANDARD_DECODABET;
+        }
+    }
+
+    private Base64() {
+    }
+
+    private static void usage(String msg) {
+        System.err.println(msg);
+        System.err.println("Usage: java Base64 -e|-d inputfile outputfile");
+    }
+
+    protected static byte[] encode3to4(byte[] b4, byte[] threeBytes, int numSigBytes, int options) {
+        encode3to4(threeBytes, 0, numSigBytes, b4, 0, options);
+        return b4;
+    }
+
+    protected static byte[] encode3to4(byte[] source, int srcOffset, int numSigBytes, byte[] destination, int destOffset, int options) {
+        byte[] ALPHABET = getAlphabet(options);
+        int inBuff = (numSigBytes > 0 ? source[srcOffset] << 24 >>> 8 : 0) | (numSigBytes > 1 ? source[srcOffset + 1] << 24 >>> 16 : 0) | (numSigBytes > 2 ? source[srcOffset + 2] << 24 >>> 24 : 0);
+        switch(numSigBytes) {
+            case 1:
+                destination[destOffset] = ALPHABET[inBuff >>> 18];
+                destination[destOffset + 1] = ALPHABET[inBuff >>> 12 & 63];
+                destination[destOffset + 2] = 61;
+                destination[destOffset + 3] = 61;
+                return destination;
+            case 2:
+                destination[destOffset] = ALPHABET[inBuff >>> 18];
+                destination[destOffset + 1] = ALPHABET[inBuff >>> 12 & 63];
+                destination[destOffset + 2] = ALPHABET[inBuff >>> 6 & 63];
+                destination[destOffset + 3] = 61;
+                return destination;
+            case 3:
+                destination[destOffset] = ALPHABET[inBuff >>> 18];
+                destination[destOffset + 1] = ALPHABET[inBuff >>> 12 & 63];
+                destination[destOffset + 2] = ALPHABET[inBuff >>> 6 & 63];
+                destination[destOffset + 3] = ALPHABET[inBuff & 63];
+                return destination;
+            default:
+                return destination;
+        }
+    }
+
+    public static String encodeObject(Serializable serializableObject) {
+        return encodeObject(serializableObject, 0);
+    }
+
+    public static String encodeObject(Serializable serializableObject, int options) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        OutputStream b64os = null;
+        ObjectOutputStream oos = null;
+
+        String var6;
+        try {
+            b64os = new Base64.Base64OutputStream(baos, 1 | options);
+            oos = (options & 2) == 2 ? new ObjectOutputStream(new GZIPOutputStream(b64os)) : new ObjectOutputStream(b64os);
+            oos.writeObject(serializableObject);
+            String var5 = new String(baos.toByteArray(), "UTF-8");
+            return var5;
+        } catch (UnsupportedEncodingException var28) {
+            var6 = new String(baos.toByteArray());
+            return var6;
+        } catch (IOException var29) {
+            LOG.error("error encoding object", var29);
+            var6 = null;
+        } finally {
+            if (oos != null) {
+                try {
+                    oos.close();
+                } catch (Exception var27) {
+                    LOG.error("error closing ObjectOutputStream", var27);
+                }
+            }
+
+            if (b64os != null) {
+                try {
+                    b64os.close();
+                } catch (Exception var26) {
+                    LOG.error("error closing Base64OutputStream", var26);
+                }
+            }
+
+            try {
+                baos.close();
+            } catch (Exception var25) {
+                LOG.error("error closing ByteArrayOutputStream", var25);
+            }
+
+        }
+
+        return var6;
+    }
+
+    public static String encodeBytes(byte[] source) {
+        return encodeBytes(source, 0, source.length, 0);
+    }
+
+    public static String encodeBytes(byte[] source, int options) {
+        return encodeBytes(source, 0, source.length, options);
+    }
+
+    public static String encodeBytes(byte[] source, int off, int len) {
+        return encodeBytes(source, off, len, 0);
+    }
+
+    public static String encodeBytes(byte[] source, int off, int len, int options) {
+        if ((options & 2) == 2) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            GZIPOutputStream gzos = null;
+
+            String var33;
+            try {
+                gzos = new GZIPOutputStream(new Base64.Base64OutputStream(baos, 1 | options));
+                gzos.write(source, off, len);
+                gzos.close();
+                gzos = null;
+                String var32 = new String(baos.toByteArray(), "UTF-8");
+                return var32;
+            } catch (UnsupportedEncodingException var27) {
+                var33 = new String(baos.toByteArray());
+            } catch (IOException var28) {
+                LOG.error("error encoding byte array", var28);
+                var33 = null;
+                return var33;
+            } finally {
+                if (gzos != null) {
+                    try {
+                        gzos.close();
+                    } catch (Exception var25) {
+                        LOG.error("error closing GZIPOutputStream", var25);
+                    }
+                }
+
+                try {
+                    baos.close();
+                } catch (Exception var24) {
+                    LOG.error("error closing ByteArrayOutputStream", var24);
+                }
+
+            }
+
+            return var33;
+        } else {
+            boolean breakLines = (options & 8) == 0;
+            int len43 = len * 4 / 3;
+            byte[] outBuff = new byte[len43 + (len % 3 > 0 ? 4 : 0) + (breakLines ? len43 / 76 : 0)];
+            int d = 0;
+            int e = 0;
+            int len2 = len - 2;
+
+            for(int lineLength = 0; d < len2; e += 4) {
+                encode3to4(source, d + off, 3, outBuff, e, options);
+                lineLength += 4;
+                if (breakLines && lineLength == 76) {
+                    outBuff[e + 4] = 10;
+                    ++e;
+                    lineLength = 0;
+                }
+
+                d += 3;
+            }
+
+            if (d < len) {
+                encode3to4(source, d + off, len - d, outBuff, e, options);
+                e += 4;
+            }
+
+            try {
+                return new String(outBuff, 0, e, "UTF-8");
+            } catch (UnsupportedEncodingException var26) {
+                return new String(outBuff, 0, e);
+            }
+        }
+    }
+
+    protected static int decode4to3(byte[] source, int srcOffset, byte[] destination, int destOffset, int options) {
+        byte[] DECODABET = getDecodabet(options);
+        int outBuff;
+        if (source[srcOffset + 2] == 61) {
+            outBuff = (DECODABET[source[srcOffset]] & 255) << 18 | (DECODABET[source[srcOffset + 1]] & 255) << 12;
+            destination[destOffset] = (byte)(outBuff >>> 16);
+            return 1;
+        } else if (source[srcOffset + 3] == 61) {
+            outBuff = (DECODABET[source[srcOffset]] & 255) << 18 | (DECODABET[source[srcOffset + 1]] & 255) << 12 | (DECODABET[source[srcOffset + 2]] & 255) << 6;
+            destination[destOffset] = (byte)(outBuff >>> 16);
+            destination[destOffset + 1] = (byte)(outBuff >>> 8);
+            return 2;
+        } else {
+            try {
+                outBuff = (DECODABET[source[srcOffset]] & 255) << 18 | (DECODABET[source[srcOffset + 1]] & 255) << 12 | (DECODABET[source[srcOffset + 2]] & 255) << 6 | DECODABET[source[srcOffset + 3]] & 255;
+                destination[destOffset] = (byte)(outBuff >> 16);
+                destination[destOffset + 1] = (byte)(outBuff >> 8);
+                destination[destOffset + 2] = (byte)outBuff;
+                return 3;
+            } catch (Exception var7) {
+                LOG.error("error decoding bytes at " + source[srcOffset] + ": " + DECODABET[source[srcOffset]] + ", " + source[srcOffset + 1] + ": " + DECODABET[source[srcOffset + 1]] + ", " + source[srcOffset + 2] + ": " + DECODABET[source[srcOffset + 2]] + ", " + source[srcOffset + 3] + ": " + DECODABET[source[srcOffset + 3]], var7);
+                return -1;
+            }
+        }
+    }
+
+    public static byte[] decode(byte[] source, int off, int len, int options) {
+        byte[] DECODABET = getDecodabet(options);
+        int len34 = len * 3 / 4;
+        byte[] outBuff = new byte[len34];
+        int outBuffPosn = 0;
+        byte[] b4 = new byte[4];
+        int b4Posn = 0;
+
+        for(int i = off; i < off + len; ++i) {
+            byte sbiCrop = (byte)(source[i] & 127);
+            byte sbiDecode = DECODABET[sbiCrop];
+            if (sbiDecode < -5) {
+                LOG.error("Bad Base64 input character at " + i + ": " + source[i] + "(decimal)");
+                return null;
+            }
+
+            if (sbiDecode >= -1) {
+                b4[b4Posn++] = sbiCrop;
+                if (b4Posn > 3) {
+                    outBuffPosn += decode4to3(b4, 0, outBuff, outBuffPosn, options);
+                    b4Posn = 0;
+                    if (sbiCrop == 61) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        byte[] out = new byte[outBuffPosn];
+        System.arraycopy(outBuff, 0, out, 0, outBuffPosn);
+        return out;
+    }
+
+    public static byte[] decode(String s) {
+        return decode(s, 0);
+    }
+
+    public static byte[] decode(String s, int options) {
+        byte[] bytes;
+        try {
+            bytes = s.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException var21) {
+            bytes = s.getBytes();
+        }
+
+        bytes = decode(bytes, 0, bytes.length, options);
+        if (bytes != null && bytes.length >= 4) {
+            int head = bytes[0] & 255 | bytes[1] << 8 & '\uff00';
+            if (35615 == head) {
+                GZIPInputStream gzis = null;
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+                try {
+                    gzis = new GZIPInputStream(new ByteArrayInputStream(bytes));
+                    byte[] buffer = new byte[2048];
+
+                    int length;
+                    while((length = gzis.read(buffer)) >= 0) {
+                        baos.write(buffer, 0, length);
+                    }
+
+                    bytes = baos.toByteArray();
+                } catch (IOException var22) {
+                    ;
+                } finally {
+                    try {
+                        baos.close();
+                    } catch (Exception var20) {
+                        LOG.error("error closing ByteArrayOutputStream", var20);
+                    }
+
+                    if (gzis != null) {
+                        try {
+                            gzis.close();
+                        } catch (Exception var19) {
+                            LOG.error("error closing GZIPInputStream", var19);
+                        }
+                    }
+
+                }
+            }
+        }
+
+        return bytes;
+    }
+
+    public static class Base64OutputStream extends FilterOutputStream {
+        private boolean encode;
+        private int position;
+        private byte[] buffer;
+        private int bufferLength;
+        private int lineLength;
+        private boolean breakLines;
+        private byte[] b4;
+        private boolean suspendEncoding;
+        private int options;
+        private byte[] decodabet;
+
+        public Base64OutputStream(OutputStream out) {
+            this(out, 1);
+        }
+
+        public Base64OutputStream(OutputStream out, int options) {
+            super(out);
+            this.breakLines = (options & 8) != 8;
+            this.encode = (options & 1) == 1;
+            this.bufferLength = this.encode ? 3 : 4;
+            this.buffer = new byte[this.bufferLength];
+            this.position = 0;
+            this.lineLength = 0;
+            this.suspendEncoding = false;
+            this.b4 = new byte[4];
+            this.options = options;
+            this.decodabet = Base64.getDecodabet(options);
+        }
+
+        public void write(int theByte) throws IOException {
+            if (this.suspendEncoding) {
+                super.out.write(theByte);
+            } else {
+                if (this.encode) {
+                    this.buffer[this.position++] = (byte)theByte;
+                    if (this.position >= this.bufferLength) {
+                        this.out.write(Base64.encode3to4(this.b4, this.buffer, this.bufferLength, this.options));
+                        this.lineLength += 4;
+                        if (this.breakLines && this.lineLength >= 76) {
+                            this.out.write(10);
+                            this.lineLength = 0;
+                        }
+
+                        this.position = 0;
+                    }
+                } else if (this.decodabet[theByte & 127] > -5) {
+                    this.buffer[this.position++] = (byte)theByte;
+                    if (this.position >= this.bufferLength) {
+                        int len = Base64.decode4to3(this.buffer, 0, this.b4, 0, this.options);
+                        this.out.write(this.b4, 0, len);
+                        this.position = 0;
+                    }
+                } else if (this.decodabet[theByte & 127] != -5) {
+                    throw new IOException("Invalid character in Base64 data.");
+                }
+
+            }
+        }
+
+        public void write(byte[] theBytes, int off, int len) throws IOException {
+            if (this.suspendEncoding) {
+                super.out.write(theBytes, off, len);
+            } else {
+                for(int i = 0; i < len; ++i) {
+                    this.write(theBytes[off + i]);
+                }
+
+            }
+        }
+
+        public void flushBase64() throws IOException {
+            if (this.position > 0) {
+                if (!this.encode) {
+                    throw new IOException("Base64 input not properly padded.");
+                }
+
+                this.out.write(Base64.encode3to4(this.b4, this.buffer, this.position, this.options));
+                this.position = 0;
+            }
+
+        }
+
+        public void close() throws IOException {
+            this.flushBase64();
+            super.close();
+            this.buffer = null;
+            this.out = null;
+        }
+
+        public void suspendEncoding() throws IOException {
+            this.flushBase64();
+            this.suspendEncoding = true;
+        }
+
+        public void resumeEncoding() {
+            this.suspendEncoding = false;
+        }
+    }
+
+}
diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java
index 9cb3b334b228..d93333fcaf22 100644
--- a/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java
+++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java
@@ -9,7 +9,6 @@
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.common.server.bo.SpanBo;
 import com.navercorp.pinpoint.web.TestTraceUtils;
-import org.apache.hadoop.hbase.util.Base64;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java
index 25bcd1b9eb33..d33148b17f74 100644
--- a/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java
+++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java
@@ -26,7 +26,6 @@
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.common.trace.ServiceTypeFactory;
 import com.navercorp.pinpoint.common.trace.ServiceTypeProperty;
-import org.apache.hadoop.hbase.util.Base64;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
