Skip to content

Commit

Permalink
Add OTEL envars
Browse files Browse the repository at this point in the history
  • Loading branch information
farski committed May 15, 2024
1 parent 1fbaf4f commit 2138dd9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
2 changes: 2 additions & 0 deletions spire/templates/apps-200A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Parameters:
VpcCidrBlock: { Type: String }
VpcIpv6CidrBlocks: { Type: String }
NewRelicApiKeyPrxLite: { Type: String }
SignozAccessToken: { Type: String }
VpcPublicSubnet1Id: { Type: AWS::EC2::Subnet::Id }
VpcPublicSubnet2Id: { Type: AWS::EC2::Subnet::Id }
VpcPublicSubnet3Id: { Type: AWS::EC2::Subnet::Id }
Expand Down Expand Up @@ -272,6 +273,7 @@ Resources:
DovetailAppleApiBridgeEndpointUrl: !Ref DovetailAppleApiBridgeEndpointUrl
EchoServiceToken: !Ref EchoServiceToken
SlackMessageRelaySnsTopicArn: !Ref SlackMessageRelaySnsTopicArn
SignozAccessToken: !Ref SignozAccessToken
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
17 changes: 17 additions & 0 deletions spire/templates/apps/feeder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Parameters:
PublicFeedsHostname: { Type: String }
DovetailAppleApiBridgeEndpointUrl: { Type: String }
SlackMessageRelaySnsTopicArn: { Type: String }
SignozAccessToken: { Type: String }

Conditions:
IsProduction: !Equals [!Ref EnvironmentType, Production]
Expand Down Expand Up @@ -725,6 +726,14 @@ Resources:
Value: !Ref S3SigningAccessKeyId
- Name: UPLOAD_SIGNING_SERVICE_URL
Value: !Ref S3SigningEndpointUrl
- Name: OTEL_EXPORTER
Value: otlp
- Name: OTEL_SERVICE_NAME
Value: !If [IsProduction, Feeder Production, Feeder Staging]
- Name: OTEL_EXPORTER_OTLP_ENDPOINT
Value: https://ingest.us.signoz.cloud:443
- Name: OTEL_EXPORTER_OTLP_HEADERS
Value: !Sub signoz-access-token=${SignozAccessToken}
Essential: true
Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag}
LinuxParameters:
Expand Down Expand Up @@ -874,6 +883,14 @@ Resources:
Value: true
- Name: WORKER_COUNT
Value: !If [IsProduction, 8, 5]
- Name: OTEL_EXPORTER
Value: otlp
- Name: OTEL_SERVICE_NAME
Value: !If [IsProduction, Feeder Production, Feeder Staging]
- Name: OTEL_EXPORTER_OTLP_ENDPOINT
Value: https://ingest.us.signoz.cloud:443
- Name: OTEL_EXPORTER_OTLP_HEADERS
Value: !Sub signoz-access-token=${SignozAccessToken}
Essential: true
Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag}
LinuxParameters:
Expand Down
2 changes: 2 additions & 0 deletions spire/templates/root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Parameters:
SharedAuroraPostgresqlEndpoint: { Type: AWS::SSM::Parameter::Value<String> }
SharedAuroraPostgresqlPort: { Type: String, Default: "3306" }
NewRelicApiKeyPrxLite: { Type: AWS::SSM::Parameter::Value<String>, Default: /prx/global/Spire/new-relic-lite-api-key }
SignozAccessToken: { Type: AWS::SSM::Parameter::Value<String>, Default: /prx/global/Spire/signoz-access-token }
AuthorizedKeys: { Type: AWS::SSM::Parameter::Value<List<String>>, Default: /prx/global/Spire/authorized-keys, NoEcho: true }
NestedChangeSetScrubbingResourcesState:
Type: String
Expand Down Expand Up @@ -687,6 +688,7 @@ Resources:
VpcCidrBlock: !GetAtt SharedVpcStack.Outputs.VpcCidrBlock
VpcIpv6CidrBlocks: !GetAtt SharedVpcStack.Outputs.VpcIpv6CidrBlocks
NewRelicApiKeyPrxLite: !Ref NewRelicApiKeyPrxLite
SignozAccessToken: !Ref SignozAccessToken
EnvironmentType: !Ref EnvironmentType
EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation
EnvironmentTypeLowercase: !GetAtt Constants2.Outputs.EnvironmentTypeLowercase
Expand Down

0 comments on commit 2138dd9

Please sign in to comment.