instana 1.210.1 → 1.211.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +49 -33
- data/.github/ISSUE_TEMPLATE/bug.yml +1 -1
- data/.github/ISSUE_TEMPLATE/config.yml +1 -1
- data/.github/workflows/release-notification-on-slack.yml +34 -0
- data/Gemfile +2 -7
- data/README.md +1 -1
- data/bin/announce_release_on_slack.py +103 -0
- data/gemfiles/aws_30.gemfile +7 -6
- data/gemfiles/aws_60.gemfile +19 -0
- data/gemfiles/cuba_30.gemfile +1 -1
- data/gemfiles/cuba_40.gemfile +1 -1
- data/gemfiles/dalli_20.gemfile +1 -1
- data/gemfiles/dalli_30.gemfile +1 -1
- data/gemfiles/dalli_32.gemfile +1 -1
- data/gemfiles/excon_02.gemfile +3 -2
- data/gemfiles/excon_021.gemfile +3 -1
- data/gemfiles/excon_079.gemfile +3 -2
- data/gemfiles/excon_100.gemfile +3 -2
- data/gemfiles/graphql_10.gemfile +1 -1
- data/gemfiles/graphql_20.gemfile +1 -1
- data/gemfiles/grpc_10.gemfile +1 -1
- data/gemfiles/mongo_216.gemfile +2 -2
- data/gemfiles/mongo_219.gemfile +15 -0
- data/gemfiles/net_http_01.gemfile +3 -2
- data/gemfiles/rack_16.gemfile +1 -1
- data/gemfiles/rack_20.gemfile +1 -1
- data/gemfiles/rack_30.gemfile +16 -0
- data/gemfiles/rails_42.gemfile +1 -1
- data/gemfiles/rails_50.gemfile +1 -1
- data/gemfiles/rails_52.gemfile +1 -1
- data/gemfiles/rails_60.gemfile +1 -1
- data/gemfiles/rails_61.gemfile +1 -1
- data/gemfiles/rails_70.gemfile +1 -1
- data/gemfiles/redis_40.gemfile +1 -1
- data/gemfiles/resque_122.gemfile +1 -1
- data/gemfiles/resque_20.gemfile +2 -2
- data/gemfiles/rest_client_16.gemfile +3 -2
- data/gemfiles/rest_client_20.gemfile +3 -2
- data/gemfiles/roda_20.gemfile +1 -1
- data/gemfiles/roda_30.gemfile +2 -2
- data/gemfiles/shoryuken_50.gemfile +2 -2
- data/gemfiles/shoryuken_60.gemfile +16 -0
- data/gemfiles/sidekiq_42.gemfile +1 -1
- data/gemfiles/sidekiq_50.gemfile +1 -1
- data/gemfiles/sidekiq_60.gemfile +1 -1
- data/gemfiles/sidekiq_70.gemfile +1 -1
- data/gemfiles/sinatra_14.gemfile +2 -2
- data/gemfiles/sinatra_22.gemfile +15 -0
- data/gemfiles/sinatra_30.gemfile +15 -0
- data/lib/instana/activator.rb +20 -9
- data/lib/instana/backend/serverless_agent.rb +1 -1
- data/lib/instana/version.rb +1 -1
- data/test/activator_test.rb +20 -0
- data/test/instrumentation/aws_test.rb +5 -4
- data/test/instrumentation/rack_test.rb +13 -2
- data/test/support/apps/http_endpoint/boot.rb +1 -1
- data/test/test_helper.rb +6 -3
- data/test/tracing/custom_test.rb +64 -0
- metadata +10 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8d5a6d5f952c612a4409a7706048b48a09d315556598c9473485c6c558ba0239
|
4
|
+
data.tar.gz: 232ab891cd7f9096691c27bbcd290bcaf98d84c91cf433fa7d623d0824d5e572
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 54d13de299896779dc38c2e5d0e4dc07ba4aa9dfc49c3390cd5404bc074764c785c2c6c27c5738f2c32b8eead65127cc0c508c896ea2e6c9780e357f838ae274
|
7
|
+
data.tar.gz: e6b4c5f3dc57e0b8fb8cd39a473f17a37c1a403bd5fe745de11675001e0edff8e7410ee434f40a30ac38dbf764da7d028fb6459caf887ade9f332f5edb8ac73b
|
data/.circleci/config.yml
CHANGED
@@ -1,5 +1,42 @@
|
|
1
1
|
version: 2.1
|
2
2
|
|
3
|
+
library_gemfile: &library_gemfile
|
4
|
+
gemfile:
|
5
|
+
- "./gemfiles/aws_30.gemfile"
|
6
|
+
- "./gemfiles/aws_60.gemfile"
|
7
|
+
- "./gemfiles/cuba_30.gemfile"
|
8
|
+
- "./gemfiles/cuba_40.gemfile"
|
9
|
+
- "./gemfiles/dalli_20.gemfile"
|
10
|
+
- "./gemfiles/dalli_30.gemfile"
|
11
|
+
- "./gemfiles/dalli_32.gemfile"
|
12
|
+
- "./gemfiles/excon_02.gemfile"
|
13
|
+
- "./gemfiles/excon_079.gemfile"
|
14
|
+
- "./gemfiles/excon_100.gemfile"
|
15
|
+
- "./gemfiles/graphql_10.gemfile"
|
16
|
+
- "./gemfiles/graphql_20.gemfile"
|
17
|
+
- "./gemfiles/grpc_10.gemfile"
|
18
|
+
- "./gemfiles/net_http_01.gemfile"
|
19
|
+
- "./gemfiles/rack_16.gemfile"
|
20
|
+
- "./gemfiles/rack_20.gemfile"
|
21
|
+
- "./gemfiles/rack_30.gemfile"
|
22
|
+
- "./gemfiles/redis_40.gemfile"
|
23
|
+
- "./gemfiles/rest_client_16.gemfile"
|
24
|
+
- "./gemfiles/rest_client_20.gemfile"
|
25
|
+
- "./gemfiles/resque_122.gemfile"
|
26
|
+
- "./gemfiles/resque_20.gemfile"
|
27
|
+
- "./gemfiles/roda_20.gemfile"
|
28
|
+
- "./gemfiles/roda_30.gemfile"
|
29
|
+
- "./gemfiles/sidekiq_42.gemfile"
|
30
|
+
- "./gemfiles/sidekiq_50.gemfile"
|
31
|
+
- "./gemfiles/sidekiq_60.gemfile"
|
32
|
+
- "./gemfiles/sidekiq_70.gemfile"
|
33
|
+
- "./gemfiles/sinatra_14.gemfile"
|
34
|
+
- "./gemfiles/sinatra_22.gemfile"
|
35
|
+
- "./gemfiles/sinatra_30.gemfile"
|
36
|
+
- "./gemfiles/shoryuken_50.gemfile"
|
37
|
+
- "./gemfiles/shoryuken_60.gemfile"
|
38
|
+
- "./gemfiles/mongo_216.gemfile"
|
39
|
+
- "./gemfiles/mongo_219.gemfile"
|
3
40
|
executors:
|
4
41
|
ruby_27:
|
5
42
|
docker:
|
@@ -210,6 +247,8 @@ commands:
|
|
210
247
|
bundle exec rake
|
211
248
|
- store_test_results:
|
212
249
|
path: ~/project/_junit
|
250
|
+
- store_artifacts:
|
251
|
+
path: coverage
|
213
252
|
run_rubocop:
|
214
253
|
steps:
|
215
254
|
- run:
|
@@ -290,46 +329,16 @@ workflows:
|
|
290
329
|
- ruby_30
|
291
330
|
- ruby_31
|
292
331
|
- ruby_32
|
293
|
-
|
332
|
+
libraries_ruby_3:
|
294
333
|
jobs:
|
295
334
|
- test_apprisal:
|
296
335
|
matrix:
|
297
336
|
parameters:
|
298
337
|
stack:
|
299
|
-
- ruby_27
|
300
338
|
- ruby_30
|
301
339
|
- ruby_31
|
302
340
|
- ruby_32
|
303
|
-
|
304
|
-
- "./gemfiles/aws_30.gemfile"
|
305
|
-
- "./gemfiles/cuba_30.gemfile"
|
306
|
-
- "./gemfiles/cuba_40.gemfile"
|
307
|
-
- "./gemfiles/dalli_20.gemfile"
|
308
|
-
- "./gemfiles/dalli_30.gemfile"
|
309
|
-
- "./gemfiles/dalli_32.gemfile"
|
310
|
-
- "./gemfiles/excon_02.gemfile"
|
311
|
-
- "./gemfiles/excon_079.gemfile"
|
312
|
-
- "./gemfiles/excon_100.gemfile"
|
313
|
-
- "./gemfiles/graphql_10.gemfile"
|
314
|
-
- "./gemfiles/graphql_20.gemfile"
|
315
|
-
- "./gemfiles/grpc_10.gemfile"
|
316
|
-
- "./gemfiles/net_http_01.gemfile"
|
317
|
-
- "./gemfiles/rack_16.gemfile"
|
318
|
-
- "./gemfiles/rack_20.gemfile"
|
319
|
-
- "./gemfiles/redis_40.gemfile"
|
320
|
-
- "./gemfiles/rest_client_16.gemfile"
|
321
|
-
- "./gemfiles/rest_client_20.gemfile"
|
322
|
-
- "./gemfiles/resque_122.gemfile"
|
323
|
-
- "./gemfiles/resque_20.gemfile"
|
324
|
-
- "./gemfiles/roda_20.gemfile"
|
325
|
-
- "./gemfiles/roda_30.gemfile"
|
326
|
-
- "./gemfiles/sidekiq_42.gemfile"
|
327
|
-
- "./gemfiles/sidekiq_50.gemfile"
|
328
|
-
- "./gemfiles/sidekiq_60.gemfile"
|
329
|
-
- "./gemfiles/sidekiq_70.gemfile"
|
330
|
-
- "./gemfiles/sinatra_14.gemfile"
|
331
|
-
- "./gemfiles/shoryuken_50.gemfile"
|
332
|
-
- "./gemfiles/mongo_216.gemfile"
|
341
|
+
<<: *library_gemfile
|
333
342
|
exclude:
|
334
343
|
# Currently rest-client 1.6 gemfile pulls in mime-types 2.99.3
|
335
344
|
# and adaptation to mime-type 3.0 is only available in rest-client 2.0:
|
@@ -349,7 +358,14 @@ workflows:
|
|
349
358
|
# https://www.ruby-lang.org/en/news/2022/11/11/ruby-3-2-0-preview3-released/
|
350
359
|
- stack: ruby_32
|
351
360
|
gemfile: "./gemfiles/sinatra_14.gemfile"
|
352
|
-
|
361
|
+
libraries_ruby_2:
|
362
|
+
jobs:
|
363
|
+
- test_apprisal:
|
364
|
+
matrix:
|
365
|
+
parameters:
|
366
|
+
stack:
|
367
|
+
- ruby_27
|
368
|
+
<<: *library_gemfile
|
353
369
|
rails_ruby_2:
|
354
370
|
jobs:
|
355
371
|
- test_apprisal:
|
@@ -6,7 +6,7 @@ body:
|
|
6
6
|
- type: markdown
|
7
7
|
attributes:
|
8
8
|
value: |
|
9
|
-
Thank you for taking the time to fill out this report. Remember that these issues are public and if you need to discuss implementation specific issues securely, please [use our support portal](https://
|
9
|
+
Thank you for taking the time to fill out this report. Remember that these issues are public and if you need to discuss implementation specific issues securely, please [use our support portal](https://www.ibm.com/mysupport).
|
10
10
|
- type: textarea
|
11
11
|
id: problem-description
|
12
12
|
attributes:
|
@@ -1,7 +1,7 @@
|
|
1
1
|
blank_issues_enabled: false
|
2
2
|
contact_links:
|
3
3
|
- name: Instana Support Portal
|
4
|
-
url: https://
|
4
|
+
url: https://www.ibm.com/mysupport
|
5
5
|
about: Please ask questions related to your installation there.
|
6
6
|
- name: Feature Requests
|
7
7
|
 url: https://automation-management.ideas.ibm.com/?project=INSTANA
|
@@ -0,0 +1,34 @@
|
|
1
|
+
name: Slack Post
|
2
|
+
on:
|
3
|
+
workflow_dispatch: # Manual trigger
|
4
|
+
inputs:
|
5
|
+
github_ref:
|
6
|
+
description: 'Manually provided value for GITHUB_RELEASE_TAG of a release'
|
7
|
+
required: true
|
8
|
+
type: string
|
9
|
+
|
10
|
+
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release
|
11
|
+
release:
|
12
|
+
types: [published]
|
13
|
+
jobs:
|
14
|
+
build:
|
15
|
+
name: Slack Post
|
16
|
+
runs-on: ubuntu-latest
|
17
|
+
steps:
|
18
|
+
- name: 'Checkout the needed file only ./bin/announce_release_on_slack.py'
|
19
|
+
uses: actions/checkout@v3
|
20
|
+
- run: |
|
21
|
+
if [[ ${{ github.event_name == 'workflow_dispatch' }} == true ]]; then
|
22
|
+
export GITHUB_RELEASE_TAG=${{ inputs.github_ref }}
|
23
|
+
else # release event
|
24
|
+
export GITHUB_RELEASE_TAG=$(basename ${GITHUB_REF})
|
25
|
+
fi
|
26
|
+
echo "New release published ${GITHUB_RELEASE_TAG}"
|
27
|
+
pip3 install PyGithub
|
28
|
+
echo $PWD
|
29
|
+
ls -lah
|
30
|
+
./bin/announce_release_on_slack.py
|
31
|
+
env:
|
32
|
+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
33
|
+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
|
34
|
+
SLACK_CHANNEL_ID_RELEASES: ${{ secrets.SLACK_CHANNEL_ID_RELEASES }}
|
data/Gemfile
CHANGED
@@ -11,13 +11,8 @@ gem 'puma'
|
|
11
11
|
|
12
12
|
gem 'rubocop', '~> 1.9'
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
gem 'rack', '<3.0.0', '~> 1.6'
|
17
|
-
else
|
18
|
-
gem 'rack', '<3.0.0'
|
19
|
-
# gem 'rackup'
|
20
|
-
end
|
14
|
+
gem 'rack'
|
15
|
+
gem 'rackup'
|
21
16
|
gem 'rack-test'
|
22
17
|
|
23
18
|
gem 'simplecov', '~> 0.21.2'
|
data/README.md
CHANGED
@@ -60,7 +60,7 @@ You can find more documentation covering supported components and minimum versio
|
|
60
60
|
|
61
61
|
Instana provides deep end user monitoring that links server side traces with browser events to give you a complete view from server to browser.
|
62
62
|
|
63
|
-
See the [End User Monitoring](/
|
63
|
+
See the [End User Monitoring](https://www.ibm.com/docs/en/instana-observability/current?topic=instana-monitoring-websites) page for more information.
|
64
64
|
|
65
65
|
## Development
|
66
66
|
|
@@ -0,0 +1,103 @@
|
|
1
|
+
#!/usr/bin/env python3
|
2
|
+
|
3
|
+
# (c) Copyright IBM Corp. 2023
|
4
|
+
|
5
|
+
import json
|
6
|
+
import logging
|
7
|
+
import os
|
8
|
+
import re
|
9
|
+
import requests
|
10
|
+
import sys
|
11
|
+
|
12
|
+
from github import Github
|
13
|
+
|
14
|
+
|
15
|
+
def ensure_environment_variables_are_present():
|
16
|
+
required_env_vars = ('GITHUB_RELEASE_TAG', 'GITHUB_TOKEN',
|
17
|
+
'SLACK_BOT_TOKEN', 'SLACK_CHANNEL_ID_RELEASES')
|
18
|
+
|
19
|
+
for v in required_env_vars:
|
20
|
+
if not os.environ.get(v):
|
21
|
+
logging.fatal("A required environment variable is missing: %s", v)
|
22
|
+
sys.exit(1)
|
23
|
+
|
24
|
+
|
25
|
+
def get_gh_release_info_text_with_token(release_tag, access_token):
|
26
|
+
g = Github(access_token)
|
27
|
+
repo_name = "instana/ruby-sensor"
|
28
|
+
repo = g.get_repo(repo_name)
|
29
|
+
release = repo.get_release(release_tag)
|
30
|
+
|
31
|
+
logging.info("GH Release fetched successfully %s", release)
|
32
|
+
|
33
|
+
msg = (
|
34
|
+
f":mega: :package: A new version is released in {repo_name}\n"
|
35
|
+
f"Name: {release.title}\n"
|
36
|
+
f"Tag: {release.tag_name}\n"
|
37
|
+
f"Created at: {release.created_at}\n"
|
38
|
+
f"Published at: {release.published_at}\n"
|
39
|
+
f"{release.body}\n")
|
40
|
+
|
41
|
+
logging.info(msg)
|
42
|
+
return msg
|
43
|
+
|
44
|
+
|
45
|
+
def reformat_github_md_to_slack_markup(msg):
|
46
|
+
# Based on:
|
47
|
+
# https://github.com/atomist/slack-messages/blob
|
48
|
+
# /c938c67e957345ba6a0015ca3ace1fd779d0979c/lib/Markdown.ts#LL111C1-L116C44
|
49
|
+
|
50
|
+
msg = re.sub(r'^(\s*)[-*](\s+)', r'\1•\2', msg, flags=re.MULTILINE)
|
51
|
+
msg = re.sub(r'(\*|_)\1(\S|\S.*?\S)\1\1(?!\1)', r'<bdmkd>\2</bdmkd>', msg)
|
52
|
+
msg = re.sub(r'(\*|_)(?!\1)(\S|\S.*?\S)\1(?!\1)', r'<itmkd>\2</itmkd>', msg)
|
53
|
+
msg = msg.replace('<bdmkd>', '*').replace('<itmkd>', '_')
|
54
|
+
msg = re.sub(r'^([#]+)\s+([\S ]+)$', r'*\2*', msg, flags=re.MULTILINE)
|
55
|
+
|
56
|
+
# TODO: The message text has to have a partial entity encoding
|
57
|
+
# https://api.slack.com/reference/surfaces/formatting#escaping
|
58
|
+
# Validate it if we can?
|
59
|
+
# A naive replace like this is not enough, because
|
60
|
+
# it might already be encoded and then we would encode again.
|
61
|
+
#s = s.replace('&', '&')
|
62
|
+
#s = s.replace('<', '<')
|
63
|
+
#s = s.replace('>', '>')
|
64
|
+
|
65
|
+
# Use the tester here:
|
66
|
+
# https://api.slack.com/methods/chat.postMessage/test
|
67
|
+
return msg
|
68
|
+
|
69
|
+
|
70
|
+
def post_on_slack_channel(slack_token, slack_channel_id, message_text):
|
71
|
+
api_url = "https://slack.com/api/chat.postMessage"
|
72
|
+
|
73
|
+
headers = {"Authorization": f"Bearer {slack_token}",
|
74
|
+
"Content-Type": "application/json"}
|
75
|
+
body = {"channel": slack_channel_id, "text": message_text}
|
76
|
+
|
77
|
+
response = requests.post(api_url, headers=headers, data=json.dumps(body))
|
78
|
+
response_data = json.loads(response.text)
|
79
|
+
|
80
|
+
if response_data["ok"]:
|
81
|
+
logging.info("Message sent successfully!")
|
82
|
+
else:
|
83
|
+
logging.fatal("Error sending message: %s", response_data['error'])
|
84
|
+
|
85
|
+
|
86
|
+
def main():
|
87
|
+
# Setting this globally to DEBUG will also debug PyGithub,
|
88
|
+
# which will produce even more log output
|
89
|
+
logging.basicConfig(level=logging.INFO)
|
90
|
+
ensure_environment_variables_are_present()
|
91
|
+
|
92
|
+
msg = get_gh_release_info_text_with_token(os.environ['GITHUB_RELEASE_TAG'],
|
93
|
+
os.environ['GITHUB_TOKEN'])
|
94
|
+
|
95
|
+
slack_formatted_msg = reformat_github_md_to_slack_markup(msg)
|
96
|
+
|
97
|
+
post_on_slack_channel(os.environ['SLACK_BOT_TOKEN'],
|
98
|
+
os.environ['SLACK_CHANNEL_ID_RELEASES'],
|
99
|
+
slack_formatted_msg)
|
100
|
+
|
101
|
+
|
102
|
+
if __name__ == "__main__":
|
103
|
+
main()
|
data/gemfiles/aws_30.gemfile
CHANGED
@@ -6,17 +6,18 @@
|
|
6
6
|
source "https://rubygems.org"
|
7
7
|
|
8
8
|
gem "rake"
|
9
|
-
gem "minitest", "5.
|
9
|
+
gem "minitest", "5.18.1"
|
10
10
|
gem "minitest-reporters"
|
11
11
|
gem "webmock"
|
12
|
+
gem "webrick"
|
12
13
|
gem "puma"
|
13
14
|
gem "rubocop", "~> 1.9"
|
14
15
|
gem "rack-test"
|
15
16
|
gem "simplecov", "~> 0.21.2"
|
16
|
-
gem "aws-sdk-dynamodb", "
|
17
|
-
gem "aws-sdk-s3", "
|
18
|
-
gem "aws-sdk-sns", "
|
19
|
-
gem "aws-sdk-sqs", "
|
20
|
-
gem "aws-sdk-lambda", "
|
17
|
+
gem "aws-sdk-dynamodb", ">= 1.59", "< 1.99"
|
18
|
+
gem "aws-sdk-s3", ">= 1.59", "< 1.60"
|
19
|
+
gem "aws-sdk-sns", ">= 1.38", "< 1.59"
|
20
|
+
gem "aws-sdk-sqs", ">= 1.36", "< 1.59"
|
21
|
+
gem "aws-sdk-lambda", ">= 1.62", "< 1.80"
|
21
22
|
|
22
23
|
gemspec path: "../"
|
@@ -0,0 +1,19 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.18.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rubocop", "~> 1.9"
|
11
|
+
gem "rack-test"
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
13
|
+
gem "aws-sdk-dynamodb", ">= 1.90"
|
14
|
+
gem "aws-sdk-s3", ">= 1.127"
|
15
|
+
gem "aws-sdk-sns", ">= 1.63"
|
16
|
+
gem "aws-sdk-sqs", ">= 1.59"
|
17
|
+
gem "aws-sdk-lambda", ">= 1.101"
|
18
|
+
|
19
|
+
gemspec path: "../"
|
data/gemfiles/cuba_30.gemfile
CHANGED
data/gemfiles/cuba_40.gemfile
CHANGED
data/gemfiles/dalli_20.gemfile
CHANGED
data/gemfiles/dalli_30.gemfile
CHANGED
data/gemfiles/dalli_32.gemfile
CHANGED
data/gemfiles/excon_02.gemfile
CHANGED
data/gemfiles/excon_021.gemfile
CHANGED
data/gemfiles/excon_079.gemfile
CHANGED
data/gemfiles/excon_100.gemfile
CHANGED
data/gemfiles/graphql_10.gemfile
CHANGED
data/gemfiles/graphql_20.gemfile
CHANGED
data/gemfiles/grpc_10.gemfile
CHANGED
data/gemfiles/mongo_216.gemfile
CHANGED
@@ -6,13 +6,13 @@
|
|
6
6
|
source "https://rubygems.org"
|
7
7
|
|
8
8
|
gem "rake"
|
9
|
-
gem "minitest", "5.
|
9
|
+
gem "minitest", "5.18.1"
|
10
10
|
gem "minitest-reporters"
|
11
11
|
gem "webmock"
|
12
12
|
gem "puma"
|
13
13
|
gem "rubocop", "~> 1.9"
|
14
14
|
gem "rack-test"
|
15
15
|
gem "simplecov", "~> 0.21.2"
|
16
|
-
gem "mongo", ">= 2.16", "<
|
16
|
+
gem "mongo", ">= 2.16", "< 2.19"
|
17
17
|
|
18
18
|
gemspec path: "../"
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.18.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rubocop", "~> 1.9"
|
11
|
+
gem "rack-test"
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
13
|
+
gem "mongo", ">= 2.19"
|
14
|
+
|
15
|
+
gemspec path: "../"
|
data/gemfiles/rack_16.gemfile
CHANGED
data/gemfiles/rack_20.gemfile
CHANGED
@@ -0,0 +1,16 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.18.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rubocop", "~> 1.9"
|
11
|
+
gem "rack-test"
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
13
|
+
gem "rack", ">= 3.0.8"
|
14
|
+
gem "rackup", ">= 2.1.0"
|
15
|
+
|
16
|
+
gemspec path: "../"
|
data/gemfiles/rails_42.gemfile
CHANGED
data/gemfiles/rails_50.gemfile
CHANGED
data/gemfiles/rails_52.gemfile
CHANGED
data/gemfiles/rails_60.gemfile
CHANGED
data/gemfiles/rails_61.gemfile
CHANGED
data/gemfiles/rails_70.gemfile
CHANGED
data/gemfiles/redis_40.gemfile
CHANGED
data/gemfiles/resque_122.gemfile
CHANGED
data/gemfiles/resque_20.gemfile
CHANGED
@@ -7,13 +7,13 @@ source "https://rubygems.org"
|
|
7
7
|
|
8
8
|
gem "redis", "< 5.0.0"
|
9
9
|
gem "rake"
|
10
|
-
gem "minitest", "5.
|
10
|
+
gem "minitest", "5.18.1"
|
11
11
|
gem "minitest-reporters"
|
12
12
|
gem "webmock"
|
13
13
|
gem "puma"
|
14
14
|
gem "rubocop", "~> 1.9"
|
15
15
|
gem "rack-test"
|
16
16
|
gem "simplecov", "~> 0.21.2"
|
17
|
-
gem "resque", ">= 2.
|
17
|
+
gem "resque", ">= 2.5.0"
|
18
18
|
|
19
19
|
gemspec path: "../"
|
data/gemfiles/roda_20.gemfile
CHANGED
data/gemfiles/roda_30.gemfile
CHANGED
@@ -7,13 +7,13 @@ source "https://rubygems.org"
|
|
7
7
|
|
8
8
|
gem "rack", "<3.0.0"
|
9
9
|
gem "rake"
|
10
|
-
gem "minitest", "5.
|
10
|
+
gem "minitest", "5.18.1"
|
11
11
|
gem "minitest-reporters"
|
12
12
|
gem "webmock"
|
13
13
|
gem "puma"
|
14
14
|
gem "rubocop", "~> 1.9"
|
15
15
|
gem "rack-test"
|
16
16
|
gem "simplecov", "~> 0.21.2"
|
17
|
-
gem "roda", ">= 3.
|
17
|
+
gem "roda", ">= 3.69.0"
|
18
18
|
|
19
19
|
gemspec path: "../"
|
@@ -6,14 +6,14 @@
|
|
6
6
|
source "https://rubygems.org"
|
7
7
|
|
8
8
|
gem "rake"
|
9
|
-
gem "minitest", "5.
|
9
|
+
gem "minitest", "5.18.1"
|
10
10
|
gem "minitest-reporters"
|
11
11
|
gem "webmock"
|
12
12
|
gem "puma"
|
13
13
|
gem "rubocop", "~> 1.9"
|
14
14
|
gem "rack-test"
|
15
15
|
gem "simplecov", "~> 0.21.2"
|
16
|
-
gem "shoryuken", "
|
16
|
+
gem "shoryuken", ">= 5.2", "< 6.0"
|
17
17
|
gem "aws-sdk-sqs", "~> 1.36"
|
18
18
|
|
19
19
|
gemspec path: "../"
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.18.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rubocop", "~> 1.9"
|
11
|
+
gem "rack-test"
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
13
|
+
gem "shoryuken", ">= 6.0"
|
14
|
+
gem "aws-sdk-sqs", "~> 1.59"
|
15
|
+
|
16
|
+
gemspec path: "../"
|
data/gemfiles/sidekiq_42.gemfile
CHANGED
data/gemfiles/sidekiq_50.gemfile
CHANGED
data/gemfiles/sidekiq_60.gemfile
CHANGED
data/gemfiles/sidekiq_70.gemfile
CHANGED
data/gemfiles/sinatra_14.gemfile
CHANGED
@@ -6,13 +6,13 @@
|
|
6
6
|
source "https://rubygems.org"
|
7
7
|
|
8
8
|
gem "rake"
|
9
|
-
gem "minitest", "5.
|
9
|
+
gem "minitest", "5.18.1"
|
10
10
|
gem "minitest-reporters"
|
11
11
|
gem "webmock"
|
12
12
|
gem "puma"
|
13
13
|
gem "rubocop", "~> 1.9"
|
14
14
|
gem "rack-test"
|
15
15
|
gem "simplecov", "~> 0.21.2"
|
16
|
-
gem "sinatra", "1.4.
|
16
|
+
gem "sinatra", ">= 1.4.8", "< 2.0"
|
17
17
|
|
18
18
|
gemspec path: "../"
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.18.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rubocop", "~> 1.9"
|
11
|
+
gem "rack-test"
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
13
|
+
gem "sinatra", ">= 2.2.4", "< 3.0"
|
14
|
+
|
15
|
+
gemspec path: "../"
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
2
|
+
|
3
|
+
source "https://rubygems.org"
|
4
|
+
|
5
|
+
gem "rake"
|
6
|
+
gem "minitest", "5.18.1"
|
7
|
+
gem "minitest-reporters"
|
8
|
+
gem "webmock"
|
9
|
+
gem "puma"
|
10
|
+
gem "rubocop", "~> 1.9"
|
11
|
+
gem "rack-test"
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
13
|
+
gem "sinatra", ">= 3.0.6"
|
14
|
+
|
15
|
+
gemspec path: "../"
|
data/lib/instana/activator.rb
CHANGED
@@ -43,16 +43,27 @@ module Instana
|
|
43
43
|
end
|
44
44
|
end
|
45
45
|
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
46
|
+
DIRECTORY_OF_ACTIVATORS = "#{__dir__}/activators/".freeze
|
47
|
+
|
48
|
+
def activated_set
|
49
|
+
all_activators = Set.new(
|
50
|
+
Dir["*.rb", base: DIRECTORY_OF_ACTIVATORS].map do |f|
|
51
|
+
File.basename(f, '.rb')
|
52
|
+
end
|
53
|
+
)
|
54
|
+
|
50
55
|
if ENV['INSTANA_ACTIVATE_SET']
|
51
|
-
|
52
|
-
|
56
|
+
selected_activators = Set.new(ENV.fetch('INSTANA_ACTIVATE_SET', '').split(','))
|
57
|
+
all_activators & selected_activators
|
53
58
|
else
|
54
|
-
|
59
|
+
all_activators
|
55
60
|
end
|
56
|
-
# :nocov:
|
57
61
|
end
|
58
|
-
|
62
|
+
|
63
|
+
def require_selected_activator_files
|
64
|
+
activated_set.each do |f|
|
65
|
+
require("#{DIRECTORY_OF_ACTIVATORS}#{f}.rb")
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
require_selected_activator_files
|
data/lib/instana/version.rb
CHANGED
data/test/activator_test.rb
CHANGED
@@ -27,4 +27,24 @@ class ActivatorTest < Minitest::Test
|
|
27
27
|
assert_equal 1, Instana::Activator.call.length
|
28
28
|
assert subject.call
|
29
29
|
end
|
30
|
+
|
31
|
+
def test_limited_activated_set
|
32
|
+
ENV['INSTANA_ACTIVATE_SET'] = 'rack,rails'
|
33
|
+
subject = activated_set
|
34
|
+
assert_instance_of Set, subject
|
35
|
+
assert_equal 2, subject.length
|
36
|
+
assert_includes subject, 'rack'
|
37
|
+
assert_includes subject, 'rails'
|
38
|
+
ensure
|
39
|
+
ENV.delete('INSTANA_ACTIVATE_SET')
|
40
|
+
end
|
41
|
+
|
42
|
+
def test_unlimited_activated_set
|
43
|
+
ENV.delete('INSTANA_ACTIVATE_SET')
|
44
|
+
subject = activated_set
|
45
|
+
assert_instance_of Set, subject
|
46
|
+
assert_equal 31, subject.length
|
47
|
+
ensure
|
48
|
+
ENV.delete('INSTANA_ACTIVATE_SET')
|
49
|
+
end
|
30
50
|
end
|
@@ -36,17 +36,18 @@ class AwsTest < Minitest::Test
|
|
36
36
|
end
|
37
37
|
|
38
38
|
def test_s3
|
39
|
-
|
39
|
+
s3_client = Aws::S3::Client.new(
|
40
40
|
region: "local",
|
41
41
|
access_key_id: "minioadmin",
|
42
42
|
secret_access_key: "minioadmin",
|
43
|
+
force_path_style: "true",
|
43
44
|
endpoint: "http://localhost:9000"
|
44
45
|
)
|
45
46
|
|
46
47
|
assert_raises Aws::S3::Errors::NoSuchBucket do
|
47
48
|
Instana::Tracer.start_or_continue_trace(:s3_test, {}) do
|
48
|
-
|
49
|
-
bucket: '
|
49
|
+
s3_client.get_object(
|
50
|
+
bucket: 'sample-bucket',
|
50
51
|
key: 'sample_key'
|
51
52
|
)
|
52
53
|
end
|
@@ -59,7 +60,7 @@ class AwsTest < Minitest::Test
|
|
59
60
|
assert_equal entry_span[:s], s3_span[:p]
|
60
61
|
assert_equal :s3, s3_span[:n]
|
61
62
|
assert_equal 'get', s3_span[:data][:s3][:op]
|
62
|
-
assert_equal '
|
63
|
+
assert_equal 'sample-bucket', s3_span[:data][:s3][:bucket]
|
63
64
|
assert_equal 'sample_key', s3_span[:data][:s3][:key]
|
64
65
|
end
|
65
66
|
|
@@ -3,7 +3,13 @@
|
|
3
3
|
|
4
4
|
require 'test_helper'
|
5
5
|
require 'rack/test'
|
6
|
-
|
6
|
+
|
7
|
+
framework_version = Gem::Specification.find_by_name('rack').version
|
8
|
+
if framework_version < Gem::Version.new('3.0.0')
|
9
|
+
require 'rack/lobster'
|
10
|
+
else
|
11
|
+
require 'rackup/lobster'
|
12
|
+
end
|
7
13
|
|
8
14
|
class RackTest < Minitest::Test
|
9
15
|
include Rack::Test::Methods
|
@@ -34,11 +40,16 @@ class RackTest < Minitest::Test
|
|
34
40
|
end
|
35
41
|
|
36
42
|
def app
|
43
|
+
framework_version = Gem::Specification.find_by_name('rack').version
|
37
44
|
@app = Rack::Builder.new do
|
38
45
|
use Rack::CommonLogger
|
39
46
|
use Rack::ShowExceptions
|
40
47
|
use Instana::Rack
|
41
|
-
|
48
|
+
if framework_version < Gem::Version.new('3.0.0')
|
49
|
+
map("/mrlobster") { run Rack::Lobster.new }
|
50
|
+
else
|
51
|
+
map("/mrlobster") { run Rackup::Lobster.new }
|
52
|
+
end
|
42
53
|
map("/path_tpl") { run PathTemplateApp.new }
|
43
54
|
map("/error") { run ErrorApp.new }
|
44
55
|
map("/five_zero_one") { run FiveZeroOneApp.new }
|
data/test/test_helper.rb
CHANGED
@@ -26,9 +26,12 @@ begin
|
|
26
26
|
add_filter %r{lib/instana/(activators|frameworks|instrumentation)}
|
27
27
|
end
|
28
28
|
|
29
|
-
|
30
|
-
|
31
|
-
|
29
|
+
formatter SimpleCov::Formatter::MultiFormatter.new(
|
30
|
+
[
|
31
|
+
SimpleCov::Formatter::HTMLFormatter,
|
32
|
+
SimpleCov::Formatter::JSONFormatter
|
33
|
+
]
|
34
|
+
)
|
32
35
|
end
|
33
36
|
rescue LoadError => _e
|
34
37
|
nil
|
data/test/tracing/custom_test.rb
CHANGED
@@ -42,6 +42,70 @@ class CustomTracingTest < Minitest::Test
|
|
42
42
|
assert_equal ::Instana.agent.source, first_span[:f]
|
43
43
|
end
|
44
44
|
|
45
|
+
# automagic (TM) as seen in the docs:
|
46
|
+
# https://www.ibm.com/docs/en/instana-observability/current?topic=ruby-tracing-sdk#the-instana-ruby-tracing-sdk
|
47
|
+
def test_custom_tracing_with_nested_automagic
|
48
|
+
clear_all!
|
49
|
+
assert_equal false, ::Instana.tracer.tracing?
|
50
|
+
|
51
|
+
kvs = {}
|
52
|
+
kvs[:on_entry_kv] = 1
|
53
|
+
kvs[:arguments] = [[1,2,3], "test_arg", :ok]
|
54
|
+
kvs[:return] = true
|
55
|
+
|
56
|
+
# Start tracing
|
57
|
+
::Instana.tracer.log_start_or_continue(:rack, :on_trace_start => 1)
|
58
|
+
assert_equal true, ::Instana.tracer.tracing?
|
59
|
+
|
60
|
+
# Now the automagic
|
61
|
+
::Instana.tracer.trace(:custom_span, kvs) do
|
62
|
+
answer = 42 * 1
|
63
|
+
active_span = ::Instana.tracer.current_span
|
64
|
+
active_span.set_tag(:answer, answer)
|
65
|
+
|
66
|
+
# And now nested automagic
|
67
|
+
::Instana.tracer.trace(:custom_span2, kvs) do
|
68
|
+
was_here = 'stan'
|
69
|
+
active_span = ::Instana.tracer.current_span
|
70
|
+
active_span.set_tag(:was_here, was_here)
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
# End tracing
|
75
|
+
::Instana.tracer.log_end(:rack, {:on_trace_end => 1})
|
76
|
+
assert_equal false, ::Instana.tracer.tracing?
|
77
|
+
|
78
|
+
spans = ::Instana.processor.queued_spans
|
79
|
+
assert_equal 3, spans.length
|
80
|
+
|
81
|
+
second_span = find_first_span_by_name(spans, :custom_span)
|
82
|
+
third_span = find_first_span_by_name(spans, :custom_span2)
|
83
|
+
|
84
|
+
assert_equal :sdk, second_span[:n]
|
85
|
+
assert second_span.key?(:data)
|
86
|
+
assert second_span[:data].key?(:sdk)
|
87
|
+
assert second_span[:data][:sdk].key?(:custom)
|
88
|
+
assert second_span[:data][:sdk][:custom].key?(:tags)
|
89
|
+
assert :custom_span, second_span[:data][:sdk][:name]
|
90
|
+
assert :unknown, second_span[:data][:sdk][:type]
|
91
|
+
assert [[1, 2, 3], "test_arg", :ok], second_span[:data][:sdk][:arguments]
|
92
|
+
assert true, second_span[:data][:sdk][:return]
|
93
|
+
assert_equal 1, second_span[:data][:sdk][:custom][:tags][:on_entry_kv]
|
94
|
+
assert_equal 42, second_span[:data][:sdk][:custom][:tags][:answer]
|
95
|
+
|
96
|
+
assert_equal :sdk, third_span[:n]
|
97
|
+
assert third_span.key?(:data)
|
98
|
+
assert third_span[:data].key?(:sdk)
|
99
|
+
assert third_span[:data][:sdk].key?(:custom)
|
100
|
+
assert third_span[:data][:sdk][:custom].key?(:tags)
|
101
|
+
assert :custom_span, third_span[:data][:sdk][:name]
|
102
|
+
assert :unknown, third_span[:data][:sdk][:type]
|
103
|
+
assert [[1, 2, 3], "test_arg", :ok], third_span[:data][:sdk][:arguments]
|
104
|
+
assert true, third_span[:data][:sdk][:return]
|
105
|
+
assert_equal 1, third_span[:data][:sdk][:custom][:tags][:on_entry_kv]
|
106
|
+
assert_equal 'stan', third_span[:data][:sdk][:custom][:tags][:was_here]
|
107
|
+
end
|
108
|
+
|
45
109
|
def test_custom_tracing_with_args
|
46
110
|
clear_all!
|
47
111
|
assert_equal false, ::Instana.tracer.tracing?
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: instana
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.211.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Peter Giacomo Lombardo
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-09-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -138,6 +138,7 @@ files:
|
|
138
138
|
- ".github/ISSUE_TEMPLATE/bug.yml"
|
139
139
|
- ".github/ISSUE_TEMPLATE/config.yml"
|
140
140
|
- ".github/workflows/pr_commits_signed_off.yml"
|
141
|
+
- ".github/workflows/release-notification-on-slack.yml"
|
141
142
|
- ".gitignore"
|
142
143
|
- ".rubocop.yml"
|
143
144
|
- ".rubocop_todo.yml"
|
@@ -148,6 +149,7 @@ files:
|
|
148
149
|
- MAINTAINERS.md
|
149
150
|
- README.md
|
150
151
|
- Rakefile
|
152
|
+
- bin/announce_release_on_slack.py
|
151
153
|
- bin/console
|
152
154
|
- bin/setup
|
153
155
|
- docker-compose.yml
|
@@ -156,6 +158,7 @@ files:
|
|
156
158
|
- extras/license_header.rb
|
157
159
|
- gemfiles/.bundle/config
|
158
160
|
- gemfiles/aws_30.gemfile
|
161
|
+
- gemfiles/aws_60.gemfile
|
159
162
|
- gemfiles/cuba_30.gemfile
|
160
163
|
- gemfiles/cuba_40.gemfile
|
161
164
|
- gemfiles/dalli_20.gemfile
|
@@ -169,9 +172,11 @@ files:
|
|
169
172
|
- gemfiles/graphql_20.gemfile
|
170
173
|
- gemfiles/grpc_10.gemfile
|
171
174
|
- gemfiles/mongo_216.gemfile
|
175
|
+
- gemfiles/mongo_219.gemfile
|
172
176
|
- gemfiles/net_http_01.gemfile
|
173
177
|
- gemfiles/rack_16.gemfile
|
174
178
|
- gemfiles/rack_20.gemfile
|
179
|
+
- gemfiles/rack_30.gemfile
|
175
180
|
- gemfiles/rails_42.gemfile
|
176
181
|
- gemfiles/rails_50.gemfile
|
177
182
|
- gemfiles/rails_52.gemfile
|
@@ -186,11 +191,14 @@ files:
|
|
186
191
|
- gemfiles/roda_20.gemfile
|
187
192
|
- gemfiles/roda_30.gemfile
|
188
193
|
- gemfiles/shoryuken_50.gemfile
|
194
|
+
- gemfiles/shoryuken_60.gemfile
|
189
195
|
- gemfiles/sidekiq_42.gemfile
|
190
196
|
- gemfiles/sidekiq_50.gemfile
|
191
197
|
- gemfiles/sidekiq_60.gemfile
|
192
198
|
- gemfiles/sidekiq_70.gemfile
|
193
199
|
- gemfiles/sinatra_14.gemfile
|
200
|
+
- gemfiles/sinatra_22.gemfile
|
201
|
+
- gemfiles/sinatra_30.gemfile
|
194
202
|
- instana.gemspec
|
195
203
|
- lib/instana.rb
|
196
204
|
- lib/instana/activator.rb
|