-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HBASE-26759 Fix trace continuity through CallRunner (#4126)
Signed-off-by: Andrew Purtell <[email protected]> Signed-off-by: Duo Zhang <[email protected]>
- Loading branch information
Showing
9 changed files
with
306 additions
and
109 deletions.
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/hamcrest/EventMatchers.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,53 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.hadoop.hbase.client.trace.hamcrest; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.sdk.trace.data.EventData; | ||
| import org.hamcrest.FeatureMatcher; | ||
| import org.hamcrest.Matcher; | ||
|
|
||
| /** | ||
| * Helper methods for matching against instances of {@link EventData}. | ||
| */ | ||
| public final class EventMatchers { | ||
|
|
||
| private EventMatchers() { } | ||
|
|
||
| public static Matcher<EventData> hasAttributes(Matcher<Attributes> matcher) { | ||
| return new FeatureMatcher<EventData, Attributes>( | ||
| matcher, "EventData having attributes that ", "attributes") { | ||
| @Override protected Attributes featureValueOf(EventData actual) { | ||
| return actual.getAttributes(); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| public static Matcher<EventData> hasName(String name) { | ||
| return hasName(equalTo(name)); | ||
| } | ||
|
|
||
| public static Matcher<EventData> hasName(Matcher<String> matcher) { | ||
| return new FeatureMatcher<EventData, String>(matcher, "EventData with a name that ", "name") { | ||
| @Override protected String featureValueOf(EventData actual) { | ||
| return actual.getName(); | ||
| } | ||
| }; | ||
| } | ||
| } |
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
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
50 changes: 50 additions & 0 deletions
50
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RPCTInfoGetter.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,50 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.hadoop.hbase.ipc; | ||
|
|
||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.context.propagation.TextMapGetter; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import org.apache.yetus.audience.InterfaceAudience; | ||
| import org.apache.hadoop.hbase.shaded.protobuf.generated.TracingProtos; | ||
|
|
||
| /** | ||
| * Used to extract a tracing {@link Context} from an instance of {@link TracingProtos.RPCTInfo}. | ||
| */ | ||
| @InterfaceAudience.Private | ||
| final class RPCTInfoGetter implements TextMapGetter<TracingProtos.RPCTInfo> { | ||
| RPCTInfoGetter() { } | ||
|
|
||
| @Override | ||
| public Iterable<String> keys(TracingProtos.RPCTInfo carrier) { | ||
| return Optional.ofNullable(carrier) | ||
| .map(TracingProtos.RPCTInfo::getHeadersMap) | ||
| .map(Map::keySet) | ||
| .orElse(Collections.emptySet()); | ||
| } | ||
|
|
||
| @Override | ||
| public String get(TracingProtos.RPCTInfo carrier, String key) { | ||
| return Optional.ofNullable(carrier) | ||
| .map(TracingProtos.RPCTInfo::getHeadersMap) | ||
| .map(map -> map.get(key)) | ||
| .orElse(null); | ||
| } | ||
| } |
Oops, something went wrong.