Merges in Armeria example #48

codefromthecrypt · 2020-10-08T12:17:17Z

This merges in code via

$ git subtree add --prefix=armeria https://github.com/openzipkin-contrib/zipkin-armeria-example.git master

I also updated it to have the same conventions as the other examples, including a docker image openzipkin/example-brave:armeria

cc @ikhoon @minwoox @trustin

.. because they are same for `HttpClient`.

- Armeria 0.64.0 -> 0.68.0 - Brave 4.19.3 -> 5.1.4 - Build-time only - maven-compiler-plugin 3.7.0 -> 3.8.0

Motivation: line/armeria#1322 Modifications: - Update dependencies - Armeria: 0.68.0 -> 0.69.0 - Brave: 5.1.4 -> 5.1.5 - Use `RequestContextCurrentTraceContext.INSTANCE` instead of `MDCCurrentTraceContext.create()` when creating a new `Tracing`

Also: - Remove unused imports - Add `final` where necessary

- Armeria 0.70.0 -> 0.75.0 - Brave 5.1.5 -> 5.5.0

@Romender

Coming from a question on gitter from @Romender

- Armeria 0.95.0 -> 0.96.0 - Brave 5.8.0 -> 5.9.0

- Add Maven wrapper so that a user can start playing with the example even without local Maven installation. - Update Armeria from 0.96.0 to 0.97.0 - Update Brave from 5.9.0 to 5.9.1

- Armeria 0.97.0 -> 0.98.1 - Brave 5.9.1 -> 5.9.4

- Armeria 0.98.1 -> 0.98.4 - Brave 5.9.4 -> 5.9.5

- Armeria 0.99.8 -> 0.99.9 - Brave 5.12.3 -> 5.12.4

Because `spanReporter(...)` is deprecated.

Armeria 1.0.0 -> 1.1.0 Brave 5.12.4 -> 5.12.6

git-subtree-dir: armeria git-subtree-mainline: 52f1b3b git-subtree-split: c9d9d14

codefromthecrypt

some notes for the curious:

changes from latest https://github.com/openzipkin-contrib/zipkin-armeria-example

codefromthecrypt · 2020-10-08T12:19:54Z

armeria/README.md

@@ -0,0 +1,36 @@
+# Basic example showing distributed tracing across Armeria apps


later we'll revisit the README, but this is the same as it was except no maven wrapper

codefromthecrypt · 2020-10-08T12:20:28Z

armeria/src/main/java/brave/example/Backend.java

