Merge branch 'master' into feat/indexed-transactions-limiting

* master:
  fix(gha): Skip Sentry integration tests on library release builds (#1550)
  ref: Use wildcard re-exports where applicable (#1526)
  ci(gha): Skip Sentry integration tests on library release builds (#1549)
  release: 0.8.15
  fix(py): Respect the renormalize flag (#1548)
  (fix)e2e: Use report self hosted issues env variable (#1539)
  meta(vscode): Enable all features in Rust-Analyzer (#1542)
  release: 0.8.14
  build(craft): Fix manylinux artifact name (#1547)

Author: jan-auer

.github/workflows/ci.yml

@@ -300,6 +300,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
 
+    # Skip redundant checks for library releases
+    if: "!startsWith(github.ref, 'refs/heads/release-library/')"
+
     steps:
       - name: Checkout Relay
         uses: actions/checkout@v3

.vscode/settings.json

@@ -15,6 +15,7 @@
   "python.formatting.provider": "black",
 
   // Rust Analyzer
+  "rust-analyzer.cargo.features": "all",
   "rust-analyzer.checkOnSave.command": "clippy",
   "rust-analyzer.imports.granularity.group": "module",
   "rust-analyzer.imports.prefix": "crate",

Cargo.lock

@@ -15,29 +15,24 @@ steps:
 
   - name: "gcr.io/cloud-builders/docker"
     entrypoint: "bash"
-    args:
-      [
-        "-c",
-        "docker pull us.gcr.io/$PROJECT_ID/relay:nightly || true"
-      ]
+    args: ["-c", "docker pull us.gcr.io/$PROJECT_ID/relay:nightly || true"]
 
   # Pull the image with the first build stage
   - name: "gcr.io/cloud-builders/docker"
     entrypoint: "bash"
-    args:
-      [
-        "-c",
-        "docker pull us.gcr.io/$PROJECT_ID/relay:deps || true"
-      ]
+    args: ["-c", "docker pull us.gcr.io/$PROJECT_ID/relay:deps || true"]
 
   # Build the first stage
   - name: "gcr.io/cloud-builders/docker"
     args:
       [
         "build",
-        "--target", "relay-deps",
-        "-t", "us.gcr.io/$PROJECT_ID/relay:deps",
-        "--cache-from", "us.gcr.io/$PROJECT_ID/relay:deps",
+        "--target",
+        "relay-deps",
+        "-t",
+        "us.gcr.io/$PROJECT_ID/relay:deps",
+        "--cache-from",
+        "us.gcr.io/$PROJECT_ID/relay:deps",
         ".",
       ]
 
@@ -46,58 +41,58 @@ steps:
     args:
       [
         "build",
-        "-t", "us.gcr.io/$PROJECT_ID/relay:nightly",
-        "-t", "us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA",
-        "--cache-from", "us.gcr.io/$PROJECT_ID/relay:deps",
-        "--cache-from", "us.gcr.io/$PROJECT_ID/relay:nightly",
+        "-t",
+        "us.gcr.io/$PROJECT_ID/relay:nightly",
+        "-t",
+        "us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA",
+        "--cache-from",
+        "us.gcr.io/$PROJECT_ID/relay:deps",
+        "--cache-from",
+        "us.gcr.io/$PROJECT_ID/relay:nightly",
         ".",
       ]
 
   # We push the image to GCR since the Sentry integration tests are polling
   - name: "gcr.io/cloud-builders/docker"
-    args:
-      [
-        "push",
-        "us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA"
-      ]
+    args: ["push", "us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA"]
 
-  # On-premise Integration tests
-  - name: 'gcr.io/$PROJECT_ID/docker-compose'
-    entrypoint: 'bash'
+  # Self-hosted Integration tests
+  - name: "gcr.io/$PROJECT_ID/docker-compose"
+    entrypoint: "bash"
     env:
-    - 'RELAY_IMAGE=us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA'
-    - 'SENTRY_TEST_HOST=http://nginx'
-    - 'CI=1'
+      - "RELAY_IMAGE=us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA"
+      - "SENTRY_TEST_HOST=http://nginx"
+      - "CI=1"
+      - "REPORT_SELF_HOSTED_ISSUES=0"
     args:
-    - '-e'
-    - '-c'
-    - |
-      mkdir self-hosted && cd self-hosted
-      echo "no" > .reporterrors
-      curl -L "https://github.com/getsentry/self-hosted/archive/master.tar.gz" | tar xzf - --strip-components=1
-      # The following trick is from https://stackoverflow.com/a/52400857/90297 with great gratuity
-      echo '{"version": "3.4", "networks":{"default":{"external":{"name":"cloudbuild"}}}}' > docker-compose.override.yml
-      ./install.sh
-      ./test.sh || docker-compose logs nginx web relay
+      - "-e"
+      - "-c"
+      - |
+        mkdir self-hosted && cd self-hosted
+        curl -L "https://github.com/getsentry/self-hosted/archive/master.tar.gz" | tar xzf - --strip-components=1
+        # The following trick is from https://stackoverflow.com/a/52400857/90297 with great gratuity
+        echo '{"version": "3.4", "networks":{"default":{"external":{"name":"cloudbuild"}}}}' > docker-compose.override.yml
+        ./install.sh
+        ./test.sh || docker-compose logs nginx web relay
     timeout: 900s
 
-  - name: 'gcr.io/cloud-builders/docker'
-    secretEnv: ['DOCKER_PASSWORD']
-    entrypoint: 'bash'
+  - name: "gcr.io/cloud-builders/docker"
+    secretEnv: ["DOCKER_PASSWORD"]
+    entrypoint: "bash"
     args:
-    - '-e'
-    - '-c'
-    - |
-      # Only push to Docker Hub from master
-      [ "$BRANCH_NAME" != "master" ] && exit 0
-      docker push us.gcr.io/$PROJECT_ID/relay:nightly
-      echo "$$DOCKER_PASSWORD" | docker login --username=sentrybuilder --password-stdin
-      docker tag us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA getsentry/relay:$SHORT_SHA
-      docker push getsentry/relay:$SHORT_SHA
-      docker tag us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA getsentry/relay:$COMMIT_SHA
-      docker push getsentry/relay:$COMMIT_SHA
-      docker tag us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA getsentry/relay:nightly
-      docker push getsentry/relay:nightly
+      - "-e"
+      - "-c"
+      - |
+        # Only push to Docker Hub from master
+        [ "$BRANCH_NAME" != "master" ] && exit 0
+        docker push us.gcr.io/$PROJECT_ID/relay:nightly
+        echo "$$DOCKER_PASSWORD" | docker login --username=sentrybuilder --password-stdin
+        docker tag us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA getsentry/relay:$SHORT_SHA
+        docker push getsentry/relay:$SHORT_SHA
+        docker tag us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA getsentry/relay:$COMMIT_SHA
+        docker push getsentry/relay:$COMMIT_SHA
+        docker tag us.gcr.io/$PROJECT_ID/relay:$COMMIT_SHA getsentry/relay:nightly
+        docker push getsentry/relay:nightly
 
 images:
   [
@@ -107,13 +102,13 @@ images:
 timeout: 3600s
 options:
   # Run on bigger machines
-  machineType: 'E2_HIGHCPU_8'
+  machineType: "E2_HIGHCPU_8"
 secrets:
-- kmsKeyName: projects/sentryio/locations/global/keyRings/service-credentials/cryptoKeys/cloudbuild
-  secretEnv:
-    # This is a personal access token for the sentrybuilder account, encrypted using the
-    # short guide at http://bit.ly/2Pg6uw9
-    DOCKER_PASSWORD: |
-      CiQAE8gN7y3OMxn+a1kofmK4Bi8jQZtdRFj2lYYwaZHVeIIBUzMSTQA9tvn8XCv2vqj6u8CHoeSP
-      TVW9pLvSCorKoeNtOp0eb+6V1yNJW/+JC07DNO1KLbTbodbuza6jKJHU5xeAJ4kGQI78UY5Vu1Gp
-      QcMK
+  - kmsKeyName: projects/sentryio/locations/global/keyRings/service-credentials/cryptoKeys/cloudbuild
+    secretEnv:
+      # This is a personal access token for the sentrybuilder account, encrypted using the
+      # short guide at http://bit.ly/2Pg6uw9
+      DOCKER_PASSWORD: |
+        CiQAE8gN7y3OMxn+a1kofmK4Bi8jQZtdRFj2lYYwaZHVeIIBUzMSTQA9tvn8XCv2vqj6u8CHoeSP
+        TVW9pLvSCorKoeNtOp0eb+6V1yNJW/+JC07DNO1KLbTbodbuza6jKJHU5xeAJ4kGQI78UY5Vu1Gp
+        QcMK

cloudbuild.yaml

@@ -17,7 +17,7 @@ targets:
 requireNames:
   - /^sentry_relay-.*-py2\.py3-none-macosx_10_15_x86_64.whl$/
   - /^sentry_relay-.*-py2\.py3-none-macosx_11_0_arm64.whl$/
-  - /^sentry_relay-.*-py2\.py3-none-.*manylinux2010_i686.*\.whl$/
-  - /^sentry_relay-.*-py2\.py3-none-.*manylinux2010_x86_64.*\.whl$/
+  - /^sentry_relay-.*-py2\.py3-none-.*manylinux2014_i686.*\.whl$/
+  - /^sentry_relay-.*-py2\.py3-none-.*manylinux2014_x86_64.*\.whl$/
   - /^sentry_relay-.*-py2\.py3-none-.*manylinux2014_aarch64.*\.whl$/
   - /^sentry-relay-.*\.zip$/

py/.craft.yml

@@ -1,6 +1,12 @@
 # Changelog
 
-## Unreleased
+## 0.8.15
+
+- Restore correct behavior when `is_renormalize` is specified on `normalize_event`. ([#1548](https://github.com/getsentry/relay/pull/1548))
+
+## 0.8.14
+
+**Warning:** This release contains a regression. Please update to a more recent version.
 
 - Add `transaction_info` to event payloads, including the transaction's source and internal original transaction name. ([#1330](https://github.com/getsentry/relay/pull/1330))
 - Add user-agent parsing to replays processor. ([#1420](https://github.com/getsentry/relay/pull/1420))

py/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "relay-cabi"
-version = "0.8.13"
+version = "0.8.15"
 authors = ["Sentry <[email protected]>"]
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"

relay-cabi/Cargo.toml

@@ -109,10 +109,17 @@ pub unsafe extern "C" fn relay_store_normalizer_normalize_event(
 ) -> RelayStr {
     let processor = normalizer as *mut StoreProcessor;
     let mut event = Annotated::<Event>::from_json((*event).as_str())?;
+    let config = (*processor).config();
     let light_normalization_config = LightNormalizationConfig {
-        normalize_user_agent: (*processor).config().normalize_user_agent,
-        is_renormalize: (*processor).config().is_renormalize.unwrap_or(false),
-        ..Default::default()
+        client_ip: config.client_ip.as_ref(),
+        user_agent: config.user_agent.as_deref(),
+        received_at: config.received_at,
+        max_secs_in_past: config.max_secs_in_past,
+        max_secs_in_future: config.max_secs_in_future,
+        measurements_config: None, // only supported in relay
+        breakdowns_config: None,   // only supported in relay
+        normalize_user_agent: config.normalize_user_agent,
+        is_renormalize: config.is_renormalize.unwrap_or(false),
     };
     light_normalize_event(&mut event, &light_normalization_config)?;
     process_value(&mut event, &mut *processor, ProcessingState::root())?;

relay-cabi/src/processing.rs

@@ -13,14 +13,11 @@ mod redactions;
 mod regexes;
 mod utils;
 
-pub use self::attachments::{PiiAttachmentsProcessor, ScrubEncodings};
-pub use self::compiledconfig::CompiledPiiConfig;
-pub use self::config::{
-    AliasRule, MultipleRule, Pattern, PatternRule, PiiConfig, PiiConfigError, RedactPairRule,
-    RuleSpec, RuleType, Vars,
-};
+pub use self::attachments::*;
+pub use self::compiledconfig::*;
+pub use self::config::*;
 pub use self::generate_selectors::selector_suggestions_from_value;
-pub use self::legacy::DataScrubbingConfig;
-pub use self::minidumps::ScrubMinidumpError;
-pub use self::processor::PiiProcessor;
-pub use self::redactions::{Redaction, ReplaceRedaction};
+pub use self::legacy::*;
+pub use self::minidumps::*;
+pub use self::processor::*;
+pub use self::redactions::*;

relay-general/src/pii/mod.rs

@@ -8,12 +8,9 @@ mod selector;
 mod size;
 mod traits;
 
-pub use self::attrs::{
-    BagSize, CharacterSet, FieldAttrs, MaxChars, Path, Pii, ProcessingState, UnknownValueTypeError,
-    ValueType,
-};
-pub use self::chunks::{join_chunks, process_chunked_value, split_chunks, Chunk};
-pub use self::funcs::process_value;
-pub use self::selector::{SelectorPathItem, SelectorSpec};
-pub use self::size::{estimate_size, estimate_size_flat};
-pub use self::traits::{ProcessValue, Processor};
+pub use self::attrs::*;
+pub use self::chunks::*;
+pub use self::funcs::*;
+pub use self::selector::*;
+pub use self::size::*;
+pub use self::traits::*;

relay-general/src/processor/mod.rs

@@ -32,48 +32,32 @@ mod user_report;
 
 pub use sentry_release_parser::{validate_environment, validate_release};
 
-pub use self::breadcrumb::Breadcrumb;
-pub use self::breakdowns::Breakdowns;
-pub use self::client_report::{ClientReport, DiscardedEvent};
-pub use self::clientsdk::{ClientSdkInfo, ClientSdkPackage};
-pub use self::constants::VALID_PLATFORMS;
-pub use self::contexts::{
-    AppContext, BrowserContext, Context, ContextInner, Contexts, DeviceContext, GpuContext,
-    OperationType, OsContext, ResponseContext, RuntimeContext, SpanId, SpanStatus, TraceContext,
-    TraceId,
-};
-pub use self::debugmeta::{
-    AppleDebugImage, CodeId, DebugId, DebugImage, DebugMeta, NativeDebugImage, NativeImagePath,
-    SystemSdkInfo,
-};
-pub use self::event::{
-    Event, EventId, EventProcessingError, EventType, ExtraValue, GroupingConfig,
-    ParseEventTypeError,
-};
-pub use self::exception::Exception;
-pub use self::fingerprint::Fingerprint;
-pub use self::logentry::{LogEntry, Message};
-pub use self::measurements::{Measurement, Measurements};
-pub use self::mechanism::{CError, MachException, Mechanism, MechanismMeta, PosixSignal};
-pub use self::metrics::{Metrics, SampleRate};
-pub use self::relay_info::RelayInfo;
-pub use self::request::{Cookies, HeaderName, HeaderValue, Headers, Query, Request};
+pub use self::breadcrumb::*;
+pub use self::breakdowns::*;
+pub use self::client_report::*;
+pub use self::clientsdk::*;
+pub use self::constants::*;
+pub use self::contexts::*;
+pub use self::debugmeta::*;
+pub use self::event::*;
+pub use self::exception::*;
+pub use self::fingerprint::*;
+pub use self::logentry::*;
+pub use self::measurements::*;
+pub use self::mechanism::*;
+pub use self::metrics::*;
+pub use self::relay_info::*;
+pub use self::request::*;
 #[cfg(feature = "jsonschema")]
 pub use self::schema::event_json_schema;
-pub use self::security_report::{Csp, ExpectCt, ExpectStaple, Hpkp, SecurityReportType};
-pub use self::session::{
-    ParseSessionStatusError, SessionAggregateItem, SessionAggregates, SessionAttributes,
-    SessionErrored, SessionLike, SessionStatus, SessionUpdate,
-};
-pub use self::span::Span;
-pub use self::stacktrace::{Frame, FrameData, FrameVars, RawStacktrace, Stacktrace};
-pub use self::tags::{TagEntry, Tags};
-pub use self::templateinfo::TemplateInfo;
-pub use self::thread::{Thread, ThreadId};
-pub use self::transaction::{TransactionInfo, TransactionSource};
-pub use self::types::{
-    datetime_to_timestamp, Addr, AsPair, InvalidRegVal, IpAddr, JsonLenientString, LenientString,
-    Level, PairList, ParseLevelError, RegVal, Timestamp, Values,
-};
-pub use self::user::{Geo, User};
-pub use self::user_report::UserReport;
+pub use self::security_report::*;
+pub use self::session::*;
+pub use self::span::*;
+pub use self::stacktrace::*;
+pub use self::tags::*;
+pub use self::templateinfo::*;
+pub use self::thread::*;
+pub use self::transaction::*;
+pub use self::types::*;
+pub use self::user::*;
+pub use self::user_report::*;

relay-general/src/protocol/mod.rs

@@ -20,19 +20,11 @@ mod schema;
 mod transactions;
 mod trimming;
 
-pub use self::clock_drift::ClockDriftProcessor;
-pub use self::geo::{GeoIpError, GeoIpLookup};
-pub use normalize::breakdowns::{
-    get_breakdown_measurements, BreakdownConfig, BreakdownsConfig, SpanOperationsConfig,
-};
-pub use normalize::{
-    compute_measurements, is_valid_platform, light_normalize_event, normalize_dist,
-    LightNormalizationConfig, MeasurementsConfig,
-};
-pub use transactions::{
-    get_measurement, get_transaction_op, is_high_cardinality_sdk, validate_timestamps,
-    validate_transaction,
-};
+pub use self::clock_drift::*;
+pub use self::geo::*;
+pub use normalize::breakdowns::*;
+pub use normalize::*;
+pub use transactions::*;
 
 /// The config for store.
 #[derive(Serialize, Deserialize, Debug, Default)]