-
Notifications
You must be signed in to change notification settings - Fork 13
AppSignals Functionality - add AlwaysRecordSampler and Utility files, add pr-build workflow #9
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.
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
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
48c2f91
AppSignals Functionality - add AlwaysRecordSampler and Utility files
jj22ee 1ac03b1
add workflow files for pr_build and lint
jj22ee 5b57d2d
run markdown lint
jj22ee 75921dd
address comments
jj22ee 76ce1e7
add unit tests for files in this branch
jj22ee b8dddb8
force pr_build workflow
jj22ee f9240e5
remove test:ci:changed from pr_build workflow
jj22ee 1561d5a
fix pr_build failure for node 14
jj22ee 84c3139
actions/setup-node@v4
jj22ee 8979263
run pr_build only on main/release branches
jj22ee 733ed0a
update test comment for testIsLocalRoot
jj22ee ab89b6d
update AWS_SDK_INSTRUMENTATION_SCOPE_PREFIX value
jj22ee ffefbd0
rename pr_build.yml to pr-build.yml
jj22ee 94ca251
update comments
jj22ee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
67 changes: 67 additions & 0 deletions
67
aws-distro-opentelemetry-node-autoinstrumentation/src/always-record-sampler.ts
This file contains hidden or 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,67 @@ | ||
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
import { Context, Link, SpanAttributes, SpanKind } from '@opentelemetry/api'; | ||
import { Sampler, SamplingDecision, SamplingResult } from '@opentelemetry/sdk-trace-base'; | ||
|
||
/** | ||
* This sampler will return the sampling result of the provided {@link #rootSampler}, unless the | ||
* sampling result contains the sampling decision {@link SamplingDecision.NOT_RECORD}, in which case, a | ||
* new sampling result will be returned that is functionally equivalent to the original, except that | ||
* it contains the sampling decision {@link SamplingDecision.RECORD}. This ensures that all | ||
* spans are recorded, with no change to sampling. | ||
* | ||
* <p>The intended use case of this sampler is to provide a means of sending all spans to a | ||
* processor without having an impact on the sampling rate. This may be desirable if a user wishes | ||
* to count or otherwise measure all spans produced in a service, without incurring the cost of 100% | ||
* sampling. | ||
*/ | ||
export class AlwaysRecordSampler implements Sampler { | ||
private rootSampler: Sampler; | ||
|
||
public static create(rootSampler: Sampler): AlwaysRecordSampler { | ||
return new AlwaysRecordSampler(rootSampler); | ||
} | ||
|
||
private constructor(rootSampler: Sampler) { | ||
if (rootSampler === null) { | ||
throw new Error('rootSampler is null. It must be provided'); | ||
} | ||
this.rootSampler = rootSampler; | ||
} | ||
|
||
shouldSample( | ||
context: Context, | ||
traceId: string, | ||
spanName: string, | ||
spanKind: SpanKind, | ||
attributes: SpanAttributes, | ||
links: Link[] | ||
): SamplingResult { | ||
const rootSamplerSamplingResult: SamplingResult = this.rootSampler.shouldSample( | ||
context, | ||
traceId, | ||
spanName, | ||
spanKind, | ||
attributes, | ||
links | ||
); | ||
if (rootSamplerSamplingResult.decision === SamplingDecision.NOT_RECORD) { | ||
return this.wrapResultWithRecordOnlyResult(rootSamplerSamplingResult); | ||
} | ||
return rootSamplerSamplingResult; | ||
} | ||
|
||
toString(): string { | ||
return `AlwaysRecordSampler{${this.rootSampler.toString()}}`; | ||
} | ||
|
||
wrapResultWithRecordOnlyResult(result: SamplingResult) { | ||
const wrappedResult: SamplingResult = { | ||
decision: SamplingDecision.RECORD, | ||
attributes: result.attributes, | ||
traceState: result.traceState, | ||
}; | ||
return wrappedResult; | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
aws-distro-opentelemetry-node-autoinstrumentation/src/aws-attribute-keys.ts
This file contains hidden or 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,31 @@ | ||
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
export const AWS_ATTRIBUTE_KEYS: { [key: string]: string } = { | ||
AWS_SPAN_KIND: 'aws.span.kind', | ||
AWS_LOCAL_SERVICE: 'aws.local.service', | ||
AWS_LOCAL_OPERATION: 'aws.local.operation', | ||
AWS_REMOTE_SERVICE: 'aws.remote.service', | ||
AWS_REMOTE_OPERATION: 'aws.remote.operation', | ||
AWS_REMOTE_RESOURCE_TYPE: 'aws.remote.resource.type', | ||
AWS_REMOTE_RESOURCE_IDENTIFIER: 'aws.remote.resource.identifier', | ||
AWS_SDK_DESCENDANT: 'aws.sdk.descendant', | ||
AWS_CONSUMER_PARENT_SPAN_KIND: 'aws.consumer.parent.span.kind', | ||
|
||
AWS_REMOTE_TARGET: 'aws.remote.target', | ||
AWS_REMOTE_DB_USER: 'aws.remote.db.user', | ||
|
||
// Used for JavaScript workaround - attribute for pre-calculated value of isLocalRoot | ||
APPSIGNALS_IS_LOCAL_ROOT: 'appsignals.is.local.root', | ||
jj22ee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// Divergence from Java/Python | ||
// TODO: Audit this: These will most definitely be different in JavaScript. | ||
// For example: | ||
// - `messaging.url` for AWS_QUEUE_URL | ||
// - `aws.dynamodb.table_names` for AWS_TABLE_NAME | ||
AWS_BUCKET_NAME: 'aws.bucket.name', | ||
AWS_QUEUE_URL: 'aws.queue.url', | ||
AWS_QUEUE_NAME: 'aws.queue.name', | ||
AWS_STREAM_NAME: 'aws.stream.name', | ||
AWS_TABLE_NAME: 'aws.table.name', | ||
}; |
244 changes: 244 additions & 0 deletions
244
aws-distro-opentelemetry-node-autoinstrumentation/src/aws-span-processing-util.ts
This file contains hidden or 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,244 @@ | ||
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
import { AttributeValue, Context, SpanContext, SpanKind, diag, isSpanContextValid, trace } from '@opentelemetry/api'; | ||
import { InstrumentationLibrary } from '@opentelemetry/core'; | ||
import { ReadableSpan, Span } from '@opentelemetry/sdk-trace-base'; | ||
|
||
import { | ||
MessagingOperationValues, | ||
SEMATTRS_DB_OPERATION, | ||
SEMATTRS_DB_STATEMENT, | ||
SEMATTRS_DB_SYSTEM, | ||
SEMATTRS_HTTP_METHOD, | ||
SEMATTRS_HTTP_TARGET, | ||
SEMATTRS_MESSAGING_OPERATION, | ||
SEMATTRS_RPC_SYSTEM, | ||
} from '@opentelemetry/semantic-conventions'; | ||
import { AWS_ATTRIBUTE_KEYS } from './aws-attribute-keys'; | ||
import * as SQL_DIALECT_KEYWORDS_JSON from './configuration/sql_dialect_keywords.json'; | ||
|
||
/** Utility class designed to support shared logic across AWS Span Processors. */ | ||
export class AwsSpanProcessingUtil { | ||
// Default attribute values if no valid span attribute value is identified | ||
static UNKNOWN_SERVICE: string = 'UnknownService'; | ||
static UNKNOWN_OPERATION: string = 'UnknownOperation'; | ||
static UNKNOWN_REMOTE_SERVICE: string = 'UnknownRemoteService'; | ||
static UNKNOWN_REMOTE_OPERATION: string = 'UnknownRemoteOperation'; | ||
static INTERNAL_OPERATION: string = 'InternalOperation'; | ||
static LOCAL_ROOT: string = 'LOCAL_ROOT'; | ||
static SQS_RECEIVE_MESSAGE_SPAN_NAME: string = 'Sqs.ReceiveMessage'; | ||
static AWS_SDK_INSTRUMENTATION_SCOPE_PREFIX: string = 'io.opentelemetry.aws-sdk-'; | ||
jj22ee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// Max keyword length supported by parsing into remote_operation from DB_STATEMENT. | ||
// The current longest command word is DATETIME_INTERVAL_PRECISION at 27 characters. | ||
// If we add a longer keyword to the sql dialect keyword list, need to update the constant below. | ||
static MAX_KEYWORD_LENGTH: number = 27; | ||
static SQL_DIALECT_PATTERN = '^(?:' + AwsSpanProcessingUtil.getDialectKeywords().join('|') + ')\\b'; | ||
|
||
static getDialectKeywords(): string[] { | ||
return SQL_DIALECT_KEYWORDS_JSON.keywords; | ||
} | ||
|
||
/** | ||
* Ingress operation (i.e. operation for Server and Consumer spans) will be generated from | ||
* "http.method + http.target/with the first API path parameter" if the default span name equals | ||
* null, UnknownOperation or http.method value. | ||
*/ | ||
static getIngressOperation(span: ReadableSpan): string { | ||
let operation: string = span.name; | ||
if (AwsSpanProcessingUtil.shouldUseInternalOperation(span)) { | ||
operation = AwsSpanProcessingUtil.INTERNAL_OPERATION; | ||
} else if (!AwsSpanProcessingUtil.isValidOperation(span, operation)) { | ||
operation = AwsSpanProcessingUtil.generateIngressOperation(span); | ||
} | ||
return operation; | ||
} | ||
|
||
static getEgressOperation(span: ReadableSpan): string | undefined { | ||
if (AwsSpanProcessingUtil.shouldUseInternalOperation(span)) { | ||
return AwsSpanProcessingUtil.INTERNAL_OPERATION; | ||
} else { | ||
const awsLocalOperation: AttributeValue | undefined = span.attributes[AWS_ATTRIBUTE_KEYS.AWS_LOCAL_OPERATION]; | ||
return awsLocalOperation === undefined ? undefined : awsLocalOperation.toString(); | ||
} | ||
} | ||
|
||
/** | ||
* Extract the first part from API http target if it exists | ||
* | ||
* @param httpTarget http request target string value. Eg, /payment/1234 | ||
* @return the first part from the http target. Eg, /payment | ||
*/ | ||
static extractAPIPathValue(httpTarget: string): string { | ||
if (httpTarget == null || httpTarget === '') { | ||
return '/'; | ||
} | ||
const paths: string[] = httpTarget.split('/'); | ||
if (paths.length > 1) { | ||
return '/' + paths[1]; | ||
} | ||
return '/'; | ||
} | ||
|
||
static isKeyPresent(span: ReadableSpan, key: string): boolean { | ||
return span.attributes[key] !== undefined; | ||
} | ||
|
||
static isAwsSDKSpan(span: ReadableSpan): boolean { | ||
const rpcSystem: AttributeValue | undefined = span.attributes[SEMATTRS_RPC_SYSTEM]; | ||
|
||
if (rpcSystem === undefined) { | ||
return false; | ||
} | ||
|
||
// https://opentelemetry.io/docs/specs/otel/trace/semantic_conventions/instrumentation/aws-sdk/#common-attributes | ||
return 'aws-api' === rpcSystem; | ||
} | ||
|
||
static shouldGenerateServiceMetricAttributes(span: ReadableSpan): boolean { | ||
return ( | ||
(AwsSpanProcessingUtil.isLocalRoot(span) && !AwsSpanProcessingUtil.isSqsReceiveMessageConsumerSpan(span)) || | ||
SpanKind.SERVER === span.kind | ||
); | ||
} | ||
|
||
static shouldGenerateDependencyMetricAttributes(span: ReadableSpan): boolean { | ||
// Divergence from Java/Python | ||
// In OTel JS, the AWS SDK instrumentation creates two Client Spans, one for AWS SDK, | ||
// and another for the underlying HTTP Client used by the SDK. The following code block | ||
// ensures that dependency metrics are not generated for direct descendent of AWS SDK Spans. | ||
const isAwsSdkDescendent: AttributeValue | undefined = span.attributes[AWS_ATTRIBUTE_KEYS.AWS_SDK_DESCENDANT]; | ||
if (isAwsSdkDescendent !== undefined && isAwsSdkDescendent === 'true') { | ||
return false; | ||
} | ||
|
||
return ( | ||
SpanKind.CLIENT === span.kind || | ||
SpanKind.PRODUCER === span.kind || | ||
(AwsSpanProcessingUtil.isDependencyConsumerSpan(span) && | ||
!AwsSpanProcessingUtil.isSqsReceiveMessageConsumerSpan(span)) | ||
); | ||
} | ||
|
||
static isConsumerProcessSpan(spanData: ReadableSpan): boolean { | ||
const messagingOperation: AttributeValue | undefined = spanData.attributes[SEMATTRS_MESSAGING_OPERATION]; | ||
if (messagingOperation === undefined) { | ||
return false; | ||
} | ||
|
||
return SpanKind.CONSUMER === spanData.kind && MessagingOperationValues.PROCESS === messagingOperation; | ||
} | ||
|
||
// Any spans that are Local Roots and also not SERVER should have aws.local.operation renamed to | ||
// InternalOperation. | ||
static shouldUseInternalOperation(span: ReadableSpan): boolean { | ||
return AwsSpanProcessingUtil.isLocalRoot(span) && SpanKind.SERVER !== span.kind; | ||
} | ||
|
||
// A span is a local root if it has no parent or if the parent is remote. This function checks the | ||
// parent context and returns true if it is a local root. | ||
static isLocalRoot(spanData: ReadableSpan): boolean { | ||
// Workaround implemented for this function as parent span context is not obtainable. | ||
// This isLocalRoot value is precalculated in AttributePropagatingSpanProcessor, which is assumed | ||
jj22ee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// to start before the other processors (e.g. AwsSpanMetricsProcessor) | ||
// Thus this function is implemented differently than in Java/Python | ||
const isLocalRoot: AttributeValue | undefined = spanData.attributes[AWS_ATTRIBUTE_KEYS.APPSIGNALS_IS_LOCAL_ROOT]; | ||
if (isLocalRoot === undefined) { | ||
// isLocalRoot should be precalculated, this code block should not be entered | ||
diag.debug('isLocalRoot for span has not been precalculated. Assuming span is Local Root Span.'); | ||
jj22ee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return true; | ||
} | ||
return isLocalRoot as boolean; | ||
} | ||
|
||
// To identify the SQS consumer spans produced by AWS SDK instrumentation | ||
private static isSqsReceiveMessageConsumerSpan(spanData: ReadableSpan): boolean { | ||
const spanName: string = spanData.name; | ||
const spanKind: SpanKind = spanData.kind; | ||
const messagingOperation: AttributeValue | undefined = spanData.attributes[SEMATTRS_MESSAGING_OPERATION]; | ||
|
||
const instrumentationLibrary: InstrumentationLibrary = spanData.instrumentationLibrary; | ||
|
||
return ( | ||
AwsSpanProcessingUtil.SQS_RECEIVE_MESSAGE_SPAN_NAME.toLowerCase() === spanName.toLowerCase() && | ||
SpanKind.CONSUMER === spanKind && | ||
instrumentationLibrary != null && | ||
instrumentationLibrary.name.startsWith(AwsSpanProcessingUtil.AWS_SDK_INSTRUMENTATION_SCOPE_PREFIX) && | ||
(messagingOperation === undefined || messagingOperation === MessagingOperationValues.PROCESS) | ||
); | ||
} | ||
|
||
private static isDependencyConsumerSpan(span: ReadableSpan): boolean { | ||
if (SpanKind.CONSUMER !== span.kind) { | ||
return false; | ||
} else if (AwsSpanProcessingUtil.isConsumerProcessSpan(span)) { | ||
if (AwsSpanProcessingUtil.isLocalRoot(span)) { | ||
return true; | ||
} | ||
const parentSpanKind: AttributeValue | undefined = | ||
span.attributes[AWS_ATTRIBUTE_KEYS.AWS_CONSUMER_PARENT_SPAN_KIND]; | ||
|
||
return SpanKind[SpanKind.CONSUMER] !== parentSpanKind; | ||
} | ||
return true; | ||
} | ||
|
||
/** | ||
* When Span name is null, UnknownOperation or HttpMethod value, it will be treated as invalid | ||
* local operation value that needs to be further processed | ||
*/ | ||
private static isValidOperation(span: ReadableSpan, operation: string): boolean { | ||
if (operation == null || operation === AwsSpanProcessingUtil.UNKNOWN_OPERATION) { | ||
return false; | ||
} | ||
if (AwsSpanProcessingUtil.isKeyPresent(span, SEMATTRS_HTTP_METHOD)) { | ||
const httpMethod: AttributeValue | undefined = span.attributes[SEMATTRS_HTTP_METHOD]; | ||
return operation !== httpMethod; | ||
} | ||
return true; | ||
} | ||
|
||
/** | ||
* When span name is not meaningful(null, unknown or http_method value) as operation name for http | ||
* use cases. Will try to extract the operation name from http target string | ||
*/ | ||
private static generateIngressOperation(span: ReadableSpan): string { | ||
let operation: string = AwsSpanProcessingUtil.UNKNOWN_OPERATION; | ||
if (AwsSpanProcessingUtil.isKeyPresent(span, SEMATTRS_HTTP_TARGET)) { | ||
const httpTarget: AttributeValue | undefined = span.attributes[SEMATTRS_HTTP_TARGET]; | ||
// get the first part from API path string as operation value | ||
// the more levels/parts we get from API path the higher chance for getting high cardinality | ||
// data | ||
if (httpTarget != null) { | ||
operation = AwsSpanProcessingUtil.extractAPIPathValue(httpTarget.toString()); | ||
if (AwsSpanProcessingUtil.isKeyPresent(span, SEMATTRS_HTTP_METHOD)) { | ||
const httpMethod: AttributeValue | undefined = span.attributes[SEMATTRS_HTTP_METHOD]; | ||
if (httpMethod != null) { | ||
operation = httpMethod.toString() + ' ' + operation; | ||
} | ||
} | ||
} | ||
} | ||
return operation; | ||
} | ||
|
||
// Check if the current Span adheres to database semantic conventions | ||
static isDBSpan(span: ReadableSpan): boolean { | ||
return ( | ||
AwsSpanProcessingUtil.isKeyPresent(span, SEMATTRS_DB_SYSTEM) || | ||
AwsSpanProcessingUtil.isKeyPresent(span, SEMATTRS_DB_OPERATION) || | ||
AwsSpanProcessingUtil.isKeyPresent(span, SEMATTRS_DB_STATEMENT) | ||
); | ||
} | ||
|
||
// Divergence from Java/Python | ||
static setIsLocalRootInformation(span: Span, parentContext: Context): void { | ||
const parentSpanContext: SpanContext | undefined = trace.getSpanContext(parentContext); | ||
const isParentSpanContextValid: boolean = parentSpanContext !== undefined && isSpanContextValid(parentSpanContext); | ||
const isParentSpanRemote: boolean = parentSpanContext !== undefined && parentSpanContext.isRemote === true; | ||
|
||
const isLocalRoot: boolean = span.parentSpanId === undefined || !isParentSpanContextValid || isParentSpanRemote; | ||
span.setAttribute(AWS_ATTRIBUTE_KEYS.APPSIGNALS_IS_LOCAL_ROOT, isLocalRoot); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.