-
Notifications
You must be signed in to change notification settings - Fork 327
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add kamon-pekko-http module for Apache Pekko HTTP support * Rework deprecated methods * Remove pekko-http2-support module see apache/pekko-http#52 * Remove Akka 10.1 references * Set pekko-http 1.0.0-RC2 * Use Pekko HTTP release version
- Loading branch information
Showing
29 changed files
with
2,727 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...amon-pekko-http/src/main/java/kamon/instrumentation/pekko/http/FlowOpsMapAsyncAdvice.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package kamon.instrumentation.pekko.http; | ||
|
||
import org.apache.pekko.NotUsed; | ||
import org.apache.pekko.http.scaladsl.model.HttpRequest; | ||
import org.apache.pekko.http.scaladsl.model.HttpResponse; | ||
import org.apache.pekko.stream.scaladsl.Flow; | ||
import kanela.agent.libs.net.bytebuddy.asm.Advice; | ||
|
||
public class FlowOpsMapAsyncAdvice { | ||
|
||
public static class EndpointInfo { | ||
public final String listenInterface; | ||
public final int listenPort; | ||
|
||
public EndpointInfo(String listenInterface, int listenPort) { | ||
this.listenInterface = listenInterface; | ||
this.listenPort = listenPort; | ||
} | ||
} | ||
|
||
public static ThreadLocal<EndpointInfo> currentEndpoint = new ThreadLocal<>(); | ||
|
||
@Advice.OnMethodExit | ||
public static void onExit(@Advice.Return(readOnly = false) org.apache.pekko.stream.scaladsl.FlowOps returnedFlow) { | ||
EndpointInfo bindAndHandlerEndpoint = currentEndpoint.get(); | ||
|
||
if(bindAndHandlerEndpoint != null) { | ||
returnedFlow = ServerFlowWrapper.apply( | ||
(Flow<HttpRequest, HttpResponse, NotUsed>) returnedFlow, | ||
bindAndHandlerEndpoint.listenInterface, | ||
bindAndHandlerEndpoint.listenPort | ||
); | ||
} | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
...ekko-http/src/main/java/kamon/instrumentation/pekko/http/Http2ExtBindAndHandleAdvice.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* 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.instrumentation.pekko.http; | ||
|
||
import org.apache.pekko.http.scaladsl.model.HttpRequest; | ||
import org.apache.pekko.http.scaladsl.model.HttpResponse; | ||
import kanela.agent.libs.net.bytebuddy.asm.Advice; | ||
import scala.Function1; | ||
import scala.concurrent.Future; | ||
|
||
public class Http2ExtBindAndHandleAdvice { | ||
|
||
@Advice.OnMethodEnter(suppress = Throwable.class) | ||
public static void onEnter(@Advice.Argument(value = 0, readOnly = false) Function1<HttpRequest, Future<HttpResponse>> handler, | ||
@Advice.Argument(1) String iface, | ||
@Advice.Argument(2) Integer port) { | ||
|
||
FlowOpsMapAsyncAdvice.currentEndpoint.set(new FlowOpsMapAsyncAdvice.EndpointInfo(iface, port)); | ||
handler = new Http2BlueprintInterceptor.HandlerWithEndpoint(iface, port, handler); | ||
} | ||
|
||
@Advice.OnMethodExit | ||
public static void onExit() { | ||
FlowOpsMapAsyncAdvice.currentEndpoint.remove(); | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
...pekko-http/src/main/java/kamon/instrumentation/pekko/http/HttpExtBindAndHandleAdvice.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* | ||
* 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.instrumentation.pekko.http; | ||
|
||
import org.apache.pekko.NotUsed; | ||
import org.apache.pekko.http.scaladsl.model.HttpRequest; | ||
import org.apache.pekko.http.scaladsl.model.HttpResponse; | ||
import org.apache.pekko.stream.scaladsl.Flow; | ||
import kanela.agent.libs.net.bytebuddy.asm.Advice; | ||
|
||
public class HttpExtBindAndHandleAdvice { | ||
|
||
@Advice.OnMethodEnter(suppress = Throwable.class) | ||
public static void onEnter(@Advice.Argument(value = 0, readOnly = false) Flow<HttpRequest, HttpResponse, NotUsed> handler, | ||
@Advice.Argument(1) String iface, | ||
@Advice.Argument(2) Integer port) { | ||
|
||
handler = ServerFlowWrapper.apply(handler, iface, port); | ||
} | ||
} |
54 changes: 54 additions & 0 deletions
54
...pekko-http/src/main/java/kamon/instrumentation/pekko/http/HttpExtSingleRequestAdvice.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* 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.instrumentation.pekko.http; | ||
|
||
import org.apache.pekko.http.scaladsl.model.HttpRequest; | ||
import org.apache.pekko.http.scaladsl.model.HttpResponse; | ||
import kamon.Kamon; | ||
import kamon.context.Storage; | ||
import kamon.instrumentation.http.HttpClientInstrumentation; | ||
import kamon.instrumentation.http.HttpMessage; | ||
import kamon.trace.Span; | ||
import kanela.agent.libs.net.bytebuddy.asm.Advice; | ||
import scala.concurrent.Future; | ||
import static kamon.instrumentation.pekko.http.PekkoHttpInstrumentation.toRequestBuilder; | ||
|
||
public class HttpExtSingleRequestAdvice { | ||
|
||
@Advice.OnMethodEnter | ||
public static void onEnter(@Advice.Argument(value = 0, readOnly = false) HttpRequest request, | ||
@Advice.Local("handler") HttpClientInstrumentation.RequestHandler<HttpRequest> handler, | ||
@Advice.Local("scope")Storage.Scope scope) { | ||
|
||
final HttpMessage.RequestBuilder<HttpRequest> requestBuilder = toRequestBuilder(request); | ||
|
||
handler = PekkoHttpClientInstrumentation.httpClientInstrumentation() | ||
.createHandler(requestBuilder, Kamon.currentContext()); | ||
|
||
request = handler.request(); | ||
scope = Kamon.storeContext(Kamon.currentContext().withEntry(Span.Key(), handler.span())); | ||
} | ||
|
||
@Advice.OnMethodExit | ||
public static void onExit(@Advice.Return Future<HttpResponse> response, | ||
@Advice.Local("handler") HttpClientInstrumentation.RequestHandler<HttpRequest> handler, | ||
@Advice.Local("scope")Storage.Scope scope) { | ||
|
||
PekkoHttpClientInstrumentation.handleResponse(response, handler); | ||
scope.close(); | ||
} | ||
} |
57 changes: 57 additions & 0 deletions
57
...-http/src/main/java/kamon/instrumentation/pekko/http/PoolMasterDispatchRequestAdvice.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* 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.instrumentation.pekko.http; | ||
|
||
import org.apache.pekko.http.scaladsl.model.HttpRequest; | ||
import org.apache.pekko.http.scaladsl.model.HttpResponse; | ||
import kamon.Kamon; | ||
import kamon.context.Storage; | ||
import kamon.instrumentation.http.HttpClientInstrumentation; | ||
import kamon.instrumentation.http.HttpMessage; | ||
import kamon.trace.Span; | ||
import kanela.agent.libs.net.bytebuddy.asm.Advice; | ||
import scala.concurrent.Future; | ||
|
||
import static kamon.instrumentation.pekko.http.PekkoHttpInstrumentation.toRequestBuilder; | ||
|
||
public class PoolMasterDispatchRequestAdvice { | ||
|
||
@Advice.OnMethodEnter | ||
public static void onEnter( | ||
@Advice.Argument(value = 1, readOnly = false) HttpRequest request, | ||
@Advice.Local("handler") HttpClientInstrumentation.RequestHandler<HttpRequest> handler, | ||
@Advice.Local("scope")Storage.Scope scope) { | ||
|
||
final HttpMessage.RequestBuilder<HttpRequest> requestBuilder = toRequestBuilder(request); | ||
|
||
handler = PekkoHttpClientInstrumentation.httpClientInstrumentation() | ||
.createHandler(requestBuilder, Kamon.currentContext()); | ||
|
||
request = handler.request(); | ||
scope = Kamon.storeContext(Kamon.currentContext().withEntry(Span.Key(), handler.span())); | ||
} | ||
|
||
@Advice.OnMethodExit | ||
public static void onExit( | ||
@Advice.Return Future<HttpResponse> response, | ||
@Advice.Local("handler") HttpClientInstrumentation.RequestHandler<HttpRequest> handler, | ||
@Advice.Local("scope")Storage.Scope scope) { | ||
|
||
PekkoHttpClientInstrumentation.handleResponse(response, handler); | ||
scope.close(); | ||
} | ||
} |
Oops, something went wrong.