+        .service("/health", (ctx, req) -> HttpResponse.of("ok\n"))
+        .service("/api", (ctx, req) -> {
+          String response = new Date().toString();
+          String username = req.headers().get("user_name");


this part is new, just to match the other examples

codefromthecrypt · 2020-10-08T12:20:41Z

armeria/src/main/java/brave/example/Backend.java

+
+    final Server server = Server.builder()
+        .http(9000)
+        .service("/health", (ctx, req) -> HttpResponse.of("ok\n"))


dummy health endpoint unless armeria has a built-in one

HealthCheckService might work here. It responds a shiny JSON though.

codefromthecrypt · 2020-10-08T12:21:21Z

armeria/src/main/java/brave/example/HttpTracingFactory.java

+import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
+import zipkin2.reporter.urlconnection.URLConnectionSender;
+
+final class HttpTracingFactory {


main differences here are baggage configuration, SLF4J integration and export of HttpTracing

codefromthecrypt · 2020-10-08T12:21:52Z

armeria/src/main/resources/logback.xml

+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] [%X{userName}] [%X{traceId}/%X{spanId}] %-5level %logger{36} - %msg%n</pattern>


pattern now includes userName

codefromthecrypt · 2020-10-08T12:22:06Z

docker/Dockerfile

+
+EXPOSE 8081 9000
+
+ENV JAVA_OPTS="-Xms16m -Xmx16m -XX:+ExitOnOutOfMemoryError"


I'm assuming this will work :D

codefromthecrypt · 2020-10-08T12:22:18Z

docker/Dockerfile


 WORKDIR /brave-example
-COPY --from=install /install/webmvc4-jetty/ .


alphabetical re-ordering

codefromthecrypt · 2020-10-08T12:22:28Z

docker/README.md

@@ -9,7 +9,7 @@ services:
  # Generate traffic by hitting http://localhost:8081
  frontend:
    container_name: frontend
-    image: openzipkin/example-brave:webmvc4-jetty
+    image: openzipkin/example-brave:armeria


switching default :D

trustin

🎉

trustin · 2020-10-08T12:27:07Z

.github/workflows/docker-tests.yml

@@ -11,7 +11,7 @@ jobs:
  build-on-linux:
    strategy:
      matrix:
-        docker-target: [webmvc25-jetty, webmvc3-jetty, webmvc4-jetty, webmvc4-boot]
+        docker-target: [armeria, webmvc25-jetty, webmvc3-jetty, webmvc4-boot, webmvc4-jetty]


Good to be 'A'rmeria

armeria/pom.xml

trustin · 2020-10-08T12:28:57Z

armeria/src/main/java/brave/example/Backend.java

+
+    final Server server = Server.builder()
+        .http(9000)
+        .service("/health", (ctx, req) -> HttpResponse.of("ok\n"))


HealthCheckService might work here. It responds a shiny JSON though.

Adrian Cole and others added 28 commits May 23, 2018 14:49

initial commit

ed85bf4

Use the shorter decorator() method

41d3968

.. because they are same for `HttpClient`.

Update dependencies (#2)

22dc7a2

- Armeria 0.64.0 -> 0.68.0 - Brave 4.19.3 -> 5.1.4 - Build-time only - maven-compiler-plugin 3.7.0 -> 3.8.0

Update the example with armeria-0.69.0

792b110

Motivation: line/armeria#1322 Modifications: - Update dependencies - Armeria: 0.68.0 -> 0.69.0 - Brave: 5.1.4 -> 5.1.5 - Use `RequestContextCurrentTraceContext.INSTANCE` instead of `MDCCurrentTraceContext.create()` when creating a new `Tracing`

Update Armeria from 0.69.0 to 0.70.0 (#4)

da564f3

Also: - Remove unused imports - Add `final` where necessary

Update dependencies (#5)

70ab31a

- Armeria 0.70.0 -> 0.75.0 - Brave 5.1.5 -> 5.5.0

Update Armeria from 0.75.0 to 0.77.0 (#6)

e94d6ac

Switches to bom to encourage its use (#7)

c0cb911

Adds ceremony to close resources in the correct order (#8)

11c8ea4

Coming from a question on gitter from @Romender

Upgrade Armeria to 0.88.0 and use brave artifact (#9)

c19a608

Fix typos (#10)

06d483e

Update Armeria to 0.91.0 (#11)

d7e842d

Add CODEOWNERS (#13)

aec3dc2

Update Armeria to 0.92.0 (#12)

1df77f8

Update Armeria from 0.92.0 to 0.93.0 (#14)

741bc42

Update Armeria from 0.93.0 to 0.94.0 (#15)

9220b5c

Update Armeria to 0.95.0 (#16)

db7010d

Update dependencies (#17)

c054256

- Armeria 0.95.0 -> 0.96.0 - Brave 5.8.0 -> 5.9.0

Update dependencies and add Maven wrapper (#18)

c6f8489

- Add Maven wrapper so that a user can start playing with the example even without local Maven installation. - Update Armeria from 0.96.0 to 0.97.0 - Update Brave from 5.9.0 to 5.9.1

Update dependencies (#19)

9a5f430

- Armeria 0.97.0 -> 0.98.1 - Brave 5.9.1 -> 5.9.4

Update dependencies (#20)

5765a60

- Armeria 0.98.1 -> 0.98.4 - Brave 5.9.4 -> 5.9.5

Upgrade Armeria to 0.99.7 (#21)

1c538d5

Update Armeria to 0.99.8 (#22)

16a64f4

Update dependencies (#23)

4b8ec95

- Armeria 0.99.8 -> 0.99.9 - Brave 5.12.3 -> 5.12.4

Update Armeria to 1.0 (#24)

1d8421a

Use TracingBuilder.addSpanHandler() (#25)

adbe04c

Because `spanReporter(...)` is deprecated.

Update dependencies (#26)

c9d9d14

Armeria 1.0.0 -> 1.1.0 Brave 5.12.4 -> 5.12.6

Add 'armeria/' from commit 'c9d9d14e654c3f9d3bfcaf2fd2a53e7e01f273e2'

69a89ad

git-subtree-dir: armeria git-subtree-mainline: 52f1b3b git-subtree-split: c9d9d14

codefromthecrypt requested a review from anuraaga October 8, 2020 12:18

codefromthecrypt force-pushed the armeria branch from e2da0cc to 6a500d9 Compare October 8, 2020 12:25

codefromthecrypt commented Oct 8, 2020

View reviewed changes

anuraaga approved these changes Oct 8, 2020

View reviewed changes

trustin reviewed Oct 8, 2020

View reviewed changes

Conventionalizes and adds Docker integration

8635d29

codefromthecrypt force-pushed the armeria branch from 67ca800 to 8635d29 Compare October 8, 2020 13:28

codefromthecrypt merged commit 56e16a7 into master Oct 8, 2020

codefromthecrypt deleted the armeria branch October 8, 2020 13:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merges in Armeria example #48

Merges in Armeria example #48

codefromthecrypt commented Oct 8, 2020

codefromthecrypt left a comment

codefromthecrypt Oct 8, 2020

codefromthecrypt Oct 8, 2020

codefromthecrypt Oct 8, 2020

trustin Oct 8, 2020

codefromthecrypt Oct 8, 2020

codefromthecrypt Oct 8, 2020

codefromthecrypt Oct 8, 2020

codefromthecrypt Oct 8, 2020

codefromthecrypt Oct 8, 2020

trustin left a comment

trustin Oct 8, 2020

trustin Oct 8, 2020

		@@ -0,0 +1,36 @@
		# Basic example showing distributed tracing across Armeria apps


		EXPOSE 8081 9000

		ENV JAVA_OPTS="-Xms16m -Xmx16m -XX:+ExitOnOutOfMemoryError"


		WORKDIR /brave-example
		COPY --from=install /install/webmvc4-jetty/ .

Merges in Armeria example #48

Merges in Armeria example #48

Conversation

codefromthecrypt commented Oct 8, 2020

codefromthecrypt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trustin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment