Skip to content

Updating to the latest micrometer changes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 18, 2022
Merged

Updating to the latest micrometer changes #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4335206
Updating to the latest micrometer changes
marcingrzejszczak Jun 29, 2022
c6d7e27
Applied changes related to sender and receiver contexts
marcingrzejszczak Jul 18, 2022
cb5e442
Repackaged code to provide common abstraction for conventions
marcingrzejszczak Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions .../java/io/micrometer/convention/http/name/OpenTelemetryHttpClientSemanticNameProvider.java
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions .../java/io/micrometer/convention/http/name/OpenTelemetryHttpServerSemanticNameProvider.java
View file
Open in desktop

This file was deleted.

58 changes: 58 additions & 0 deletions ...ns-experimental/src/main/java/io/micrometer/convention/otel/OpenTelemetryConventions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/**
* Copyright 2022 VMware, Inc.
* <p>
* 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
* <p>
* https://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 io.micrometer.convention.otel;

import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Stream;

import io.micrometer.common.KeyValue;
import io.micrometer.convention.otel.http.OpenTelemetryHttpClientConventions;
import io.micrometer.convention.otel.http.OpenTelemetryHttpLowCardinalityKeyNames;
import io.micrometer.convention.otel.http.OpenTelemetryHttpServerConvention;
import io.micrometer.conventions.common.AttributeType;
import io.micrometer.observation.Observation;
import io.micrometer.observation.transport.http.HttpRequest;
import io.micrometer.observation.transport.http.HttpResponse;
import io.micrometer.observation.transport.http.context.HttpContext;
import io.micrometer.observation.transport.http.tags.HttpKeyValuesConvention;

/**
* Conventions for HTTP key values implemented with OpenTelemetry.
*
* @author Marcin Grzejszczak
* @since 1.10.0
*/
public final class OpenTelemetryConventions {

/**
* Provides all HTTP related conventions.
* @return collection of HTTP conventions
*/
public static Collection<Observation.ObservationConvention<?>> http() {
return Arrays.asList(new OpenTelemetryHttpClientConventions(), new OpenTelemetryHttpServerConvention());
}

/**
* Provides all OTel conventions.
* @return all OTel conventions
*/
public static Collection<Observation.ObservationConvention<?>> all() {
return http();
}
}
23 changes: 21 additions & 2 deletions ...lemetryHttpClientKeyValuesConvention.java → ...p/OpenTelemetryHttpClientConventions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.convention.http.tag;
package io.micrometer.convention.otel.http;

import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues;
import io.micrometer.observation.Observation;
import io.micrometer.observation.transport.http.HttpClientRequest;
import io.micrometer.observation.transport.http.HttpClientResponse;
import io.micrometer.observation.transport.http.HttpRequest;
import io.micrometer.observation.transport.http.context.HttpClientContext;
import io.micrometer.observation.transport.http.tags.HttpClientKeyValuesConvention;

/**
Expand All @@ -26,12 +31,26 @@
* @since 1.10.0
*/
// TODO: What to do if request is not set? UNKNOWN?
public class OpenTelemetryHttpClientKeyValuesConvention extends OpenTelemetryHttpKeyValuesConvention
public class OpenTelemetryHttpClientConventions extends OpenTelemetryHttpConvention<HttpClientRequest, HttpClientResponse, HttpClientContext>
implements HttpClientKeyValuesConvention {

@Override
public KeyValue peerName(HttpRequest request) {
return OpenTelemetryHttpClientLowCardinalityKeyNames.PEER_NAME.of("UNKNOWN");
}

@Override
public String getName() {
return "http.client.duration";
}

@Override
public boolean supportsContext(Observation.Context context) {
return context instanceof HttpClientContext;
}

@Override
public KeyValues getLowCardinalityKeyValues(HttpClientContext context) {
return all(context.getRequest(), context.getResponse());
}
}
2 changes: 1 addition & 1 deletion ...etryHttpClientLowCardinalityKeyNames.java → ...etryHttpClientLowCardinalityKeyNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.convention.http.tag;
package io.micrometer.convention.otel.http;

import io.micrometer.common.docs.KeyName;
import io.micrometer.conventions.semantic.SemanticAttributes;
Expand Down
6 changes: 4 additions & 2 deletions ...OpenTelemetryHttpKeyValuesConvention.java → ...tel/http/OpenTelemetryHttpConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.convention.http.tag;
package io.micrometer.convention.otel.http;

import java.util.function.Predicate;
import java.util.stream.Stream;

import io.micrometer.common.KeyValue;
import io.micrometer.conventions.common.AttributeType;
import io.micrometer.observation.Observation;
import io.micrometer.observation.transport.http.HttpRequest;
import io.micrometer.observation.transport.http.HttpResponse;
import io.micrometer.observation.transport.http.context.HttpContext;
import io.micrometer.observation.transport.http.tags.HttpKeyValuesConvention;

/**
Expand All @@ -31,7 +33,7 @@
* @since 1.10.0
*/
// TODO: What to do if request is not set? UNKNOWN?
abstract class OpenTelemetryHttpKeyValuesConvention implements HttpKeyValuesConvention {
abstract class OpenTelemetryHttpConvention<REQ extends HttpRequest, RES extends HttpResponse, CONTEXT extends HttpContext<REQ, RES>> implements HttpKeyValuesConvention, Observation.ObservationConvention<CONTEXT> {

// TODO: This is just an example
private static final Predicate<Object> METHOD_PREDICATE = s -> isTypeCorrect(
Expand Down
2 changes: 1 addition & 1 deletion ...nTelemetryHttpLowCardinalityKeyNames.java → ...nTelemetryHttpLowCardinalityKeyNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.convention.http.tag;
package io.micrometer.convention.otel.http;

import io.micrometer.common.docs.KeyName;
import io.micrometer.conventions.semantic.SemanticAttributes;
Expand Down
17 changes: 14 additions & 3 deletions ...lemetryHttpServerKeyValuesConvention.java → ...tp/OpenTelemetryHttpServerConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.convention.http.tag;
package io.micrometer.convention.otel.http;

import io.micrometer.common.KeyValue;
import io.micrometer.observation.transport.http.HttpRequest;
import io.micrometer.observation.Observation;
import io.micrometer.observation.transport.http.*;
import io.micrometer.observation.transport.http.context.HttpServerContext;
import io.micrometer.observation.transport.http.tags.HttpServerKeyValuesConvention;

/**
Expand All @@ -26,7 +28,7 @@
* @since 1.10.0
*/
// TODO: What to do if request is not set? UNKNOWN?
public class OpenTelemetryHttpServerKeyValuesConvention extends OpenTelemetryHttpKeyValuesConvention
public class OpenTelemetryHttpServerConvention extends OpenTelemetryHttpConvention<HttpServerRequest, HttpServerResponse, HttpServerContext>
implements HttpServerKeyValuesConvention {

@Override
Expand All @@ -49,4 +51,13 @@ public KeyValue clientIp(HttpRequest request) {
return OpenTelemetryHttpServerLowCardinalityKeyNames.CLIENT_IP.of("UNKNOWN");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't there something missing? Extracing the client IP from the request?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, everything is missing - I've done only the method key value as an example :)

}

@Override
public String getName() {
return "http.server.duration";
}

@Override
public boolean supportsContext(Observation.Context context) {
return context instanceof HttpServerContext;
}
}
2 changes: 1 addition & 1 deletion ...etryHttpServerLowCardinalityKeyNames.java → ...etryHttpServerLowCardinalityKeyNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.convention.http.tag;
package io.micrometer.convention.otel.http;

import io.micrometer.common.docs.KeyName;
import io.micrometer.conventions.semantic.SemanticAttributes;
Expand Down
Loading