Skip to content

Commit 6fc6dc6

Browse files
RanVakninRanVaknin
committed
Remove mentions to mdc
1 parent 6a0cbcb commit 6fc6dc6

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptorTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ public void headerNotAddedIfNoTraceIdEnvVar() {
113113
}
114114

115115
@Test
116-
public void modifyHttpRequest_whenMultiConcurrencyModeWithMdc_shouldAddTraceIdHeader() {
116+
public void modifyHttpRequest_whenMultiConcurrencyModeWithThreadStorage_shouldAddTraceIdHeader() {
117117
EnvironmentVariableHelper.run(env -> {
118118
resetRelevantEnvVars(env);
119119
env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
120-
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "mdc-trace-123");
120+
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "ThreadStorage-trace-123");
121121

122122
try {
123123
TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
@@ -127,20 +127,20 @@ public void modifyHttpRequest_whenMultiConcurrencyModeWithMdc_shouldAddTraceIdHe
127127
Context.ModifyHttpRequest context = context();
128128

129129
SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
130-
assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
130+
assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
131131
} finally {
132132
ThreadStorage.remove("AWS_LAMBDA_X_TRACE_ID");
133133
}
134134
});
135135
}
136136

137137
@Test
138-
public void modifyHttpRequest_whenMultiConcurrencyModeWithBothMdcAndSystemProperty_shouldUseMdcValue() {
138+
public void modifyHttpRequest_whenMultiConcurrencyModeWithBothThreadStorageAndSystemProperty_shouldUseThreadStorageValue() {
139139
EnvironmentVariableHelper.run(env -> {
140140
resetRelevantEnvVars(env);
141141
env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
142142

143-
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "mdc-trace-123");
143+
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "ThreadStorage-trace-123");
144144
Properties props = System.getProperties();
145145
props.setProperty("com.amazonaws.xray.traceHeader", "sys-prop-345");
146146

@@ -153,7 +153,7 @@ public void modifyHttpRequest_whenMultiConcurrencyModeWithBothMdcAndSystemProper
153153
Context.ModifyHttpRequest context = context();
154154
SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
155155

156-
assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
156+
assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
157157
} finally {
158158
ThreadStorage.remove("AWS_LAMBDA_X_TRACE_ID");
159159
props.remove("com.amazonaws.xray.traceHeader");
@@ -162,7 +162,7 @@ public void modifyHttpRequest_whenMultiConcurrencyModeWithBothMdcAndSystemProper
162162
}
163163

164164
@Test
165-
public void modifyHttpRequest_whenNotInLambdaEnvironmentWithMdc_shouldNotAddHeader() {
165+
public void modifyHttpRequest_whenNotInLambdaEnvironmentWithThreadStorage_shouldNotAddHeader() {
166166
EnvironmentVariableHelper.run(env -> {
167167
resetRelevantEnvVars(env);
168168

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/TraceIdTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void traceIdInterceptorIsEnabled() {
6969
public void traceIdInterceptorPreservesTraceIdAcrossRetries() {
7070
EnvironmentVariableHelper.run(env -> {
7171
env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
72-
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "mdc-trace-123");
72+
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "ThreadStorage-trace-123");
7373

7474
try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
7575
ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
@@ -96,9 +96,9 @@ public void traceIdInterceptorPreservesTraceIdAcrossRetries() {
9696
List<SdkHttpRequest> requests = mockHttpClient.getRequests();
9797
assertThat(requests).hasSize(3);
9898

99-
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
100-
assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
101-
assertThat(requests.get(2).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
99+
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
100+
assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
101+
assertThat(requests.get(2).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
102102

103103
} finally {
104104
ThreadStorage.clear();
@@ -110,7 +110,7 @@ public void traceIdInterceptorPreservesTraceIdAcrossRetries() {
110110
public void traceIdInterceptorPreservesTraceIdAcrossChainedFutures() {
111111
EnvironmentVariableHelper.run(env -> {
112112
env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
113-
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "mdc-trace-123");
113+
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "ThreadStorage-trace-123");
114114

115115
try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
116116
ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
@@ -140,8 +140,8 @@ public void traceIdInterceptorPreservesTraceIdAcrossChainedFutures() {
140140

141141
assertThat(requests).hasSize(2);
142142

143-
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
144-
assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
143+
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
144+
assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
145145

146146
} finally {
147147
ThreadStorage.clear();
@@ -153,7 +153,7 @@ public void traceIdInterceptorPreservesTraceIdAcrossChainedFutures() {
153153
public void traceIdInterceptorPreservesTraceIdAcrossExceptionallyCompletedFutures() {
154154
EnvironmentVariableHelper.run(env -> {
155155
env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
156-
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "mdc-trace-123");
156+
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "ThreadStorage-trace-123");
157157

158158
try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
159159
ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
@@ -183,8 +183,8 @@ public void traceIdInterceptorPreservesTraceIdAcrossExceptionallyCompletedFuture
183183

184184
assertThat(requests).hasSize(2);
185185

186-
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
187-
assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
186+
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
187+
assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
188188

189189
} finally {
190190
ThreadStorage.clear();
@@ -196,7 +196,7 @@ public void traceIdInterceptorPreservesTraceIdAcrossExceptionallyCompletedFuture
196196
public void traceIdInterceptorPreservesTraceIdAcrossExceptionallyCompletedFuturesThrownInPreExecution() {
197197
EnvironmentVariableHelper.run(env -> {
198198
env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
199-
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "mdc-trace-123");
199+
ThreadStorage.put("AWS_LAMBDA_X_TRACE_ID", "ThreadStorage-trace-123");
200200

201201
ExecutionInterceptor throwingInterceptor = new ExecutionInterceptor() {
202202
private boolean hasThrown = false;
@@ -234,7 +234,7 @@ public void beforeMarshalling(Context.BeforeMarshalling context, ExecutionAttrib
234234
List<SdkHttpRequest> requests = mockHttpClient.getRequests();
235235

236236
assertThat(requests).hasSize(1);
237-
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("mdc-trace-123");
237+
assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("ThreadStorage-trace-123");
238238

239239
} finally {
240240
ThreadStorage.clear();

0 commit comments

Comments
 (0)