remove the pieces of code preventing Kamon from building on modern JDKs

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   ci:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     env:
       JAVA_OPTS: -Xms5120M -Xmx5120M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS: -Xms5120M -Xmx5120M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
@@ -19,7 +19,7 @@ jobs:
       - name: Test
         run: sbt -v ";+core/test;+instrumentation/test;+reporters/test"
   lint:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: coursier/cache-action@v6

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     env:
       JAVA_OPTS: -Xms5120M -Xmx5120M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS: -Xms5120M -Xmx5120M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8

core/kamon-core/src/main/java/kamon/context/generated/binary/context/BooleanTag.java

@@ -1,23 +1,8 @@
-/*
- * Copyright 2013-2021 The Kamon Project <https://kamon.io>
- *
- * 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.
- */
-
 package kamon.context.generated.binary.context;
 
 
 // Code generated by colf(1); DO NOT EDIT.
+// The compiler used schema file Context.colf.
 
 
 import static java.lang.String.format;
@@ -40,20 +25,16 @@
  * @author generated by colf(1)
  * @see <a href="https://github.com/pascaldekloe/colfer">Colfer's home</a>
  */
-@javax.annotation.Generated(value="colf(1)", comments="Colfer from schema file Context.colf")
 public class BooleanTag implements Serializable {
 
 	/** The upper limit for serial byte sizes. */
 	public static int colferSizeMax = 16 * 1024 * 1024;
 
 
-
-
 	public String key;
 
 	public boolean value;
 
-
 	/** Default constructor */
 	public BooleanTag() {
 		init();
@@ -88,7 +69,6 @@ public static class Unmarshaller {
 		 * @param buf the initial buffer or {@code null}.
 		 */
 		public Unmarshaller(InputStream in, byte[] buf) {
-			// TODO: better size estimation
 			if (buf == null || buf.length == 0)
 				buf = new byte[Math.min(BooleanTag.colferSizeMax, 2048)];
 			this.buf = buf;
@@ -133,7 +113,6 @@ public BooleanTag next() throws IOException {
 					this.i = 0;
 				} else if (i == buf.length) {
 					byte[] src = this.buf;
-					// TODO: better size estimation
 					if (offset == 0) this.buf = new byte[Math.min(BooleanTag.colferSizeMax, this.buf.length * 4)];
 					System.arraycopy(src, this.offset, this.buf, 0, this.i - this.offset);
 					this.i -= this.offset;
@@ -154,6 +133,16 @@ public BooleanTag next() throws IOException {
 
 	}
 
+	/**
+	 * Gets the serial size estimate as an upper boundary, whereby
+	 * {@link #marshal(byte[],int)} ≤ {@link #marshalFit()} ≤ {@link #colferSizeMax}.
+	 * @return the number of bytes.
+	 */
+	public int marshalFit() {
+		long n = 1L + 6 + (long)this.key.length() * 3 + 1;
+		if (n < 0 || n > (long)BooleanTag.colferSizeMax) return BooleanTag.colferSizeMax;
+		return (int) n;
+	}
 
 	/**
 	 * Serializes the object.
@@ -165,22 +154,16 @@ public BooleanTag next() throws IOException {
 	 * @throws IllegalStateException on an upper limit breach defined by {@link #colferSizeMax}.
 	 */
 	public byte[] marshal(OutputStream out, byte[] buf) throws IOException {
-		// TODO: better size estimation
-		if (buf == null || buf.length == 0)
-			buf = new byte[Math.min(BooleanTag.colferSizeMax, 2048)];
-
-		while (true) {
-			int i;
-			try {
-				i = marshal(buf, 0);
-			} catch (BufferOverflowException e) {
-				buf = new byte[Math.min(BooleanTag.colferSizeMax, buf.length * 4)];
-				continue;
-			}
-
-			out.write(buf, 0, i);
-			return buf;
+		int n = 0;
+		if (buf != null && buf.length != 0) try {
+			n = marshal(buf, 0);
+		} catch (BufferOverflowException e) {}
+		if (n == 0) {
+			buf = new byte[marshalFit()];
+			n = marshal(buf, 0);
 		}
+		out.write(buf, 0, n);
+		return buf;
 	}
 
 	/**
@@ -323,16 +306,8 @@ public int unmarshal(byte[] buf, int offset, int end) {
 
 	// {@link Serializable} Colfer extension.
 	private void writeObject(ObjectOutputStream out) throws IOException {
-		// TODO: better size estimation
-		byte[] buf = new byte[1024];
-		int n;
-		while (true) try {
-			n = marshal(buf, 0);
-			break;
-		} catch (BufferUnderflowException e) {
-			buf = new byte[4 * buf.length];
-		}
-
+		byte[] buf = new byte[marshalFit()];
+		int n = marshal(buf, 0);
 		out.writeInt(n);
 		out.write(buf, 0, n);
 	}
@@ -371,7 +346,7 @@ public void setKey(String value) {
 	/**
 	 * Sets kamon/context/generated/binary/context.BooleanTag.key.
 	 * @param value the replacement.
-	 * @return {link this}.
+	 * @return {@code this}.
 	 */
 	public BooleanTag withKey(String value) {
 		this.key = value;
@@ -397,7 +372,7 @@ public void setValue(boolean value) {
 	/**
 	 * Sets kamon/context/generated/binary/context.BooleanTag.value.
 	 * @param value the replacement.
-	 * @return {link this}.
+	 * @return {@code this}.
 	 */
 	public BooleanTag withValue(boolean value) {
 		this.value = value;
@@ -420,8 +395,8 @@ public final boolean equals(Object o) {
 	public final boolean equals(BooleanTag o) {
 		if (o == null) return false;
 		if (o == this) return true;
-		return o.getClass() == BooleanTag.class
-			&& (this.key == null ? o.key == null : this.key.equals(o.key))
+
+		return (this.key == null ? o.key == null : this.key.equals(o.key))
 			&& this.value == o.value;
 	}
 

core/kamon-core/src/main/java/kamon/context/generated/binary/context/Context.java

@@ -1,23 +1,8 @@
-/*
- * Copyright 2013-2021 The Kamon Project <https://kamon.io>
- *
- * 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.
- */
-
 package kamon.context.generated.binary.context;
 
 
 // Code generated by colf(1); DO NOT EDIT.
+// The compiler used schema file Context.colf.
 
 
 import static java.lang.String.format;
@@ -39,7 +24,6 @@
  * @author generated by colf(1)
  * @see <a href="https://github.com/pascaldekloe/colfer">Colfer's home</a>
  */
-@javax.annotation.Generated(value="colf(1)", comments="Colfer from schema file Context.colf")
 public class Context implements Serializable {
 
 	/** The upper limit for serial byte sizes. */
@@ -49,13 +33,10 @@ public class Context implements Serializable {
 	public static int colferListMax = 64 * 1024;
 
 
-
-
 	public Tags tags;
 
 	public Entry[] entries;
 
-
 	/** Default constructor */
 	public Context() {
 		init();
@@ -91,7 +72,6 @@ public static class Unmarshaller {
 		 * @param buf the initial buffer or {@code null}.
 		 */
 		public Unmarshaller(InputStream in, byte[] buf) {
-			// TODO: better size estimation
 			if (buf == null || buf.length == 0)
 				buf = new byte[Math.min(Context.colferSizeMax, 2048)];
 			this.buf = buf;
@@ -136,7 +116,6 @@ public Context next() throws IOException {
 					this.i = 0;
 				} else if (i == buf.length) {
 					byte[] src = this.buf;
-					// TODO: better size estimation
 					if (offset == 0) this.buf = new byte[Math.min(Context.colferSizeMax, this.buf.length * 4)];
 					System.arraycopy(src, this.offset, this.buf, 0, this.i - this.offset);
 					this.i -= this.offset;
@@ -157,6 +136,21 @@ public Context next() throws IOException {
 
 	}
 
+	/**
+	 * Gets the serial size estimate as an upper boundary, whereby
+	 * {@link #marshal(byte[],int)} ≤ {@link #marshalFit()} ≤ {@link #colferSizeMax}.
+	 * @return the number of bytes.
+	 */
+	public int marshalFit() {
+		long n = 1L + 6;
+		if (this.tags != null) n += 1 + (long)this.tags.marshalFit();
+		for (Entry o : this.entries) {
+			if (o == null) n++;
+			else n += o.marshalFit();
+		}
+		if (n < 0 || n > (long)Context.colferSizeMax) return Context.colferSizeMax;
+		return (int) n;
+	}
 
 	/**
 	 * Serializes the object.
@@ -169,22 +163,16 @@ public Context next() throws IOException {
 	 * @throws IllegalStateException on an upper limit breach defined by either {@link #colferSizeMax} or {@link #colferListMax}.
 	 */
 	public byte[] marshal(OutputStream out, byte[] buf) throws IOException {
-		// TODO: better size estimation
-		if (buf == null || buf.length == 0)
-			buf = new byte[Math.min(Context.colferSizeMax, 2048)];
-
-		while (true) {
-			int i;
-			try {
-				i = marshal(buf, 0);
-			} catch (BufferOverflowException e) {
-				buf = new byte[Math.min(Context.colferSizeMax, buf.length * 4)];
-				continue;
-			}
-
-			out.write(buf, 0, i);
-			return buf;
+		int n = 0;
+		if (buf != null && buf.length != 0) try {
+			n = marshal(buf, 0);
+		} catch (BufferOverflowException e) {}
+		if (n == 0) {
+			buf = new byte[marshalFit()];
+			n = marshal(buf, 0);
 		}
+		out.write(buf, 0, n);
+		return buf;
 	}
 
 	/**
@@ -311,16 +299,8 @@ public int unmarshal(byte[] buf, int offset, int end) {
 
 	// {@link Serializable} Colfer extension.
 	private void writeObject(ObjectOutputStream out) throws IOException {
-		// TODO: better size estimation
-		byte[] buf = new byte[1024];
-		int n;
-		while (true) try {
-			n = marshal(buf, 0);
-			break;
-		} catch (BufferUnderflowException e) {
-			buf = new byte[4 * buf.length];
-		}
-
+		byte[] buf = new byte[marshalFit()];
+		int n = marshal(buf, 0);
 		out.writeInt(n);
 		out.write(buf, 0, n);
 	}
@@ -359,7 +339,7 @@ public void setTags(Tags value) {
 	/**
 	 * Sets kamon/context/generated/binary/context.Context.tags.
 	 * @param value the replacement.
-	 * @return {link this}.
+	 * @return {@code this}.
 	 */
 	public Context withTags(Tags value) {
 		this.tags = value;
@@ -385,7 +365,7 @@ public void setEntries(Entry[] value) {
 	/**
 	 * Sets kamon/context/generated/binary/context.Context.entries.
 	 * @param value the replacement.
-	 * @return {link this}.
+	 * @return {@code this}.
 	 */
 	public Context withEntries(Entry[] value) {
 		this.entries = value;
@@ -408,8 +388,8 @@ public final boolean equals(Object o) {
 	public final boolean equals(Context o) {
 		if (o == null) return false;
 		if (o == this) return true;
-		return o.getClass() == Context.class
-			&& (this.tags == null ? o.tags == null : this.tags.equals(o.tags))
+
+		return (this.tags == null ? o.tags == null : this.tags.equals(o.tags))
 			&& java.util.Arrays.equals(this.entries, o.entries);
 	}